diff -Nru kodi-audiodecoder-asap-2.0.2/appveyor.yml kodi-audiodecoder-asap-3.0.1/appveyor.yml
--- kodi-audiodecoder-asap-2.0.2/appveyor.yml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/appveyor.yml	2013-05-31 22:59:22.000000000 +0000
@@ -16,14 +16,14 @@
       CONFIG: Release
     - GENERATOR: "Visual Studio 15 Win64"
       CONFIG: Release
-      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
     - GENERATOR: "Visual Studio 15 ARM"
       CONFIG: Release
-      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
 
 build_script:
   - cd ..
-  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
   - cd %app_id%
   - mkdir build
   - cd build
diff -Nru kodi-audiodecoder-asap-2.0.2/audiodecoder.asap/addon.xml.in kodi-audiodecoder-asap-3.0.1/audiodecoder.asap/addon.xml.in
--- kodi-audiodecoder-asap-2.0.2/audiodecoder.asap/addon.xml.in	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/audiodecoder.asap/addon.xml.in	2013-05-31 22:59:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audiodecoder.asap"
-  version="2.0.2"
+  version="3.0.1"
   name="ASAP Audio Decoder"
   provider-name="spiff">
   <requires>@ADDON_DEPENDS@</requires>
@@ -13,10 +13,12 @@
     extension=".sap|.asapstream|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.cms|.cm3|.dlt"
     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
   <extension point="xbmc.addon.metadata">
-    <summary lang="en">ASAP - Another Slight Atari Player</summary>
-    <description lang="en">ASAP (Another Slight Atari Player) plays on Kodi and converts 8-bit Atari music (*.sap, *.cmc, *.mpt, *.rmt, *.tmc, ...) on modern computers and mobile devices.</description>
+    <summary lang="de_DE">ASAP - Another Slight Atari Player</summary>
+    <summary lang="en_GB">ASAP - Another Slight Atari Player</summary>
+    <description lang="de_DE">ASAP (Another Slight Atari Player) konvertiert 8-Bit-Atari-Musik (*.sap, *.cmc, *.mpt, *.rmt, *.tmc, ...) zum nötigen Format und zur Wiedergabe in Kodi auf modernen Computern und Mobilgeräten.</description>
+    <description lang="en_GB">ASAP (Another Slight Atari Player) plays on Kodi and converts 8-bit Atari music (*.sap, *.cmc, *.mpt, *.rmt, *.tmc, ...) on modern computers and mobile devices.</description>
     <platform>@PLATFORM@</platform>
-    <license>GPL-2.0</license>
+    <license>GPL-2.0-or-later</license>
     <source>https://github.com/xbmc/audiodecoder.asap</source>
     <assets>
       <icon>icon.png</icon>
diff -Nru kodi-audiodecoder-asap-2.0.2/azure-pipelines.yml kodi-audiodecoder-asap-3.0.1/azure-pipelines.yml
--- kodi-audiodecoder-asap-2.0.2/azure-pipelines.yml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/azure-pipelines.yml	2013-05-31 22:59:22.000000000 +0000
@@ -4,7 +4,7 @@
 trigger:
   branches:
     include:
-    - Leia
+    - Matrix
     - releases/*
   paths:
     include:
@@ -46,7 +46,7 @@
 
     - script: |
         cd ..
-        git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi
+        git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi
         cd $(Build.SourcesDirectory)
         mkdir build
         cd build
diff -Nru kodi-audiodecoder-asap-2.0.2/.clang-format kodi-audiodecoder-asap-3.0.1/.clang-format
--- kodi-audiodecoder-asap-2.0.2/.clang-format	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/.clang-format	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,88 @@
+---
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: DontAlign
+AlignOperands:   true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     100
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '^<[a-z0-9_]+>$'
+    Priority:        3
+  - Regex:           '^<(assert|complex|ctype|errno|fenv|float|inttypes|iso646|limits|locale|math|setjmp|signal|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|tgmath|threads|time|uchar|wchar|wctype)\.h>$'
+    Priority:        3
+  - Regex:           '^<'
+    Priority:        3
+  - Regex:           '^["<](kodi|p8-platform)\/.*\.h[">]$'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '$'
+IndentCaseLabels: true
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60000
+PointerAlignment: Left
+ReflowComments:  false
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
diff -Nru kodi-audiodecoder-asap-2.0.2/CMakeLists.txt kodi-audiodecoder-asap-3.0.1/CMakeLists.txt
--- kodi-audiodecoder-asap-2.0.2/CMakeLists.txt	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/CMakeLists.txt	2013-05-31 22:59:22.000000000 +0000
@@ -5,11 +5,17 @@
 
 find_package(Kodi REQUIRED)
 
+if(WIN32)
+  add_definitions("/wd4996")
+endif()
+
 include_directories(${KODI_INCLUDE_DIR}/..
-                    ${PROJECT_SOURCE_DIR}/lib/asap-3.1.5)
+                    ${PROJECT_SOURCE_DIR}/lib/asap-code)
 
 set(ASAP_SOURCES src/ASAPCodec.cpp
-                 lib/asap-3.1.5/asap.c)
+                 lib/asap-code/asap.c)
+
+set(ASAP_HEADERS src/ASAPCodec.h)
 
 build_addon(audiodecoder.asap ASAP DEPLIBS)
 
diff -Nru kodi-audiodecoder-asap-2.0.2/debian/changelog kodi-audiodecoder-asap-3.0.1/debian/changelog
--- kodi-audiodecoder-asap-2.0.2/debian/changelog	2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/debian/changelog	2013-05-31 22:59:22.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-audiodecoder-asap (2.0.2-1~bionic) bionic; urgency=low
+kodi-audiodecoder-asap (3.0.1-1~bionic) bionic; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
diff -Nru kodi-audiodecoder-asap-2.0.2/debian/control kodi-audiodecoder-asap-3.0.1/debian/control
--- kodi-audiodecoder-asap-2.0.2/debian/control	2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/debian/control	2013-05-31 22:59:22.000000000 +0000
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev
 Standards-Version: 4.1.2
 Section: libs
-Homepage: http://kodi.tv
+Homepage: https://kodi.tv
 
 Package: kodi-audiodecoder-asap
 Section: libs
diff -Nru kodi-audiodecoder-asap-2.0.2/debian/rules kodi-audiodecoder-asap-3.0.1/debian/rules
--- kodi-audiodecoder-asap-2.0.2/debian/rules	2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/debian/rules	2013-05-31 22:59:22.000000000 +0000
@@ -10,13 +10,11 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1
-
-override_dh_strip:
-	dh_strip --dbg-package=kodi-audiodecoder-asap-dbg
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=kodi-audiodecoder-asap
+
diff -Nru kodi-audiodecoder-asap-2.0.2/debian/source/format kodi-audiodecoder-asap-3.0.1/debian/source/format
--- kodi-audiodecoder-asap-2.0.2/debian/source/format	2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/debian/source/format	2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff -Nru kodi-audiodecoder-asap-2.0.2/.gitignore kodi-audiodecoder-asap-3.0.1/.gitignore
--- kodi-audiodecoder-asap-2.0.2/.gitignore	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-# build artifacts
-build/
-audiodecoder.*/addon.xml
-
-# Debian build files
-debian/changelog
-debian/files
-debian/*.log
-debian/*.substvars
-debian/.debhelper/
-debian/tmp/
-debian/kodi-audiodecoder-*/
-obj-x86_64-linux-gnu/
-
-# commonly used editors
-# vim
-*.swp
-
-# Eclipse
-*.project
-*.cproject
-.classpath
-*.sublime-*
-.settings/
-
-# KDevelop 4
-*.kdev4
-
-# Visual Studio
-.vs/
-
-# gedit
-*~
-
-# CLion
-/.idea
-
-# clion
-.idea/
diff -Nru kodi-audiodecoder-asap-2.0.2/Jenkinsfile kodi-audiodecoder-asap-3.0.1/Jenkinsfile
--- kodi-audiodecoder-asap-2.0.2/Jenkinsfile	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/Jenkinsfile	2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-buildPlugin(version: "Leia")
+buildPlugin(version: "Matrix")
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/6502.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/6502.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/6502.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/6502.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-MADS = $(DO)mads -s -o:$@ $<
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "6502.mk")
-endif
-
-ASM6502_PLAYERS = cmc cm3 cmr cms dlt mpt rmt4 rmt8 tmc tm2 fc
-ASM6502_PLAYERS_OBX = $(ASM6502_PLAYERS:%=6502/%.obx)
-ASM6502_OBX = $(ASM6502_PLAYERS_OBX) 6502/xexb.obx 6502/xexd.obx 6502/xexinfo.obx
-
-6502/cmc.obx: $(srcdir)6502/cmc.asx
-	$(XASM) -d CM3=0 -d CMR=0
-
-6502/cm3.obx: $(srcdir)6502/cmc.asx
-	$(XASM) -d CM3=1 -d CMR=0
-
-6502/cmr.obx: $(srcdir)6502/cmc.asx
-	$(XASM) -d CM3=0 -d CMR=1
-
-6502/dlt.obx: $(srcdir)6502/dlt.as8
-	$(MADS) -c
-
-6502/rmt4.obx: $(srcdir)6502/rmt.asx
-	$(XASM) -d STEREOMODE=0
-
-6502/rmt8.obx: $(srcdir)6502/rmt.asx
-	$(XASM) -d STEREOMODE=1
-
-6502/fc.obx: $(srcdir)6502/fc.as8
-	$(MADS)
-
-6502/xexinfo.obx: $(srcdir)6502/xexinfo.asx
-	$(XASM) -d TEST=0 -l
-
-6502/xexinfo.xex: $(srcdir)6502/xexinfo.asx
-	$(XASM) -d TEST=1
-
-6502/%.obx: $(srcdir)6502/%.asx
-	$(XASM) -l
-
-CLEAN += $(ASM6502_OBX) 6502/fp3depk.obx 6502/xexinfo.xex 6502/*.lst
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cm3.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cm3.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cmc.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cmc.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cmc.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cmc.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,965 +0,0 @@
-*---------------------------*
-*     cmc player v 2.1      *
-*   by Marcin Lewandowski   *
-* based on cmc player v 2.0 *
-*      by Janusz Pelc       *
-*---------------------------*
-
- org $0500
-
-*--- strona 0
-
-addr equ $fc
-word equ $fe
-
-*--- skoki
-
- jmp basic
- jmp init
- jmp play
-
-*--- dane
-
-volume dta d'   '
-czest  dta d'   '
-numins dta d'   '
-
- dta c' cmc player v 2.1 '*
-
-frq    dta d'    '
-znieks dta d'    '
-audc   dta b(0)
-
-czest1 dta d'   '
-czest2 dta d'   '
-czest3 dta d'   '
-zniek  dta d'   '
-count1 dta b($ff),b($ff),b($ff)
-count2 dta d'   '
-lopad  dta d'   '
-numptr dta d'   '
-poswpt dta d'   '
-ilewol dta d'   '
-czygrx dta b($80),b($80),b($80)
-czygrc dta b($80)
-
-dana0  dta d'   '
-dana1  dta d'   '
-dana2  dta d'   '
-dana3  dta d'   '
-dana4  dta d'   '
-dana5  dta d'   '
-ladr   dta d'   '
-hadr   dta d'   '
-
-posptr dta b(0)
-possng dta b(0)
-pocrep dta b(0)
-konrep dta b(0)
-ilrep  dta b(0)
-tmpo   dta b(0)
-ltemp  dta b(0)
-b1     dta b(0)
-b2     dta b(0)
-b3     dta b(0)
-czygr  dta b(0)
-
-adrmus dta a(0)
-adradr dta a(0)
-adrsng dta a(0)
-
-*--- init
-
-init sta b1
- stx b2
- sty b3
- and #$70
- lsr @
- lsr @
- lsr @
- tax
- lda tab1,x
- sta zm1+1
- lda tab1+1,x
- sta zm1+2
- lda #3
- sta $d20f
- cld
- lda word
- pha
- lda word+1
- pha
- ldy b3
- ldx b2
- lda b1
-zm1 jsr graj
- pla
- sta word+1
- pla
- sta word
- rts
-
-graj lda adrsng
- sta word
- lda adrsng+1
- sta word+1
- ldy #0
- txa
- beq grajx
-l1 lda (word),y
- cmp #$8f
- beq l2
- cmp #$ef
- bne l3
-l2 dex
- bne l3
- iny
- cpy #$54
- bcs l4
- tya
- tax
- bpl grajx
-l3 iny
- cpy #$54
- bcc l1
-l4 rts
-
-grajx stx possng
- jsr skoncz
- lda #0
- ldx #9
-l5 sta poswpt,x
- dex
- bpl l5
- sta posptr
- lda #1
- sta czygr
- lda #$ff
- sta konrep
- lda adrmus
- sta word
- lda adrmus+1
- sta word+1
- ldy #$13
- lda (word),y
- tax
- lda adrsng
- sta word
- lda adrsng+1
- sta word+1
- ldy possng
-l6 lda (word),y
- cmp #$cf
- bne l7
- tya
- clc
- adc #$55
- tay
- lda (word),y
- bmi l8
- tax
- jmp l8
-l7 cmp #$8f
- beq l8
- cmp #$ef
- beq l8
- dey
- bpl l6
-l8 stx tmpo
- stx ltemp
- rts
-
-tempo and #$f
- beq l8
- stx d0+1
- stx d1+1
- stx d2+1
- sty d0+2
- sty d1+2
- sty d2+2
- rts
-
-inic stx adrmus
- stx word
- sty adrmus+1
- sty word+1
- clc
- txa
- adc #$14
- sta adradr
- tya
- adc #0
- sta adradr+1
- stx adrsng
- iny
- iny
- sty adrsng+1
- ldy #$13
- lda (word),y
- sta tmpo
- sta ltemp
-
-skoncz ldx #8
-l9 lda #0
- sta czygr
- sta $d200,x
- cpx #3
- bcs l10
- sta volume,x
- lda #$ff
- sta count1,x
-l10 dex
- bpl l9
-
-przer lda #$80
-l11 ldx #3
-l12 sta czygrx,x
- dex
- bpl l12
-l13 rts
-
-kont lda #1
- sta czygr
- lda #0
- beq l11
-
-instr and #3
- cmp #3
- beq l13
- cpx #$40
- bcs l13
- cpy #26
- bcs l13
- tax
- lda #$80
- sta czygrx,x
-
-inst lda #0
- sta count1,x
- sta count2,x
- sta lopad,x
- lda b2
- sta czest,x
-
- lda b3
- asl @
- asl @
- asl @
- sta word
- clc
- lda adrmus
- adc #$30
- pha
- lda adrmus+1
- adc #1
- tay
- pla
- clc
- adc word
- sta ladr,x
- tya
- adc #0
- sta hadr,x
-
- clc
- lda adrmus
- adc #$94
- sta word
- lda adrmus+1
- adc #0
- sta word+1
- lda b3
- asl @
- adc b3
- asl @
- tay
- lda (word),y
- sta dana0,x
- iny
- lda (word),y
- sta dana1,x
- and #7
- sta b1
- iny
- lda (word),y
- sta dana2,x
- iny
- lda (word),y
- sta dana3,x
- iny
- lda (word),y
- sta dana4,x
- iny
- lda (word),y
- sta dana5,x
-
- ldy #0
- lda b1
- cmp #3
- bne l14
- ldy #2
-l14 cmp #7
- bne l15
- ldy #4
-l15 lda tab3,y
- sta word
- lda tab3+1,y
- sta word+1
- lda dana2,x
- lsr @
- lsr @
- lsr @
- lsr @
- clc
- adc b2
- sta b2
- sta zm2+1
- tay
- lda b1
- cmp #7
- bne l16
- tya
- asl @
- tay
- lda (word),y
- sta czest1,x
- iny
- sty b2
- jmp l17
-l16 lda (word),y
- sta czest1,x
- lda dana2,x
- and #$f
- clc
- adc b2
- sta b2
-l17 ldy b2
- lda b1
- cmp #5
- php
- lda (word),y
- plp
- beq l18
- cmp czest1,x
- bne l18
- sec
- sbc #1
-l18 sta czest2,x
- lda dana0,x
- pha
- and #3
- tay
- lda tab4,y
- sta zniek,x
- pla
- lsr @
- lsr @
- lsr @
- lsr @
- ldy #$3e
- cmp #$f
- beq l19
- ldy #$37
- cmp #$e
- beq l19
- ldy #$30
- cmp #$d
- beq l19
- clc
-zm2 adc #0
- tay
-l19 lda tab5,y
- sta czest3,x
- rts
-
-*--- play
-
-play cld
- lda addr
- pha
- lda addr+1
- pha
- lda word
- pha
- lda word+1
- pha
- lda czygr
- bne g1
- jmp end
-g1 lda czygrc
- beq g2
- jmp dal3
-g2 lda tmpo
- cmp ltemp
- beq g3
- jmp dal2
-g3 lda posptr
- beq g4
- jmp dal1
-g4 ldx #2
-g5 ldy czygrx,x
- bmi g6
- sta czygrx,x
-g6 sta poswpt,x
- dex
- bpl g5
-
- lda adrsng
- sta addr
- lda adrsng+1
- sta addr+1
- ldy possng
- sty word
-g7 cpy konrep
- bne g8
- lda ilrep
- beq g8
- lda possng
- ldy pocrep
- sty possng
- dec ilrep
- bne g7
- sta possng
- tay
- bpl g7
-g8 ldx #0
-g9 lda (addr),y
- cmp #$fe
- bne g10
- ldy possng
- iny
- cpy word
- beq g11
- sty possng
- jmp g7
-g10 sta numptr,x
- clc
- tya
- adc #$55
- tay
- inx
- cpx #3
- bcc g9
- ldy possng
- lda (addr),y
- bpl dal1
- cmp #$ff
- beq dal1
- lsr @
- lsr @
- lsr @
- and #$e
- tax
- lda tab2,x
- sta zm3+1
- lda tab2+1,x
- sta zm3+2
- lda numptr+1
- sta word+1
-zm3 jsr stop
- sty possng
- cpy #$55
- bcs g11
- cpy word
- bne g7
-g11 ldy word
- sty possng
- jmp end
-
-stop jsr przer
-g12 ldy #$ff
- rts
-jump bmi g12
- tay
- rts
-up bmi g12
- sec
- tya
- sbc word+1
- tay
- rts
-down bmi g12
- clc
- tya
- adc word+1
- tay
- rts
-temp bmi g12
- sta tmpo
- sta ltemp
- iny
- rts
-rep bmi g12
- lda numptr+2
- bmi g12
- sta ilrep
- iny
- sty pocrep
- clc
- tya
- adc word+1
- sta konrep
- rts
-break dey
- bmi g13
- lda (addr),y
- cmp #$8f
- beq g13
- cmp #$ef
- bne break
-g13 iny
- rts
-
-dal1 ldx #2
-v1 lda ilewol,x
- beq v2
- dec ilewol,x
- bpl v7
-v2 lda czygrx,x
- bne v7
- ldy numptr,x
- cpy #$40
- bcs v7
- lda adradr
- sta addr
- lda adradr+1
- sta addr+1
- lda (addr),y
- sta word
- clc
- tya
- adc #$40
- tay
- lda (addr),y
- sta word+1
- and word
- cmp #$ff
- beq v7
-v3 ldy poswpt,x
- lda (word),y
- and #$c0
- bne v4
- lda (word),y
- and #$3f
- sta numins,x
- inc poswpt,x
- bpl v3
-v4 cmp #$40
- bne v5
- lda (word),y
- and #$3f
- sta b2
- lda numins,x
- sta b3
- jsr inst
- jmp v6
-v5 cmp #$80
- bne v7
- lda (word),y
- and #$3f
- sta ilewol,x
-v6 inc poswpt,x
-v7 dex
- bpl v1
-
- ldx posptr
- inx
- ift CM3
- cpx #$30
- scc:ldx #0
- stx posptr
- els
- txa
- and #$3f
- sta posptr
- eif
-
-dal2 dec ltemp
- bne dal3
- lda tmpo
- sta ltemp
- lda posptr
- bne dal3
- inc possng
-
-dal3 ldy czest2
- lda dana1
- and #7
- cmp #5
- beq a1
- cmp #6
- bne a2
-a1 dey
-a2 sty frq+3
- ldy #0
- cmp #5
- beq a3
- cmp #6
- bne a4
-a3 ldy #2
-a4 cmp #7
- bne a5
- ldy #$28
-a5 sty audc
-
- ldx #2
-loop lda dana1,x
- and #$e0
- sta znieks,x
- lda ladr,x
- sta addr
- lda hadr,x
- sta addr+1
- lda count1,x
- cmp #$ff
- beq y4
- cmp #$f
- bne y2
- lda lopad,x
- beq y4
- dec lopad,x
- lda lopad,x
- bne y4
- ldy volume,x
- beq y1
- dey
-y1 tya
- sta volume,x
- lda dana3,x
- sta lopad,x
- jmp y4
-y2 lda count1,x
- lsr @
- tay
- lda (addr),y
- bcc y3
- lsr @
- lsr @
- lsr @
- lsr @
-y3 and #$f
- sta volume,x
-y4 ldy czest1,x
- lda dana1,x
- and #7
- cmp #1
- bne y6
- dey
- tya
- iny
- cmp czest2,x
- php
- lda #1
- plp
- bne y5
- asl @
- asl @
-y5 and count2,x
- beq y6
- ldy czest2,x
- cpy #$ff
- bne y6
- lda #0
- sta volume,x
-y6 tya
- sta frq,x
- lda #1
- sta b1
- lda count1,x
- cmp #$f
- beq y9
- and #7
- tay
- lda tab9,y
- sta word
- lda count1,x
- and #8
- php
- txa
- plp
- clc
- beq y7
- adc #3
-y7 tay
- lda dana4,y
- and word
- beq y9
- lda czest3,x
- sta frq,x
- stx b1
- dex
- bpl y8
- sta frq+3
- lda #0
- sta audc
-y8 inx
- lda zniek,x
- sta znieks,x
-y9 lda count1,x
- and #$f
- cmp #$f
- beq y10
- inc count1,x
- lda count1,x
- cmp #$f
- bne y10
- lda dana3,x
- sta lopad,x
-y10 lda czygrx,x
- bpl y11
- lda volume,x
- bne y11
- lda #$40
- sta czygrx,x
-y11 inc count2,x
- ldy #0
- lda dana1,x
- lsr @
- lsr @
- lsr @
- lsr @
- bcc y12
- dey
-y12 lsr @
- bcc y13
- iny
-y13 clc
- tya
- adc czest1,x
- sta czest1,x
- lda czest2,x
- cmp #$ff
- bne y14
- ldy #0
-y14 clc
- tya
- adc czest2,x
- sta czest2,x
- dex
- bmi x1
- jmp loop
-
-x1 lda znieks
- sta znieks+3
- lda dana1
- and #7
- tax
- ldy #3
- lda b1
- beq x2
- ldy tab10,x
-x2 tya
- pha
- lda tab8,y
- php
- and #$7f
- tax
- tya
- and #3
- asl @
- tay
- lda frq,x
-d0 sta $d200,y
- iny
- lda volume,x
- cpx #3
- bne x3
- lda volume
-x3 ora znieks,x
- plp
- bpl d1
- lda #0
-d1 sta $d200,y
- pla
- tay
- dey
- and #3
- bne x2
- ldy #8
- lda audc
-d2 sta $d200,y
-
- clc
-end pla
- sta word+1
- pla
- sta word
- pla
- sta addr+1
- pla
- sta addr
- rts
-
-*--- basic
-
-basic pla
- tax
- beq p6
- cmp #2
- beq p2
-p1 pla
- pla
- dex
- bne p1
- rts
-p2 lda $14
- cmp $14
- beq *-2
- lda $224
- cmp <p8
- bne p3
- lda $225
- cmp >p8
- beq p1
-p3 lda $224
- sta p9+1
- lda $225
- sta p9+2
- lda <p8
- sta $224
- lda >p8
- sta $225
- pla
- pla
- beq p4
- sec
- sbc #1
-p4 sta p5+1
- pla
- tay
- pla
- tax
- lda #$70
- jsr init
- lda #0
-p5 ldx #0
- jmp init
-p6 lda $14
- cmp $14
- beq *-2
- lda $224
- cmp <p8
- bne p2-1
- lda $225
- cmp >p8
- bne p2-1
-p7 lda p9+1
- sta $224
- lda p9+2
- sta $225
- lda #$40
- jmp init
-p8 jsr play
- bcc p9
- jsr p7
-p9 jmp $ffff
-
-*--- tablice
-
-tab1 dta a(graj)
- dta a(grajx)
- dta a(instr)
- dta a(tempo)
- dta a(skoncz)
- dta a(przer)
- dta a(kont)
- dta a(inic)
-
-tab2 dta a(stop)
- dta a(jump)
- dta a(up)
- dta a(down)
- dta a(temp)
- dta a(rep)
- dta a(break)
-
-tab3 dta a(tab5)
- dta a(tab6)
- dta a(tab7)
-
-tab4 dta b($80),b($a0)
- dta b($20),b($40)
-
-tab5 dta b($ff),b($f1),b($e4),b($d7)
- dta b($cb),b($c0),b($b5),b($aa)
- dta b($a1),b($98),b($8f),b($87)
- dta b($7f),b($78),b($72),b($6b)
- dta b($65),b($5f),b($5a),b($55)
- dta b($50),b($4b),b($47),b($43)
- dta b($3f),b($3c),b($38),b($35)
- dta b($32),b($2f),b($2c),b($2a)
- dta b($27),b($25),b($23),b($21)
- dta b($1f),b($1d),b($1c),b($1a)
- dta b($18),b($17),b($16),b($14)
- dta b($13),b($12),b($11),b($10)
- dta b($0f),b($0e),b($0d),b($0c)
- dta b($0b),b($0a),b($09),b($08)
- dta b($07),b($06),b($05),b($04)
- dta b($03),b($02),b($01),b($00)
- dta b($00)
-
-tab6 dta b($00),b($00),b($00),b($00)
- dta b($f2),b($e9),b($da),b($ce)
- dta b($bf),b($b6),b($aa),b($a1)
- dta b($98),b($8f),b($89),b($80)
- dta b($7a),b($71),b($6b),b($65)
- dta b($5f)
- ift CMR
- dta b($5c),b($56),b($50)
- dta b($4d),b($47),b($44),b($41)
- dta b($3e),b($38),b($35),b($88)
- dta b($7f),b($79),b($73),b($6c)
- dta b($67),b($60),b($5a),b($55)
- dta b($51),b($4c),b($48),b($43)
- dta b($3f),b($3d),b($39),b($34)
- dta b($33),b($30),b($2d),b($2a)
- dta b($28),b($25),b($24),b($21)
- dta b($1f),b($1e)
- els
- dta b($00),b($56),b($50)
- dta b($67),b($60),b($5a),b($55)
- dta b($51),b($4c),b($48),b($43)
- dta b($3f),b($3d),b($39),b($34)
- dta b($33),b($39),b($2d),b($2a)
- dta b($28),b($25),b($24),b($21)
- dta b($1f),b($1e),b($00),b($00)
- dta b($0f),b($0e),b($0d),b($0c)
- dta b($0b),b($0a),b($09),b($08)
- dta b($07),b($06)
- eif
- dta b($05),b($04)
- dta b($03),b($02),b($01),b($00)
- dta b($00)
-
-tab7 dta a($b38),a($a8c),a($a00),a($96a)
- dta a($8e8),a($86a),a($7ef),a($780)
- dta a($708),a($6ae),a($646),a($5e6)
- dta a($595),a($541),a($4f6),a($4b0)
- dta a($46e),a($430),a($3f6),a($3bb)
- dta a($384),a($352),a($322),a($2f4)
- dta a($2c8),a($2a0),a($27a),a($255)
- dta a($234),a($214),a($1f5),a($1d8)
- dta a($1bd),a($1a4),a($18d),a($177)
- dta a($160),a($14e),a($138),a($127)
- dta a($115),a($106),a($0f7),a($0e8)
- dta a($0db),a($0cf),a($0c3),a($0b8)
- dta a($0ac),a($0a2),a($09a),a($090)
- dta a($088),a($07f),a($078),a($070)
- dta a($06a),a($064),a($05e),a($057)
- dta a($052),a($032),a($00a)
-
-tab8 dta b($00),b($01),b($02),b($83)
- dta b($00),b($01),b($02),b($03)
- dta b($01),b($00),b($02),b($83)
- dta b($01),b($00),b($02),b($03)
- dta b($01),b($02),b($80),b($03)
-
-tab9 dta b($80),b($40),b($20),b($10)
- dta b($08),b($04),b($02),b($01)
-
-tab10 dta b(3),b(3),b(3),b(3)
- dta b(7),b($b),b($f),b($13)
-
-*--- koniec
-
- end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cmc.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cmc.obx differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cmr.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cmr.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cms.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cms.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cms.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cms.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,1065 +0,0 @@
-ZP_C8	equ $C8
-ZP_FC	equ $FC
-ZP_FD	equ $FD
-ZP_FE	equ $FE
-ZP_FF	equ $FF
-L_0224	equ $0224
-L_0225	equ $0225
-
-	org $0500
-
-L_0500	:3 nop
-L_0503	jmp L_0815
-L_0506	jmp L_0F5C
-L_0509	dta $23,$05,$A9,$05,$AD,$05,$B8,$05
-L_0511	dta $00,$00,$00,$00,$00,$00
-L_0517	dta $00,$00,$00,$00,$00,$00
-L_051D	dta $80,$80,$80,$80,$80,$80
-L_0523	dta $00,$00,$00
-L_0526	dta $00,$00,$00
-L_0529	dta $FF,$FF,$FF,$FF,$FF,$FF
-L_052F	dta $00,$00,$00,$00,$00,$00
-L_0535	dta $00
-L_0536	dta $00
-L_0537	dta $00
-L_0538	dta $00,$00,$00
-L_053B	dta $00,$00,$00
-L_053E	dta $00,$00,$00
-L_0541	dta $00,$00,$00
-L_0544	dta $00,$00,$00
-L_0547	dta $00,$00,$00,$00,$00,$00
-L_054D	dta $00,$00,$00,$00,$00,$00
-L_0553	dta $00,$00,$00,$00,$00,$00
-L_0559	dta $00,$00,$00
-L_055C	dta $00,$00,$00
-L_055F	dta $00,$00,$00
-L_0562	dta $00,$00,$00
-L_0565	dta $00,$00,$00,$00,$00,$00
-L_056B	dta $00,$00,$00,$00,$00,$00
-L_0571	dta $00,$00,$00,$00,$00,$00
-L_0577	dta $00,$00,$00,$00,$00,$00
-L_057D	dta $00,$00,$00,$00,$00,$00
-L_0583	dta $00,$00,$00,$00,$00,$00
-L_0589	dta $00,$00,$00
-L_058C	dta $00,$00,$00
-L_058F	dta $00
-L_0590	dta $00
-L_0591	dta $00
-L_0592	dta $00
-L_0593	dta $00
-L_0594	dta $82
-L_0595	dta $00
-L_0596	dta $00
-L_0597	dta $06
-L_0598	dta $06
-L_0599	dta $00
-L_059A	dta $80
-L_059B	dta $14
-L_059C	dta $80
-L_059D	dta $80
-L_059E	dta $00
-L_059F	dta $00
-L_05A0	dta $00
-L_05A1	dta $00
-L_05A2	dta $00
-L_05A3	dta $00
-L_05A4	dta $00
-L_05A5	dta $00
-L_97A5	equ L_05A5 ; relocation bugfix by 0xF
-L_05A6	dta $00
-L_05A7	dta $00
-L_97A7	equ L_05A7 ; relocation bugfix by 0xF
-L_05A8	dta $00
-L_05A9	dta $0F
-L_05AA	dta $0F
-L_05AB	dta $00
-L_05AC	dta $00
-L_05AD	dta $00,$00,$00
-L_05B0	dta $00,$00,$00
-L_05B3	dta $FF
-L_05B4	dta $00,$00,$00
-L_05B7	dta $00
-L_05B8	dta $00
-L_05B9	dta $00,$01,$02,$83,$00,$01,$02,$03,$01,$00,$02,$83,$01,$00,$02,$03
-	dta $01,$02,$80,$03
-L_05CD	dta $80,$40,$20,$10,$08,$04,$02,$01
-L_05D5	dta a(L_084B,L_0876,L_0985,L_0913,L_0950,L_096E,L_097C,L_091A)
-L_05E5	dta $80,$A0,$20,$40
-L_05E9	dta $FF,$F1,$E4,$D7,$CB,$C0,$B5,$AA,$A1,$98,$8F,$87,$7F,$78,$72,$6B
-	dta $65,$5F,$5A,$55,$50,$4B,$47,$43,$3F,$3C,$38,$35,$32,$2F,$2C,$2A
-	dta $27,$25,$23,$21,$1F,$1D,$1C,$1A,$18,$17,$16,$14,$13,$12,$11,$10
-	dta $0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00
-	dta $00
-L_062A	dta $00,$00,$00,$00,$F2,$E9,$DA,$CE,$BF,$B6,$AA,$A1,$98,$8F,$89
-	dta $80,$7A,$71,$6B,$65,$5F,$00,$56,$50,$67,$60,$5A,$55,$51,$4C,$48
-	dta $43,$3F,$3D,$39,$34,$33,$39,$2D,$2A,$28,$25,$24,$21,$1F,$1E,$00
-	dta $00,$0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01
-	dta $00,$00
-L_066B	dta $38,$0B,$8C,$0A,$00,$0A,$6A,$09,$E8,$08,$6A,$08,$EF,$07
-	dta $80,$07,$08,$07,$AE,$06,$46,$06,$E6,$05,$95,$05,$41,$05,$F6,$04
-	dta $B0,$04,$6E,$04,$30,$04,$F6,$03,$BB,$03,$84,$03,$52,$03,$22,$03
-	dta $F4,$02,$C8,$02,$A0,$02,$7A,$02,$55,$02,$34,$02,$14,$02,$F5,$01
-	dta $D8,$01,$BD,$01,$A4,$01,$8D,$01,$77,$01,$60,$01,$4E,$01,$38,$01
-	dta $27,$01,$15,$01,$06,$01,$F7,$00,$E8,$00,$DB,$00,$CF,$00,$C3,$00
-	dta $B8,$00,$AC,$00,$A2,$00,$9A,$00,$90,$00,$88,$00,$7F,$00,$78,$00
-	dta $70,$00,$6A,$00,$64,$00,$5E,$00,$57,$00,$52,$00,$32,$00,$0A,$00
-L_06E9	dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-	dta $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01
-	dta $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$02,$02,$02,$02
-	dta $00,$00,$00,$00,$01,$01,$01,$01,$02,$02,$02,$02,$02,$03,$03,$03
-	dta $00,$00,$01,$01,$01,$02,$02,$02,$02,$02,$03,$03,$03,$03,$04,$04
-	dta $00,$00,$01,$01,$01,$02,$02,$02,$03,$03,$03,$04,$04,$04,$05,$05
-	dta $00,$00,$01,$01,$02,$02,$02,$03,$03,$04,$04,$04,$05,$05,$06,$06
-	dta $00,$00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07
-	dta $00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07,$08
-	dta $00,$01,$01,$02,$02,$03,$04,$04,$05,$05,$06,$07,$07,$08,$08,$09
-	dta $00,$01,$01,$02,$03,$03,$04,$05,$05,$06,$07,$07,$08,$09,$09,$0A
-	dta $00,$01,$01,$02,$03,$04,$04,$05,$06,$07,$07,$08,$09,$0A,$0A,$0B
-	dta $00,$01,$02,$02,$03,$04,$05,$06,$07,$08,$09,$09,$0A,$0B,$0B,$0C
-	dta $00,$01,$02,$03,$04,$05,$05,$06,$07,$08,$09,$0A,$0A,$0B,$0C,$0D
-	dta $00,$01,$02,$03,$04,$05,$06,$07,$07,$08,$09,$0A,$0B,$0C,$0D,$0E
-	dta $00,$01,$02,$03,$04,$05,$06,$07,$08,$09,$0A,$0B,$0C,$0D,$0E,$0F
-L_07E9	dta a(L_0C06,L_0C0C,L_0C12,L_0C1C,L_0C26,L_0C32,L_0C4F)
-L_07F7	dta a(L_05E9,L_062A,L_066B)
-L_07FD	dta a(L_0BA1,L_0BC4,L_0BB9,0,0,0,0,0) ; bugfix by 0xF
-L_080D	dta $03,$03,$03,$03,$07,$0B,$0F,$13 ; bugfix by 0xF
-L_0815	sta L_058F
-	stx L_0590
-	sty L_0591
-	and #$70
-	lsr @
-	lsr @
-	lsr @
-	tax
-	lda #$03
-	sta $D20F
-	lda L_05D5,X
-	sta L_0849
-	lda L_05D5+1,X
-	sta L_084A
-	lda #$03
-	sta $D21F
-	lda #$01
-	sta L_0592
-	ldy L_0591
-	ldx L_0590
-	lda L_058F
-	jmp *
-L_0849	equ *-2
-L_084A	equ *-1
-L_084B	lda L_0593
-	sta ZP_FC
-	lda L_0594
-	sta ZP_FD
-	ldy #$00
-	txa
-	beq L_0876
-L_085A	lda (ZP_FC),Y
-	cmp #$8F
-	beq L_0864
-	cmp #$EF
-	bne L_0870
-L_0864	dex
-	bne L_0870
-	iny
-	cpy #$54
-	bcs L_0875
-	tya
-	tax
-	bpl L_0876
-L_0870	iny
-	cpy #$54
-	bcc L_085A
-L_0875	rts
-L_0876	stx L_0595
-	lda #$00
-	ldx #$05
-L_087D	sta L_0511,X
-	sta L_0517,X
-	sta L_051D,X
-	dex
-	bpl L_087D
-	sta L_0596
-	sta L_059D
-	ldy #$FF
-	sty L_059F
-	lda L_0599
-	sta ZP_FC
-	lda L_059A
-	sta ZP_FD
-	ldy #$13
-	lda (ZP_FC),Y
-	tax
-	lda L_0593
-	sta ZP_FC
-	lda L_0594
-	sta ZP_FD
-	ldy L_0595
-	tya
-	pha
-	lda #$0F
-	sta L_05A9
-	sta L_05AA
-L_08BA	lda (ZP_FC),Y
-	cmp #$87
-	bne L_08E3
-	tya
-	pha
-	clc
-	adc #$55
-	tay
-	lda (ZP_FC),Y
-	bpl L_08CC
-	lda #$0F
-L_08CC	and #$0F
-	sta L_05A9
-	tya
-	clc
-	adc #$55
-	tay
-	lda (ZP_FC),Y
-	bpl L_08DD
-	lda L_05A9
-L_08DD	and #$0F
-	sta L_05AA
-	pla
-L_08E3	jmp L_08F3
-L_08E6	lda (ZP_FC),Y
-	cmp #$8F
-	beq L_08F3
-	cmp #$EF
-	beq L_08F3
-	dey
-	bpl L_08BA
-L_08F3	pla
-	tay
-L_08F5	lda (ZP_FC),Y
-	cmp #$CF
-	bne L_0908
-	tya
-	clc
-	adc #$55
-	tay
-	lda (ZP_FC),Y
-	bmi L_0913
-	tax
-	jmp L_0913
-L_0908	cmp #$8F
-	beq L_0913
-	cmp #$EF
-	beq L_0913
-	dey
-	bpl L_08F5
-L_0913	stx L_0597
-	stx L_0598
-	rts
-L_091A	stx L_0599
-	stx ZP_FC
-	sty L_059A
-	sty ZP_FD
-	clc
-	txa
-	adc #$14
-	sta L_059B
-	tya
-	adc #$00
-	sta L_059C
-	clc
-	txa
-	adc #$00
-	sta L_0593
-	tya
-	adc #$02
-	sta L_0594
-	ldy #$13
-	lda (ZP_FC),Y
-	sta L_0597
-	sta L_0598
-	ldx #$03
-	stx $D21F
-	stx $D20F
-L_0950	lda #$00
-	sta L_0592
-	ldy #$08
-L_0957	lda #$00
-	sta $D200,Y
-	sta $D210,Y
-	cpy #$06
-	bcs L_096B
-	sta L_0523,Y
-	lda #$FF
-	sta L_0529,Y
-L_096B	dey
-	bpl L_0957
-L_096E	lda #$80
-L_0970	ldx #$05
-L_0972	sta L_051D,X
-	dex
-	bpl L_0972
-	sta L_059D
-	rts
-L_097C	lda #$00
-	beq L_0970
-	sta L_059D
-	beq L_0990
-L_0985	lda L_058F
-	and #$07
-	tax
-	lda #$80
-	sta L_051D,X
-L_0990	ldy L_0591
-	lda L_0590
-L_0996	sta L_058F
-	sty L_0591
-	lda #$00
-	sta L_0553,X
-	sta L_0529,X
-	sta L_054D,X
-	tya
-	asl @
-	asl @
-	asl @
-	sta ZP_FE
-	clc
-	lda L_0599
-	adc #$30
-	pha
-	lda L_059A
-	adc #$01
-	tay
-	pla
-	clc
-	adc ZP_FE
-	sta L_0565,X
-	tya
-	adc #$00
-	sta L_0547,X
-	clc
-	lda L_0599
-	adc #$94
-	sta ZP_FC
-	lda L_059A
-	adc #$00
-	sta ZP_FD
-	lda L_0591
-	asl @
-	adc L_0591
-	asl @
-	tay
-	sty L_0591
-	iny
-	iny
-	iny
-	iny
-	iny
-	lda (ZP_FC),Y
-	sta L_0571,X
-	dey
-	lda (ZP_FC),Y
-	sta L_056B,X
-	dey
-	lda (ZP_FC),Y
-	sta L_0577,X
-	dey
-	dey
-	lda (ZP_FC),Y
-	sta L_053B,X
-	ldy #$00
-	and #$07
-	cmp #$03
-	bne L_0A09
-	ldy #$02
-L_0A09	cmp #$07
-	bne L_0A0F
-	ldy #$04
-L_0A0F	lda L_07F7,Y
-	sta ZP_FE
-	lda L_07F7+1,Y
-	sta ZP_FF
-	ldy L_0591
-	iny
-	iny
-	lda (ZP_FC),Y
-	lsr @
-	lsr @
-	lsr @
-	lsr @
-	clc
-	adc L_058F
-	sta L_058F
-	sta L_0A9F
-	tay
-	lda L_053B,X
-	and #$07
-	cmp #$07
-	bne L_0A47
-	tya
-	asl @
-	tay
-	lda (ZP_FE),Y
-	sta L_057D,X
-	iny
-	sty L_058F
-	jmp L_0A5C
-L_0A47	lda (ZP_FE),Y
-	sta L_057D,X
-	ldy L_0591
-	iny
-	iny
-	lda (ZP_FC),Y
-	and #$0F
-	clc
-	adc L_058F
-	sta L_058F
-L_0A5C	ldy L_058F
-	lda L_053B,X
-	and #$07
-	cmp #$05
-	php
-	lda (ZP_FE),Y
-	plp
-	beq L_0A74
-	cmp L_057D,X
-	bne L_0A74
-	sec
-	sbc #$01
-L_0A74	sta L_0559,X
-	ldy L_0591
-	lda (ZP_FC),Y
-	pha
-	and #$03
-	tay
-	lda L_05E5,Y
-	sta L_0583,X
-	pla
-	lsr @
-	lsr @
-	lsr @
-	lsr @
-	ldy #$3E
-	cmp #$0F
-	beq L_0AA1
-	ldy #$37
-	cmp #$0E
-	beq L_0AA1
-	ldy #$30
-	cmp #$0D
-	beq L_0AA1
-	clc
-	adc #$32
-L_0A9F	equ *-1
-	tay
-L_0AA1	lda L_05E9,Y
-	sta L_0589,X
-	rts
-L_0AA8	cld
-	lda ZP_FC
-	pha
-	lda ZP_FD
-	pha
-	lda ZP_FE
-	pha
-	lda ZP_FF
-	pha
-	lda L_0592
-	bne L_0ABD
-	jmp L_0F2F
-L_0ABD	lda L_059D
-	beq L_0AC5
-	jmp L_0CE1
-L_0AC5	lda L_0598
-	cmp L_0597
-	bcs L_0AD0
-	jmp L_0CCE
-L_0AD0	lda L_0596
-	beq L_0AD8
-	jmp L_0B9E
-L_0AD8	ldx #$05
-	lda #$00
-L_0ADC	ldy L_051D,X
-	bmi L_0AE4
-	sta L_051D,X
-L_0AE4	sta L_0511,X
-	dex
-	bpl L_0ADC
-	lda L_0593
-	sta ZP_FC
-	lda L_0594
-	sta ZP_FD
-	ldy L_0595
-	sty L_05A1
-L_0AFA	cpy L_059F
-	bne L_0B18
-	lda L_05A0
-	beq L_0B18
-	lda L_0595
-	ldy L_059E
-	sty L_0595
-	dec L_05A0
-	bne L_0AFA
-	sta L_0595
-	tay
-	bpl L_0AFA
-L_0B18	ldx #$00
-L_0B1A	lda (ZP_FC),Y
-	cmp #$FE
-	beq L_0B3C
-	sta L_0535,X
-	inc ZP_FD
-	lda (ZP_FC),Y
-	dec ZP_FD
-	cmp #$FE
-	beq L_0B3C
-	sta L_0538,X
-	clc
-	tya
-	adc #$55
-	tay
-	inx
-	cpx #$03
-	bcc L_0B1A
-	bcs L_0B5E
-L_0B3C	ldy L_0595
-	iny
-	cpy L_05A1
-	beq L_0B95
-	sty L_0595
-L_0B48	jmp L_0AFA
-L_0B4B	pla
-	and #$0E
-	tax
-	lda L_07FD,X
-	sta L_0B87
-	lda L_07FD+1,X
-	sta L_0B88
-	jmp L_0B81
-L_0B5E	ldy L_0595
-	lda (ZP_FC),Y
-	bpl L_0B9E
-	cmp #$FF
-	beq L_0B9E
-	lsr @
-	lsr @
-	lsr @
-	pha
-	and #$01
-	beq L_0B4B
-	pla
-	and #$0E
-	tax
-	lda L_07E9,X
-	sta L_0B87
-	lda L_07E9+1,X
-	sta L_0B88
-L_0B81	lda L_0536
-	sta ZP_FE
-	jsr *
-L_0B87	equ *-2
-L_0B88	equ *-1
-	sty L_0595
-	cpy #$55
-	bcs L_0B95
-	cpy L_05A1
-	bne L_0B48
-L_0B95	ldy L_05A1
-	sty L_0595
-	jmp L_0F2F
-L_0B9E	jmp L_0C5E
-L_0BA1	lda ZP_FE
-	bmi L_0BB7
-	and #$0F
-	sta L_05A9
-	lda L_0537
-	bpl L_0BB2
-	lda L_05A9
-L_0BB2	and #$0F
-	sta L_05AA
-L_0BB7	iny
-	rts
-L_0BB9	lda ZP_FE
-	bmi L_0BB7
-	and #$01
-	sta L_05B8
-	iny
-	rts
-L_0BC4	lda L_05B3
-	bmi L_0BDD
-	dec L_05B4
-	bne L_0C01
-	lda #$32
-	sta L_05B4
-	dec L_05B3
-	bne L_0C01
-	dec L_05B3
-	iny
-	rts
-L_0BDD	lda ZP_FE
-	bmi L_0BB7
-	sta L_05B4
-	inc L_05B4
-	lda ZP_FE
-	bmi L_0BB7
-	sta L_05B4
-	inc L_05B4
-	lda L_0537
-	sta L_05B3
-	bpl L_0BFE
-	lda #$00
-	sta L_05B3
-L_0BFE	inc L_05B3
-L_0C01	pla
-	pla
-	jmp L_0CE1
-L_0C06	jsr L_096E
-L_0C09	ldy #$FF
-	rts
-L_0C0C	lda ZP_FE
-	bmi L_0C09
-	tay
-	rts
-L_0C12	lda ZP_FE
-	bmi L_0C09
-	sec
-	tya
-	sbc ZP_FE
-	tay
-	rts
-L_0C1C	lda ZP_FE
-	bmi L_0C09
-	clc
-	tya
-	adc ZP_FE
-	tay
-	rts
-L_0C26	lda ZP_FE
-	bmi L_0C09
-	sta L_0597
-	sta L_0598
-	iny
-	rts
-L_0C32	lda ZP_FE
-	bmi L_0C09
-	lda L_0537
-	bmi L_0C09
-	iny
-	sty L_059E
-	clc
-	tya
-	adc ZP_FE
-	sta L_059F
-	lda L_0537
-	sta L_05A0
-	cpy #$54
-	rts
-L_0C4F	dey
-	bmi L_0C5C
-	lda (ZP_FC),Y
-	cmp #$8F
-	beq L_0C5C
-	cmp #$EF
-	bne L_0C4F
-L_0C5C	iny
-	rts
-L_0C5E	ldx #$05
-L_0C60	lda L_0517,X
-	beq L_0C6A
-	dec L_0517,X
-	bpl L_0CC1
-L_0C6A	lda L_051D,X
-	bne L_0CC1
-	ldy L_0535,X
-	cmp #$40
-	bcs L_0CC1
-	lda L_059B
-	sta ZP_FC
-	lda L_059C
-	sta ZP_FD
-	lda (ZP_FC),Y
-	sta ZP_FE
-	clc
-	tya
-	adc #$40
-	tay
-	lda (ZP_FC),Y
-	sta ZP_FF
-L_0C8D	ldy L_0511,X
-	lda (ZP_FE),Y
-	and #$C0
-	bne L_0CA2
-	lda (ZP_FE),Y
-	and #$3F
-	sta L_052F,X
-	inc L_0511,X
-	bpl L_0C8D
-L_0CA2	cmp #$40
-	bne L_0CB3
-	lda (ZP_FE),Y
-	and #$3F
-	ldy L_052F,X
-	jsr L_0996
-	jmp L_0CBE
-L_0CB3	cmp #$80
-	bne L_0CC1
-	lda (ZP_FE),Y
-	and #$3F
-	sta L_0517,X
-L_0CBE	inc L_0511,X
-L_0CC1	dex
-	bpl L_0C60
-	ldx L_0596
-	inx
-	txa
-	and #$3F
-	sta L_0596
-L_0CCE	dec L_0598
-	bne L_0CE1
-	lda L_0597
-	sta L_0598
-	lda L_0596
-	bne L_0CE1
-	inc L_0595
-L_0CE1	ldy L_0559
-	lda L_053B
-	and #$07
-	cmp #$05
-	beq L_0CF1
-	cmp #$06
-	bne L_0CF2
-L_0CF1	dey
-L_0CF2	sty L_05A2
-	ldy #$00
-	cmp #$05
-	beq L_0CFF
-	cmp #$06
-	bne L_0D01
-L_0CFF	ldy #$02
-L_0D01	cmp #$07
-	bne L_0D07
-	ldy #$28
-L_0D07	sty L_05A4
-	ldy L_055C
-	lda L_053E
-	and #$07
-	cmp #$05
-	beq L_0D1A
-	cmp #$06
-	bne L_0D1B
-L_0D1A	dey
-L_0D1B	sty L_05A3
-	ldy #$00
-	cmp #$05
-	beq L_0D28
-	cmp #$06
-	bne L_0D2A
-L_0D28	ldy #$02
-L_0D2A	cmp #$07
-	bne L_0D30
-	ldy #$28
-L_0D30	sty L_05A5
-	ldx #$05
-L_0D35	lda L_053B,X
-	and #$E0
-	sta L_0541,X
-	lda L_0565,X
-	sta ZP_FC
-	lda L_0547,X
-	sta ZP_FD
-	lda L_0529,X
-	cmp #$FF
-	beq L_0D85
-	cmp #$0F
-	bne L_0D73
-	lda L_054D,X
-	beq L_0D85
-	dec L_054D,X
-	lda L_054D,X
-	bne L_0D85
-	ldy L_0523,X
-	beq L_0D65
-	dey
-L_0D65	tya
-	sta L_0523,X
-	lda L_0577,X
-	sta L_054D,X
-	dey
-	jmp L_0D85
-L_0D73	lda L_0529,X
-	lsr @
-	tay
-	lda (ZP_FC),Y
-	bcc L_0D80
-	lsr @
-	lsr @
-	lsr @
-	lsr @
-L_0D80	and #$0F
-	sta L_0523,X
-L_0D85	ldy L_057D,X
-	lda L_053B,X
-	and #$07
-	cmp #$01
-	bne L_0DB0
-	dey
-	tya
-	iny
-	cmp L_0559,X
-	php
-	lda #$01
-	plp
-	bne L_0D9F
-	asl @
-	asl @
-L_0D9F	and L_0553,X
-	beq L_0DB0
-	ldy L_0559,X
-	cpy #$FF
-	bne L_0DB0
-	lda #$00
-	sta L_0523,X
-L_0DB0	tya
-	sta L_055F,X
-	lda #$01
-	sta L_05A8
-	lda L_0529,X
-	cmp #$0F
-	beq L_0E0C
-	and #$07
-	tay
-	lda L_05CD,Y
-	sta ZP_FE
-	lda L_0529,X
-	and #$08
-	php
-	txa
-	plp
-	clc
-	beq L_0DD5
-	adc #$06
-L_0DD5	tay
-	lda L_056B,Y
-	and ZP_FE
-	beq L_0E0C
-	lda L_0589,X
-	sta L_055F,X
-	stx L_05A8
-	dex
-	cpx #$02
-	beq L_0DFA
-	cpx #$FF
-	bne L_0E05
-	sta L_05A2
-	lda #$00
-	sta L_05A4
-	jmp L_0E05
-L_0DFA	lda L_058C
-	sta L_05A3
-	lda #$00
-	sta L_05A5
-L_0E05	inx
-	lda L_0583,X
-	sta L_0541,X
-L_0E0C	lda L_0529,X
-	and #$0F
-	cmp #$0F
-	beq L_0E27
-	inc L_0529,X
-	lda L_0529,X
-	and #$0F
-	cmp #$0F
-	bne L_0E27
-	lda L_0577,X
-	sta L_054D,X
-L_0E27	lda L_051D,X
-	bpl L_0E36
-	lda L_0523,X
-	bne L_0E36
-	lda #$40
-	sta L_051D,X
-L_0E36	inc L_0553,X
-	ldy #$00
-	lda L_053B,X
-	lsr @
-	lsr @
-	lsr @
-	lsr @
-	bcc L_0E45
-	dey
-L_0E45	lsr @
-	bcc L_0E49
-	iny
-L_0E49	clc
-	tya
-	adc L_057D,X
-	sta L_057D,X
-	lda L_0559,X
-	cmp #$FF
-	bne L_0E5A
-	ldy #$00
-L_0E5A	clc
-	tya
-	adc L_0559,X
-	sta L_0559,X
-	dex
-	bmi L_0E68
-	jmp L_0D35
-L_0E68	jsr L_0F7B
-	lda L_0541
-	sta L_05A6
-	lda L_0544
-	sta L_05A7
-	lda L_053B
-	and #$07
-	jsr L_0FB5
-L_0E7F	tya
-	pha
-	lda L_05B9,Y
-	php
-	and #$7F
-	tax
-	tya
-	and #$03
-	asl @
-	tay
-	cpx #$03
-	bne L_0E94
-	jmp L_0EC4
-L_0E94	lda L_05AD,X
-	bne L_0EC0
-	lda L_055F,X
-	sta $D200,Y
-	lda L_0523,X
-	ora L_0541,X
-	plp
-	bpl L_0EAA
-	lda #$00
-L_0EAA	sta $D201,Y
-L_0EAD	pla
-	tay
-	dey
-	and #$03
-	beq L_0EB7
-	jmp L_0E7F
-L_0EB7	lda L_05A4
-	sta $D208
-	jmp L_0EE4
-L_0EC0	plp
-	jmp L_0EAD
-L_0EC4	lda L_05AD
-	bne L_0EE0
-	lda L_05A2
-	sta $D200,Y
-	lda L_0523
-	ora L_05A6
-	plp
-	bpl L_0EDA
-	lda #$00
-L_0EDA	sta $D201,Y
-	jmp L_0EAD
-L_0EE0	plp
-	jmp L_0EAD
-L_0EE4	lda L_053E
-	and #$07
-	jsr L_0FB5
-L_0EEC	tya
-	pha
-	lda L_05B9,Y
-	php
-	and #$7F
-	tax
-	tya
-	and #$03
-	asl @
-	tay
-	cpx #$03
-	bne L_0F01
-	jmp L_0F3C
-L_0F01	lda L_05B0,X
-	bne L_0F24
-	lda L_0562,X
-	sta $D210,Y
-	lda L_0526,X
-	ora L_0544,X
-	plp
-	bpl L_0F17
-	lda #$00
-L_0F17	sta $D211,Y
-L_0F1A	pla
-	tay
-	dey
-	and #$03
-	beq L_0F28
-	jmp L_0EEC
-L_0F24	plp
-	jmp L_0F1A
-L_0F28	lda L_97A5
-	sta $D218
-	clc
-L_0F2F	pla
-	sta ZP_FF
-	pla
-	sta ZP_FE
-	pla
-	sta ZP_FD
-	pla
-	sta ZP_FC
-	rts
-L_0F3C	lda L_05B0
-	bne L_0F58
-	lda L_05A3
-	sta $D210,Y
-	lda L_0526
-	ora L_97A7
-	plp
-	bpl L_0F52
-	lda #$00
-L_0F52	sta $D211,Y
-	jmp L_0F1A
-L_0F58	plp
-	jmp L_0F1A
-L_0F5C	jsr L_0AA8
-	bcs L_0F7A
-	lda L_05B8
-	beq L_0F7A
-	lda L_059D
-	sta L_05B7
-	lda #$01
-	sta L_059D
-	jsr L_0AA8
-	lda L_05B7
-	sta L_059D
-L_0F7A	rts
-L_0F7B	lda L_05A9
-	asl @
-	asl @
-	asl @
-	asl @
-	sta L_05AB
-	lda L_05AA
-	asl @
-	asl @
-	asl @
-	asl @
-	sta L_05AC
-	ldx #$02
-L_0F91	stx ZP_C8
-	lda L_05AB
-	ora L_0523,X
-	tax
-	lda L_06E9,X
-	ldx ZP_C8
-	sta L_0523,X
-	lda L_05AC
-	ora L_0526,X
-	tax
-	lda L_06E9,X
-	ldx ZP_C8
-	sta L_0526,X
-	dex
-	bpl L_0F91
-	rts
-L_0FB5	tay
-	lda L_080D,Y
-	tay
-	rts
-
-	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/cms.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/cms.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/dlt.as8 kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/dlt.as8
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/dlt.as8	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/dlt.as8	1970-01-01 00:00:00.000000000 +0000
@@ -1,922 +0,0 @@
-//******************************************************************************************************************************************************
-//	Header
-//******************************************************************************************************************************************************
-
-/**	Delta Music Composer 1.7 Reference Player
-	@author	Marek Konopka
-	@date 03.09.2009
-*/
-
-.local	NRefDlt17Player
-
-//******************************************************************************************************************************************************
-//	Constants
-//******************************************************************************************************************************************************
-
-	PLAYER_BASE_PTR	= $0200
-	PLAYER_ZPG_VARS	= $e0
-
-	DEFAULT_TEMPO	= 6
-
-	MAX_NUM_PATTERNS	= 64
-	MAX_NUM_INSTRUMENTS	= 32
-
-	SONG_LENGTH		= 128
-	PATTERN_SIZE	= 128
-	INSTRUMENT_SIZE	= 64
-	FRQ_TABLE_SIZE	= 64
-	ENVELOPE_SIZE	= 16
-
-	TRACK_CMD_STOP	= $40
-	TRACK_CMD_JUMP	= $41
-	TRACK_CMD_TEMPO	= $42
-	TRACK_CMD_LAST	= TRACK_CMD_TEMPO
-
-	ACC_OFFSET_FILTER_TRANSP		= 0
-	INSTR_OFFSET_AUDCTLS			= 48+0
-	INSTR_OFFSET_VOL_DECAY_DELAY	= 48+1
-	INSTR_OFFSET_FRQ_SLIDE			= 48+2
-	INSTR_OFFSET_TRANSP_DELAY		= 48+3
-	INSTR_OFFSET_TRANSP_TBL			= 48+4
-
-	ACCENT_NONE			= 0
-	ACCENT_FRQ_STORE	= 1
-	ACCENT_FRQ_TRANSP	= 2
-	ACCENT_NOTE_TRANSP	= 3
-
-	TRANSP_TBL_SIZE		= 4	// must be a power of two
-
-	CHANNEL0_FILTER_MASK	= 4
-	CHANNEL1_FILTER_MASK	= 2
-
-	AUDCTL_CHANNEL0_MASK	= %11010101
-	AUDCTL_CHANNEL1_MASK	= %10000011
-	AUDCTL_CHANNEL2_MASK	= %10101001
-	AUDCTL_CHANNEL3_MASK	= %10000001
-
-	OFFSET_PATTERN_PTRS	= $0000
-	OFFSET_INSTR_PTRS	= $0080
-	OFFSET_VARIABLES	= $0100
-	OFFSET_FRQ			= $0200
-	OFFSET_PLAYER_CODE	= $0300
-
-//******************************************************************************************************************************************************
-//	Zero page variable
-//******************************************************************************************************************************************************
-
-	patt0_ptr	= PLAYER_ZPG_VARS+$00	// track #0 pattern pointer
-	patt1_ptr	= PLAYER_ZPG_VARS+$02	// track #1 pattern pointer
-	patt2_ptr	= PLAYER_ZPG_VARS+$04	// track #2 pattern pointer
-	patt3_ptr	= PLAYER_ZPG_VARS+$06	// track #3 pattern pointer
-
-	instr0_ptr	= PLAYER_ZPG_VARS+$08	// track #0 combined volume-distortion pointer
-	instr1_ptr	= PLAYER_ZPG_VARS+$0a	// track #1 combined volume-distortion pointer
-	instr2_ptr	= PLAYER_ZPG_VARS+$0c	// track #2 combined volume-distortion pointer
-	instr3_ptr	= PLAYER_ZPG_VARS+$0e	// track #3 combined volume-distortion pointer
-
-	acc0_ptr	= PLAYER_ZPG_VARS+$10	// track #0 accents ptr
-	acc1_ptr	= PLAYER_ZPG_VARS+$12	// track #1 accents ptr
-	acc2_ptr	= PLAYER_ZPG_VARS+$14	// track #2 accents ptr
-	acc3_ptr	= PLAYER_ZPG_VARS+$16	// track #3 accents ptr
-
-	acc_param0_ptr	= PLAYER_ZPG_VARS+$18	// track #0 accent params ptr
-	acc_param1_ptr	= PLAYER_ZPG_VARS+$1a	// track #1 accent params ptr
-	acc_param2_ptr	= PLAYER_ZPG_VARS+$1c	// track #2 accent params ptr
-	acc_param3_ptr	= PLAYER_ZPG_VARS+$1e	// track #2 accent params ptr
-
-//******************************************************************************************************************************************************
-//	Pointers
-//******************************************************************************************************************************************************
-
-	ModulePtr		= $2000
-	TracksPtr		= ModulePtr+$2000
-	InstrumentsPtr	= ModulePtr+$2400
-	ParametersPtr	= ModulePtr+$2c00
-	BassFrqType		= ParametersPtr+$0000
-
-//******************************************************************************************************************************************************
-//	Hardware
-//******************************************************************************************************************************************************
-
-	POKEY	= $d200
-	AUDCTL	= $d208
-	SKCTL	= $d20f
-
-//******************************************************************************************************************************************************
-//	Variables
-//******************************************************************************************************************************************************
-
-	org	PLAYER_BASE_PTR + OFFSET_VARIABLES
-
-	env_ind:	.ds 4	// envelope indices (ENVELOPE_SIZE-1 ... 0)
-	tr_stat:	.ds 4	// track statuses (0 -> off, !=0 -> on)
-	notes:		.ds 4	// notes = pattern note + track transposition
-	vd_cnt:		.ds 4	// volume decay counters
-	trns_del:	.ds 4	// instrument transposition delays
-	trns_ind:	.ds 4	// instrument transposition indices
-	ptransp:	.ds 4	// pattern transpositions
-	freq_add:	.ds 4	// frequency additions
-	audc:		.ds 4	// audc
-	audf:		.ds 4	// audf
-	audctls:	.ds 4	// audctl
-	vol_stat:	.ds 4	// volume statuses
-
-	tmp_ptr:	.ds 2	// temporary pointer
-	play_stat:	.ds 1	// playing status
-	tempo:		.ds 1	// tempo
-	tempo_cnt:	.ds 1	// tempo counter
-	patt_pos:	.ds 1	// pattern position
-	track_pos:	.ds 1	// track position
-	//tmp_note:	.ds 1	// temporary note
-	tmp_freq:	.ds 1	// temporary frequency
-
-//******************************************************************************************************************************************************
-//	Data
-//******************************************************************************************************************************************************
-
-	//.align	256
-	FrqTbl	= PLAYER_BASE_PTR + OFFSET_FRQ
-
-	org	FrqTbl
-;	ins	'frq_tbl_normal.dat'
-	dta	$ff,$f1,$e4,$d7,$cb,$c0,$b5,$aa,$a1,$98,$8f,$87,$7f,$79,$72,$6b
-	dta	$65,$5f,$5a,$55,$50,$4b,$47,$43,$3f,$3c,$38,$35,$32,$2f,$2c,$2a
-	dta	$27,$25,$23,$21,$1f,$1d,$1c,$1a,$18,$17,$16,$14,$13,$12,$11,$10
-	dta	$0f,$0e,$0d,$0c,$0b,$0a,$09,$08,$07,$06,$05,$04,$ff,$f1,$e4,$d7
-
-;	ins	'frq_tbl_bass_cmc.dat'
-	dta	$f2,$e9,$da,$ce,$bf,$b6,$aa,$a1,$98,$8f,$89,$80,$7a,$71,$6b,$65
-	dta	$5f,$5c,$56,$50,$67,$60,$5a,$55,$51,$4c,$48,$43,$3f,$3d,$39,$34
-	dta	$33,$30,$2d,$2a,$28,$25,$24,$21,$1f,$1e,$1c,$1b,$19,$00,$16,$15
-	dta	$00,$0a,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00,$f2,$e9,$da,$ce
-
-;	ins	'frq_tbl_bass_cmc.dat'
-	dta	$f2,$e9,$da,$ce,$bf,$b6,$aa,$a1,$98,$8f,$89,$80,$7a,$71,$6b,$65
-	dta	$5f,$5c,$56,$50,$67,$60,$5a,$55,$51,$4c,$48,$43,$3f,$3d,$39,$34
-	dta	$33,$30,$2d,$2a,$28,$25,$24,$21,$1f,$1e,$1c,$1b,$19,$00,$16,$15
-	dta	$00,$0a,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00,$f2,$e9,$da,$ce
-
-;	ins	'frq_tbl_bass_mpt.dat'
-	dta	$ff,$f1,$e4,$d8,$ca,$c0,$b5,$ab,$a2,$99,$8e,$87,$7f,$78,$73,$6c
-	dta	$66,$61,$5a,$55,$51,$4b,$48,$43,$3f,$3c,$39,$34,$33,$30,$2d,$2a
-	dta	$28,$25,$24,$21,$1f,$1e,$1c,$1b,$19,$17,$16,$15,$13,$12,$11,$10
-	dta	$0f,$0e,$0d,$0c,$0b,$0a,$09,$08,$07,$06,$05,$04,$03,$02,$01,$ff
-
-	PatternPtrsTbl		= PLAYER_BASE_PTR + OFFSET_PATTERN_PTRS
-	InstrumentPtrsTbl	= PLAYER_BASE_PTR + OFFSET_INSTR_PTRS
-	PlayerCodePtr		= PLAYER_BASE_PTR + OFFSET_PLAYER_CODE
-
-//******************************************************************************************************************************************************
-//	Code
-//******************************************************************************************************************************************************
-
-	org	PlayerCodePtr
-
-//******************************************************************************************************************************************************
-
-	jmp	init
-	jmp	player.entry_point
-	jmp	stop
-
-//******************************************************************************************************************************************************
-
-///	Initialize.
-/**	@param .byte Y	- Initial track position.
-*/
-.proc	init
-	dey
-	sty	track_pos
-
-	lda #(PATTERN_SIZE-2)
-	sta patt_pos
-
-	ldx #DEFAULT_TEMPO
-	stx tempo
-	ldx	#1
-	stx tempo_cnt
-
-	jsr init_patterns_table
-	jsr init_instruments_tbl
-	jsr	init_variables
-	jsr	init_frq_tbl
-
-	lda #1
-	sta play_stat
-
-	lda	#3
-	sta	SKCTL
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	init_patterns_table
-	ldx #<ModulePtr
-	ldy	#>ModulePtr
-	stx tmp_ptr
-	sty tmp_ptr+1
-
-	ldy #0
-loop
-	lda tmp_ptr
-	sta PatternPtrsTbl,y
-	lda tmp_ptr+1
-	sta PatternPtrsTbl+MAX_NUM_PATTERNS,y
-
-	lda tmp_ptr
-	clc
-	adc #PATTERN_SIZE
-	sta tmp_ptr
-	bcc skip
-		inc tmp_ptr+1
-skip
-
-	iny
-	cpy #MAX_NUM_PATTERNS
-	bne loop
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	init_instruments_tbl
-	ldx #<InstrumentsPtr
-	ldy #>InstrumentsPtr
-	stx tmp_ptr
-	sty tmp_ptr+1
-
-	ldy #0
-loop
-	lda tmp_ptr
-	sta InstrumentPtrsTbl,y
-	lda tmp_ptr+1
-	sta InstrumentPtrsTbl+MAX_NUM_INSTRUMENTS,y
-
-	lda tmp_ptr
-	clc
-	adc #INSTRUMENT_SIZE
-	sta tmp_ptr
-	bcc skip
-		inc tmp_ptr+1
-skip
-
-	iny
-	cpy	#MAX_NUM_INSTRUMENTS
-	bne loop
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	init_frq_tbl
-	lda	BassFrqType
-	and	#1
-	lsr	@
-	ror	@
-	ror	@
-	tay
-
-	ldx	#0
-loop
-	lda	FrqTbl+FRQ_TABLE_SIZE*2,y
-	sta	FrqTbl+FRQ_TABLE_SIZE,x
-
-	iny
-	inx
-	cpx	#FRQ_TABLE_SIZE
-	bne	loop
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	init_variables
-	ldy #3
-	lda #0
-loop
-	sta	audctls,y
-	sta	audc,y
-	sta	audf,y
-	sta	vol_stat,y
-
-	dey
-	bpl loop
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	stop
-	lda	#0
-	sta play_stat
-
-	ldy #7
-	lda #0
-loop
-	sta POKEY,y
-	dey
-	bpl loop
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.nowarn	.proc	player
-play_done
-	rts
-
-entry_point
-	lda play_stat
-	beq play_done
-
-	lda audctls+0
-	ora audctls+1
-	ora audctls+2
-	ora audctls+3
-	sta AUDCTL
-
-	ldx	audf+0
-	ldy	audc+0
-	stx	POKEY+0
-	sty POKEY+1
-
-	ldx	audf+1
-	ldy	audc+1
-	stx	POKEY+2
-	sty POKEY+3
-
-	ldx	audf+2
-	ldy	audc+2
-	stx	POKEY+4
-	sty POKEY+5
-
-	ldx	audf+3
-	ldy	audc+3
-	stx	POKEY+6
-	sty POKEY+7
-
-	dec	tempo_cnt
-	bne play_instruments
-		lda tempo
-		sta tempo_cnt
-
-		inc patt_pos
-		inc patt_pos
-		bpl take_notes
-
-		new_track_pos:
-			inc track_pos
-			lda #0
-			sta patt_pos
-
-			jsr	tktrx.entry_point
-
-			lda tr_stat+0
-			ora	tr_stat+1
-			ora	tr_stat+2
-			ora	tr_stat+3
-			bne take_notes
-				jmp stop
-
-	take_notes:
-		lda tr_stat+0
-		beq skip1
-			jsr tkpt1
-
-	skip1:
-		lda tr_stat+1
-		beq skip2
-			jsr tkpt2
-
-	skip2:
-		lda tr_stat+2
-		beq skip3
-			jsr tkpt3
-
-	skip3:
-		lda tr_stat+3
-		beq skip4
-			jsr tkpt4
-
-	skip4:
-
-play_instruments
-	lda tr_stat+0
-	beq skip10
-		lda	vol_stat+0
-		beq	skip10
-		jsr play_instr0
-
-skip10:
-	lda tr_stat+1
-	beq skip11
-		lda	vol_stat+1
-		beq	skip11
-		jsr play_instr1
-
-skip11:
-	lda tr_stat+2
-	beq skip12
-		lda	vol_stat+2
-		beq	skip12
-		jsr play_instr2
-
-skip12:
-	lda tr_stat+3
-	beq skip13
-		lda	vol_stat+3
-		beq	skip13
-		jsr play_instr3
-skip13:
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-.nowarn	.proc	tktrx
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-tr1_non_pattern
-	cpy #(TRACK_CMD_LAST+1)
-	bcc continue
-		lda #0
-		sta tr_stat+0
-		sta	audc+0
-		sta	audctls+0
-		jmp	track2
-
-continue
-	cpy #TRACK_CMD_TEMPO
-	bne non_tempo
-
-cmd_tempo
-	lda TracksPtr+SONG_LENGTH,x
-	sta tempo
-	sta	tempo_cnt
-	inc track_pos
-	jmp	tktrx.entry_point
-
-non_tempo:
-	cpy #TRACK_CMD_JUMP
-	bne cmd_stop
-
-cmd_jmp
-	lda TracksPtr+SONG_LENGTH,x
-	sta track_pos
-	jmp	tktrx.entry_point
-
-cmd_stop
-	//	no need to continue processing
-	pla
-	pla
-	jmp	stop
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-entry_point
-	ldx track_pos
-track1
-	ldy TracksPtr,x
-	cpy #MAX_NUM_PATTERNS
-	bcs tr1_non_pattern
-
-	lda TracksPtr+SONG_LENGTH,x
-	sta ptransp+0
-	lda PatternPtrsTbl,y
-	sta patt0_ptr
-	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
-	sta patt0_ptr+1
-	lda #1
-	sta tr_stat+0
-
-track2
-	ldy TracksPtr+SONG_LENGTH*2,x
-	cpy #MAX_NUM_PATTERNS
-	bcs non_pattern_2
-
-	lda TracksPtr+SONG_LENGTH*3,x
-	sta ptransp+1
-	lda PatternPtrsTbl,y
-	sta patt1_ptr
-	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
-	sta patt1_ptr+1
-	lda #1
-	sta tr_stat+1
-
-track3
-	ldy TracksPtr+SONG_LENGTH*4,x
-	cpy #MAX_NUM_PATTERNS
-	bcs non_pattern_3
-
-	lda TracksPtr+SONG_LENGTH*5,x
-	sta ptransp+2
-	lda PatternPtrsTbl,y
-	sta patt2_ptr
-	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
-	sta patt2_ptr+1
-	lda #1
-	sta tr_stat+2
-
-track4
-	ldy TracksPtr+SONG_LENGTH*6,x
-	cpy #MAX_NUM_PATTERNS
-	bcs non_pattern_4
-
-	lda TracksPtr+SONG_LENGTH*7,x
-	sta ptransp+3
-	lda PatternPtrsTbl,y
-	sta patt3_ptr
-	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
-	sta patt3_ptr+1
-	lda #1
-	sta tr_stat+3
-	rts
-
-non_pattern_2
-	lda	#0
-	sta	tr_stat+1
-	sta	audc+1
-	sta	audctls+1
-	beq	track3
-
-non_pattern_3
-	lda	#0
-	sta tr_stat+2
-	sta	audc+2
-	sta	audctls+2
-	beq track4
-
-non_pattern_4
-	lda	#0
-	sta tr_stat+3
-	sta	audc+3
-	sta	audctls+3
-	rts
-.endp
-
-//******************************************************************************************************************************************************
-
-///	Take pattern position.
-/**	@param %%1 .byte channel_num	- Channel number.
-	@param %%2 .word patt_ptr	- Pattern pointer.
-	@param %%3 .word instr_ptr	- Instrument pointer.
-	@param %%4 .word acc_ptr	- Accents pointer.
-	@param %%5 .word acc_param_ptr	- Accent params pointer.
-	@param %%6 .byte audctl_channel_mask	- AUDCTL mask.
-*/
-.macro	tkpt_macro
-	ldy patt_pos
-	lda (%%2),y
-	bmi note
-		iny
-		lda (%%2),y
-		bmi end_of_pattern
-			//	empty
-			rts
-		end_of_pattern:
-			pla
-			pla
-			jmp	player.new_track_pos
-
-note
-	//	note = (patt_note + ptransp) & 0x7f;
-	clc
-	adc	ptransp+%%1
-	and	#127
-	sta notes+%%1
-
-	//	env_ind = vol_stat = (ENVELOPE_SIZE-1);
-	lda #(ENVELOPE_SIZE-1)
-	sta env_ind+%%1
-	sta	vol_stat+%%1
-
-	iny
-	lda (%%2),y
-	tax
-
-	lda InstrumentPtrsTbl+MAX_NUM_INSTRUMENTS,x
-	sta %%3+1
-	sta %%4+1
-	sta %%5+1
-
-	lda InstrumentPtrsTbl,x
-	sta %%3
-	//clc
-	eor #$10
-	sta %%4
-	eor #$30
-	sta %%5
-
-	//	vd_cnt = instr_ptr[INSTR_OFFSET_VOL_DECAY_DELAY];
-	ldy #INSTR_OFFSET_VOL_DECAY_DELAY
-	lda (%%3),y
-	sta vd_cnt+%%1
-
-	//	trns_del = instr_ptr[INSTR_OFFSET_VOL_DECAY_DELAY] & 0x7f;
-	ldy #INSTR_OFFSET_TRANSP_DELAY
-	lda (%%3),y
-	and #127
-	sta trns_del+%%1
-
-	//	trns_ind = freq_add = 0;
-	lda #0
-	sta trns_ind+%%1
-	sta freq_add+%%1
-
-	//	audctls = instr_ptr[INSTR_OFFSET_AUDCTLS] & audctl_channel_mask
-	ldy	#INSTR_OFFSET_AUDCTLS
-	lda (%%3),y
-	and %%6
-	sta audctls+%%1
-	rts
-.endm
-
-//******************************************************************************************************************************************************
-
-.proc	tkpt1
-	tkpt_macro	0, patt0_ptr, instr0_ptr, acc0_ptr, acc_param0_ptr, #AUDCTL_CHANNEL0_MASK
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	tkpt2
-	tkpt_macro	1, patt1_ptr, instr1_ptr, acc1_ptr, acc_param1_ptr, #AUDCTL_CHANNEL1_MASK
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	tkpt3
-	tkpt_macro	2, patt2_ptr, instr2_ptr, acc2_ptr, acc_param2_ptr, #AUDCTL_CHANNEL2_MASK
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	tkpt4
-	tkpt_macro	3, patt3_ptr, instr3_ptr, acc3_ptr, acc_param3_ptr, #AUDCTL_CHANNEL3_MASK
-.endp
-
-//******************************************************************************************************************************************************
-
-///	Play instrument.
-/**	@param %%1 .byte channel_num	- Channel number.
-	@param %%2 .word instr_ptr	- Instrument pointer.
-	@param %%3 .word acc_ptr	- Accents pointer.
-	@param %%4 .word acc_param_ptr	- Accent params pointer.
-*/
-.macro	play_instr
-	ldy env_ind+%%1
-	bmi outside_envelope
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-	envelope:
-		//	audc = envelope[env_ind]
-		lda (%%2),y
-		sta audc+%%1
-
-		//	if	(accents[env_ind] == 0)
-		lda	(%%3),y
-		bne	acc
-			jsr	determine_table_transpositions
-			dec	env_ind+%%1
-			jmp	update_variables
-	acc:
-		cmp	#ACCENT_FRQ_STORE
-		beq	acc_1
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-		determine_accent_transpositions:
-			//	if	(accents[env_ind] == 3)
-			//lda	(acc_ptr),y
-			cmp	#ACCENT_NOTE_TRANSP
-			bne	acc_2
-
-			acc_3:
-				//	tmp_note = notes + acc_params[env_ind];
-				lda	notes+%%1
-				clc
-				adc	(%%4),y
-				//sta	tmp_note
-				tax
-
-				//	tmp_freq = freq_add;
-				lda	freq_add+%%1
-				sta	tmp_freq
-				//rts
-				jmp	determine_acc_audf
-
-		acc_2:
-			//	tmp_freq = freq_add + acc_params[env_ind];
-			lda	freq_add+%%1
-			clc
-			adc	(%%4),y
-			sta	tmp_freq
-
-			//	tmp_note = notes;
-			//lda	notes+0
-			//sta	tmp_note
-			ldx	notes+%%1
-			//rts
-			//jmp	determine_audf
-
-		determine_acc_audf:
-			jsr	determine_audf
-			dec	env_ind+%%1
-			rts
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-	acc_1:
-			//	audf = acc_params[env_ind];
-			lda	(%%4),y
-			sta	audf+%%1
-			dec	env_ind+%%1
-			rts
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-outside_envelope
-	jsr	determine_table_transpositions
-	//jsr	volume_decay
-	//jmp	update_variables
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-volume_decay
-	ldy #INSTR_OFFSET_VOL_DECAY_DELAY
-	lda (%%2),y
-	beq exit_volume_decay
-		dec vd_cnt+%%1
-		beq	volume_test
-		//rts
-		jmp	update_variables
-	volume_test:
-		lda audc+%%1
-		and #15
-		beq disable_instr
-			dec	audc+%%1
-			lda	(%%2),y
-			sta vd_cnt+%%1
-			//rts
-			jmp	update_variables
-	disable_instr:
-			sta	vol_stat+%%1
-			rts
-exit_volume_decay
-	//rts
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-update_variables
-
-frequency_slide
-	lda freq_add+%%1
-	clc
-	ldy #INSTR_OFFSET_FRQ_SLIDE
-	adc	(%%2),y
-	sta freq_add+%%1
-
-table_transposition
-	dec trns_del+%%1
-	bne done_table_transposition
-		inc trns_ind+%%1
-		ldy #INSTR_OFFSET_TRANSP_DELAY
-		lda (%%2),y
-		and #127
-		sta trns_del+%%1
-done_table_transposition
-	rts
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-determine_table_transpositions
-	//	no acc
-
-	//	uint8_t	transp = instr[(trns_ind & 3) + 4 + 48];
-	lda	trns_ind+%%1
-	and	#(TRANSP_TBL_SIZE-1)
-	clc
-	adc	#INSTR_OFFSET_TRANSP_TBL
-	tay
-	lda	(%%2),y
-	tax
-
-	//	if	(instr[INSTR_OFFSET_TRANSP_DELAY] > 0) // transp_delay
-	ldy	#INSTR_OFFSET_TRANSP_DELAY
-	lda	(%%2),y
-	bmi	frequency_transposition
-
-	note_transposition:
-		//	tmp_note = transp + notes
-		txa
-		//clc
-		adc	notes+%%1
-		//sta	tmp_note
-		tax
-
-		//	tmp_freq = freq_add;
-		lda	freq_add+%%1
-		sta	tmp_freq
-		//rts
-		jmp	determine_audf
-
-frequency_transposition
-	//	tmp_freq = transp + freq_add;
-	txa
-	//clc
-	adc	freq_add+%%1
-	sta	tmp_freq
-
-	//	tmp_note = notes;
-	//lda	notes+0
-	//sta	tmp_note
-	ldx	notes+%%1
-	//rts
-	//jmp	determine_audf
-
-//------------------------------------------------------------------------------------------------------------------------------------------------------
-
-determine_audf
-	//	acc != 1
-
-	//	audf = FrqTbl[tmp_note] + tmp_freq;
-	//ldx	tmp_note
-	lda	FrqTbl,x
-	clc
-	adc	tmp_freq
-	sta	audf+%%1
-
-	.if	(%%1 == 2 || %%1 == 3)
-		rts
-	.else
-		//	if	((audctls & filter_mask) == 0)	//	filter test
-		lda	audctls+%%1
-		.if	(%%1 == 0)
-			and	#CHANNEL0_FILTER_MASK
-		.else
-			and	#CHANNEL1_FILTER_MASK
-		.endif
-		bne	filter
-			rts
-
-	filter:
-		//	if	(accents[env_ind] == 0)
-		ldy	env_ind+%%1
-		lda	(%%3),y
-		bne	filter_with_no_transposition
-
-		filter_with_note_transposition:
-			//	audf+2 = FrqTbl[tmp_note + acc_params[0]] + tmp_freq + 0xff;
-			//lda	tmp_note
-			txa
-			clc
-			ldy	#ACC_OFFSET_FILTER_TRANSP
-			adc	(%%4),y
-			tax
-			lda	FrqTbl,x
-			clc
-			adc	tmp_freq
-			clc
-			adc	#$ff
-			sta	audf+%%1+2
-			rts
-
-	filter_with_no_transposition:
-		//	audf+2 = audf + 0xff;
-		lda	audf+%%1
-		clc
-		adc	#$ff
-		sta	audf+%%1+2
-		rts
-	.endif
-.endm
-
-//******************************************************************************************************************************************************
-
-.proc	play_instr0
-	play_instr	0, instr0_ptr, acc0_ptr, acc_param0_ptr
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	play_instr1
-	play_instr	1, instr1_ptr, acc1_ptr, acc_param1_ptr
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	play_instr2
-	play_instr	2, instr2_ptr, acc2_ptr, acc_param2_ptr
-.endp
-
-//******************************************************************************************************************************************************
-
-.proc	play_instr3
-	play_instr	3, instr3_ptr, acc3_ptr, acc_param3_ptr
-.endp
-
-//******************************************************************************************************************************************************
-
-.endl // NRefDltPlayer
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/dlt.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/dlt.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/fc.as8 kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/fc.as8
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/fc.as8	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/fc.as8	1970-01-01 00:00:00.000000000 +0000
@@ -1,703 +0,0 @@
-; Deassembled with da65 by Mono / Tristesse
-
-  opt ?+ o+ h+ c-
-
-;irqens = $10
-audf1 = $d200
-;audc1 = $d201
-audf2 = $d202
-;audc2 = $d203
-;audctl = $d208
-;irqen = $d20e
-;irqst = $d20e
-skctl = $d20f
-  
-audf12 = $d210
-audc12 = $d211
-audf22 = $d212
-audc22 = $d213
-audf32 = $d214
-audc32 = $d215
-audf42 = $d216
-audc42 = $d217
-audctl2 = $d218
-stimer2 = $d219
-irqen2 = $d21e
-skctl2 = $d21f
-
-; FC player zpg
-; = $1c..$1f
-track1ad = $e0
-track2ad = $e2
-track3ad = $e4
-trackad = track1ad
-track1pos = $e6
-track2pos = $e8
-track3pos = $ea
-trackpos = track1pos
-pat1pos = $e7
-pat2pos = $e9
-pat3pos = $eb
-patpos = pat1pos
-note1dur = $ec
-note2dur = $ee
-note3dur = $f0
-notedur = note1dur
-pat1delay = $ed
-pat2delay = $ef
-pat3delay = $f1
-patdelay = pat1delay
-patad = $f2
-songno = $f4
-
-
-
-dataad = $fc
-instrad = $fe
-
-  org $400
-  jmp initplay
-;  jmp dosound
-  
-dosound:
-  jsr setpokey
-  jmp fc_play
-  
-; Initialize playing of FC module.
-initplay:
-  ldx #<$a00
-  ldy #>$a00
-;doinit:
-  jsr fc_init
-;  jmp setpokey
-
-; Setting POKEY registers due to panning settings.
-setpokey:
-  ldx #8
-?loop:
-  lda L0710_audf1s,x
-  sta audf1,x
-  sta audf12,x
-  dex
-  bpl ?loop
-  rts
-
-findsongbegin:
-  sta songno
-  
-  ldx #0
-?find:
-  stx track1pos
-  stx track2pos
-  stx track3pos
-  lda #0
-  sta pat1pos
-  sta pat2pos
-  sta pat3pos
-  sta note1dur
-  sta note2dur
-  sta note3dur
-  sta pat1delay
-  sta pat2delay
-  sta pat3delay
-  txa
-  ldy #2
-  ldx #4
-?calc:
-  jsr ?calcsongad
-  dey
-  dex
-  dex
-  bpl ?calc
-?loop:
-  ldx #4
-?chk:
-  jsr ?chksongend
-  dex
-  dex
-  bpl ?chk
-  
-  lda #$ff
-  cmp track1pos
-  beq ?end
-  cmp track2pos
-  beq ?end
-  cmp track3pos
-  beq ?end
-  
-  lda #$fe
-  ldy #0
-  cmp (track1ad),y
-  beq ?end
-  cmp (track2ad),y
-  beq ?end
-  cmp (track3ad),y
-  beq ?end
-  lda (track1ad),y
-  and (track2ad),y
-  and (track3ad),y
-  cmp #$ff
-  bne ?loop
-
-?end:
-  ldx #4
-?corr:
-  jsr ?corrpos
-  dex
-  dex
-  bpl ?corr
-  ldx track1pos
-  cpx track2pos
-  scs
-  ldx track2pos
-  cpx track3pos
-  scs
-  ldx track3pos
-  inx
-  
-  dec songno
-  bne ?find
-  txa
-  rts
-  
-?corrpos:
-  lda patpos,x
-  seq
-  inc trackpos,x
-  rts
-  
-?chksongend:
-  lda (trackad,x)
-  cmp #$fe
-  bcs ?ret
-  lda trackpos,x
-  cmp #$ff
-  beq ?ret
-  
-  lda patdelay,x
-  bne ?decdelay
-  
-  lda (trackad,x)
-  cmp #$40
-  bcc ?pattern
-  sne
-  jsr ?incpos	;ommit AUDCTL
-  jsr ?incpos
-  jmp ?chksongend
-
-?decdelay: 
-  dec patdelay,x
-?ret:
-  rts
-  
-?incpos:
-  inc trackad,x
-  sne
-  inc trackad+1,x
-  ldy trackpos,x
-  iny
-  seq
-  inc trackpos,x
-  rts
-
-?pattern:
-  tay
-  lda L0722_lpatternad,y
-  sta patad
-  lda L0782_hpatternad,y
-  sta patad+1
-?next:
-  ldy patpos,x
-  inc patpos,x
-  lda (patad),y
-  cmp #$40
-  bcc ?note
-  cmp #$60
-  bcc ?duration
-  cmp #$ff
-  bcc ?next
-  
-  lda #0
-  sta patdelay,x
-  sta notedur,x
-  sta patpos,x
-  jsr ?incpos
-  jmp ?chksongend
-
-?note:
-  lda notedur,x
-  sta patdelay,x
-  rts
-  
-?duration:
-  and #$1f
-  sta notedur,x
-  jmp ?next
-  
-?calcsongad:
-  pha
-  clc
-  adc L0802_ltrackad,y
-  sta trackad,x
-  lda #0
-  adc L0805_htrackad,y
-  sta trackad+1,x
-  pla
-  rts
-
-; Initialize of FC player
-fc_init:
-  stx dataad
-  sty dataad+1
-  pha
-
-  ;calculate note durations table
-  ldy #2
-  lda (dataad),y          ;TODO: change to primitive tempocntr
-  ldx #0
-?fctempoloop:
-  sta L07E2_delaytab,x
-  clc
-  adc (dataad),y
-  inx
-  cpx #$20
-  bcc ?fctempoloop
-  
-  ;update track addresses
-  lda dataad
-  ldx dataad+1
-  clc
-  adc #3
-  scc
-  inx
-  sta L0802_ltrackad
-  stx L0805_htrackad
-  inx
-  sta L0802_ltrackad+1
-  stx L0805_htrackad+1
-  inx
-  sta L0802_ltrackad+2
-  stx L0805_htrackad+2
-  
-  ;update instruments table address
-  inx
-  sta instrad
-  stx instrad+1
-  
-  ;update patterns address
-  clc
-  adc #$20*4
-  scc
-  inx
-  sta dataad
-  stx dataad+1
-  
-  ldx #0
-  ldy #0
-?fcpatternsloop:
-  lda dataad
-  sta L0722_lpatternad,y
-  lda dataad+1
-  sta L0782_hpatternad,y
-?fcpatternendloop:
-  lda (dataad,x)
-  inc dataad
-  sne
-  inc dataad+1
-  cmp #$ff
-  bne ?fcpatternendloop
-  iny
-  cpy #$40
-  bcc ?fcpatternsloop
-  
-  ;update instruments envelope address
-  ldx #0
-?fcinstrenvelopesloop:
-  lda dataad
-  sta L0762_linstrenvad,x
-  lda dataad+1
-  sta L07C2_hinstrenvad,x
-  ldy #0
-?fcinstrenvendloop:
-  lda (dataad),y
-  iny
-  cmp #$ff
-  bne ?fcinstrenvendloop
-  tya
-  clc
-  adc dataad
-  sta dataad
-  scc
-  inc dataad+1
-  inx
-  cpx #$20
-  bcc ?fcinstrenvelopesloop
-  
-  pla
-
-?fcinitmus:
-  seq
-  jsr findsongbegin
-  sta L0400_beginmusic
-  
-?fcreset:
-  lda #$40
-  sta L070E_playerstate
-;  jmp fc_player
-
-; Playing FC
-fc_play:
-  ;jmp fc_player
-  
-fc_player:
-;        jsr     L0410
-;        ldx     #$08
-;L0406:  lda     L0710_audf1s,x
-;        sta     audf1,x
-;        dex
-;        bpl     L0406
-;        rts
-        
-L0410:  bit     L070E_playerstate
-        bmi     L043C
-        bvc     L044C
-        lda     #$00
-        ldx     #$0B
-L041B:  sta     L06E1_patternpos,x
-        dex
-        bpl     L041B
-        sta     L070E_playerstate
-        ldx     #$02
-L0426:  lda     #$08
-        sta     L070B_transp,x
-        lda     L0400_beginmusic
-        sta     L06DE_trackpos,x
-        dex
-        bpl     L0426
-        lda     #$50
-        sta     L0718_audctls
-        jmp     L044C
-        
-; Music restart
-L043C:  lda     #$00
-        ldx     #$07
-L0440:  sta     L0710_audf1s,x
-        dex
-        bpl     L0440
-        lda     #$80
-        sta     L070E_playerstate
-        rts
-        
-L044C:  inc     L070F_evenframe
-        ldx     #$02
-L0451:  stx     $1E   ;# number
-        inx
-        txa
-        asl     @
-        tay
-        sty     $1F   ;# offset (++<<)
-        dex
-        lda     L0802_ltrackad,x
-        sta     $1C
-        lda     L0805_htrackad,x
-        sta     $1D
-        lda     L06E4_delaycntr,x
-        beq     L046C
-        jmp     L0554
-L046C:  ldy     L06DE_trackpos,x
-        lda     ($1C),y
-        cmp     #$40
-        beq     L0483
-        cmp     #$FF
-        beq     L0491
-        cmp     #$FE
-        bne     L04AA
-        sta     L070E_playerstate
-        jmp     L062F
-        
-L0483:  iny
-        lda     ($1C),y
-        sta     L0718_audctls
-        iny
-        tya
-        sta     L06DE_trackpos,x
-        jmp     L046C
-        
-L0491:  lda     L0400_beginmusic
-        sta     L06DE_trackpos,x
-        lda     #$50
-        sta     L0718_audctls
-        lda     #$00
-        sta     L06E4_delaycntr,x
-        sta     L06E7_delay,x
-        sta     L06E1_patternpos,x
-        jmp     L046C
-        
-L04AA:  pha
-        and     #$80
-        beq     L04BA
-        inc     L06DE_trackpos,x
-        pla
-        and     #$0F
-        sta     L070B_transp,x
-        bpl     L046C
-        
-L04BA:  pla
-        tay
-        lda     L0722_lpatternad,y
-        sta     $1C
-        lda     L0782_hpatternad,y
-        sta     $1D
-        lda     L06E7_delay,x
-        sta     L06E4_delaycntr,x
-        lda     #$00
-        sta     L0702_slidedir,x
-        
-L04D1:  ldy     L06E1_patternpos,x
-        lda     ($1C),y
-        bmi     L04DF
-        asl     @
-        bmi     L0500
-        lsr     @
-        jmp     L0515
-        
-L04DF:  asl     @
-        asl     @
-        tay
-        
-        ;modified by mono for play .FC file directly
-        lda (instrad),y
-        sta L06ED_instrenvno,x
-        iny
-        lda (instrad),y
-        sta L06F3_distort,x
-        iny
-        lda (instrad),y
-        sta L06F6_vibrato,x
-        iny
-        lda (instrad),y
-        sta L06F9_effect,x
-        ;lda     L0808_instrdef,y
-        ;sta     L06ED_instrenvno,x
-        ;lda     L0808_instrdef+1,y
-        ;sta     L06F3_distort,x
-        ;lda     L0808_instrdef+2,y
-        ;sta     L06F6_vibrato,x
-        ;lda     L0808_instrdef+3,y
-        ;sta     L06F9_effect,x
-        inc     L06E1_patternpos,x
-        jmp     L04D1
-        
-L0500:  lsr     @
-        and     #$1F
-        tax
-        lda     L07E2_delaytab,x
-        ldx     $1E
-        sta     L06E4_delaycntr,x
-        sta     L06E7_delay,x
-        inc     L06E1_patternpos,x
-        jmp     L04D1
-        
-L0515:  sta     L06FF_note,x
-        clc
-        adc     L070B_transp,x
-        tay
-        cpx     #$00
-        bne     L0530
-        lda     L0656_lfreqtab,y
-        sta     L0710_audf1s
-        lda     L0696_hfreqtab,y
-        sta     L0712_audf2s
-        jmp     L053B
-L0530:  lda     L0628_freqtab,y
-        sta     L06EA_freq,x
-        ldy     $1F
-        sta     L0710_audf1s,y
-L053B:  lda     #$00
-        sta     L06F0_instrenvpos,x
-        inc     L06E1_patternpos,x
-	
-        ldy     L06E1_patternpos,x
-        lda     ($1C),y
-        cmp     #$FF
-        bne     L0554
-        lda     #$00
-        sta     L06E1_patternpos,x
-        inc     L06DE_trackpos,x
-        
-L0554:  lda     L06ED_instrenvno,x
-        tay
-        lda     L0762_linstrenvad,y
-        sta     L056A
-        lda     L07C2_hinstrenvad,y
-        sta     L056B
-        ldx     $1E
-        ldy     L06F0_instrenvpos,x
-L056A           = * + 1
-L056B           = * + 2
-        lda     $FFFF,y ;get envelope
-        cmp     #$FF
-        beq     L0597
-        bpl     L0582
-        ldy     $1F
-        sta     L0711_audc1s,y
-        lda     #$00
-        sta     L0710_audf1s,y
-        inc     L06F0_instrenvpos,x
-        jmp     L05F8
-        
-L0582:  ldy     $1F
-        inc     L06F0_instrenvpos,x
-        ora     L06F3_distort,x
-        sta     L0711_audc1s,y
-        cpx     #$00
-        beq     L0597
-        lda     L06EA_freq,x
-        sta     L0710_audf1s,y
-        
-L0597:  lda     L06F6_vibrato,x
-        beq     L05BF
-        lda     L070F_evenframe
-        and     #$01
-        bne     L05A8
-        lda     L06F6_vibrato,x
-        bne     L05AA
-L05A8:  lda     #$00
-L05AA:  sta     L05B2
-        clc
-        lda     L06FF_note,x
-L05B2           = * + 1
-        adc     #$02
-        adc     L070B_transp,x
-        tay
-        lda     L0628_freqtab,y
-        ldy     $1F
-        sta     L0710_audf1s,y
-        
-L05BF:  lda     L06F9_effect,x
-        beq     L05F8
-        bmi     L05E6
-L05C6:  ldy     L06FC_finevibrpos,x
-        inc     L06FC_finevibrpos,x
-        lda     L0719_finevibrenv,y
-        cmp     #$1F
-        bne     L05DA
-        lda     #$00
-        sta     L06FC_finevibrpos,x
-        beq     L05C6
-L05DA:  clc
-        adc     L06EA_freq,x
-        ldy     $1F
-        sta     L0710_audf1s,y
-        jmp     L05F8
-L05E6:  lda     L06EA_freq,x
-        cmp     #$FF
-        beq     L05F8
-        inc     L06EA_freq,x
-        inc     L06EA_freq,x
-        ldy     $1F
-        sta     L0710_audf1s,y
-        
-L05F8:  lda     L0702_slidedir,x
-        beq     L0626
-        lda     L0705_slidedelay,x
-        beq     L0608
-        dec     L0705_slidedelay,x
-        jmp     L0626
-L0608:  lda     L0702_slidedir,x
-        bpl     L0617
-        clc
-        lda     L06EA_freq,x
-        adc     L0708_slidestep,x
-        jmp     L061E
-L0617:  sec
-        lda     L06EA_freq,x
-        sbc     L0708_slidestep,x
-L061E:  sta     L06EA_freq,x
-        ldy     $1F
-        sta     L0710_audf1s,y
-        
-L0626:
-L0628_freqtab           = * + 2
-        dec     L06E4_delaycntr,x
-        dex
-        bmi     L062F
-        jmp     L0451
-L062F:  rts
-
-;Freq tables (1ch)     ;adres tablicy jest cofniety o 8, bo jest transpozycja 8 by default!!!!!!!!!
-        .db   $FF,$F1,$E4,$D7,$CB,$C0,$B5,$AA
-        .db   $A1,$98,$8F,$87,$7F,$78,$72,$6B
-        .db   $65,$5F,$5A,$55,$50,$4B,$47,$43
-        .db   $3F,$3C,$38,$35,$32,$2F,$2C,$2A
-        .db   $27,$25,$23,$21,$1F,$1D
-L0656_lfreqtab:  .db   $1C,$1A,$17,$16,$13,$0F,$07,$00
-;Lo freq table
-        .db   $38,$8C,$00,$6A,$E8,$6A,$EF,$80
-        .db   $08,$AE,$46,$E6,$95,$41,$F6,$B0
-        .db   $6E,$30,$F6,$BB,$84,$52,$22,$F4
-        .db   $C8,$A0,$7A,$55,$34,$14,$F5,$D8
-        .db   $BD,$A4,$8D,$77,$60,$4E,$38,$27
-        .db   $15,$06,$F7,$E8,$DB,$CF,$C3,$B8
-        .db   $AC,$A2,$9A,$90,$88,$7F,$78,$70
-L0696_hfreqtab:  .db   $6A,$64,$5E,$57,$52,$32,$0A,$00
-;Hi freq table
-        .db   $0B,$0A,$0A,$09,$08,$08,$07,$07
-        .db   $07,$06,$06,$05,$05,$05,$04,$04
-        .db   $04,$04,$03,$03,$03,$03,$03,$02
-        .db   $02,$02,$02,$02,$02,$02,$01,$01
-        .db   $01,$01,$01,$01,$01,$01,$01,$01
-        .db   $01,$01,$00,$00,$00,$00,$00,$00
-        .db   $00,$00,$00,$00,$00,$00,$00,$00
-        .db   $00,$00,$00,$00,$00,$00,$00,$00
-        
-L06DE_trackpos:  .db   $00,$00,$00
-L06E1_patternpos:  .db   $00,$00,$00
-L06E4_delaycntr:  .db   $00,$00,$00
-L06E7_delay:  .db   $00,$00,$00
-L06EA_freq:  .db   $00,$00,$00
-L06ED_instrenvno:  .db   $00,$00,$00
-L06F0_instrenvpos:  .db   $00,$00,$00
-L06F3_distort:  .db   $00,$00,$00
-L06F6_vibrato:  .db   $00,$00,$00
-L06F9_effect:  .db   $00,$00,$00
-L06FC_finevibrpos:  .db   $00,$00,$00
-L06FF_note:  .db   $00,$00,$00
-L0702_slidedir:  .db   $00,$00,$00
-L0705_slidedelay:  .db   $00,$00,$00
-L0708_slidestep:  .db   $00,$00,$00
-L070B_transp:  .db   $00,$00,$00
-L070E_playerstate:  .db   $00
-L070F_evenframe:  .db   $00
-; POKEY shadow registers
-L0710_audf1s:  .db   $00
-L0711_audc1s:  .db   $00
-L0712_audf2s:  .db   $00,$00,$00,$00,$00,$00
-L0718_audctls:  .db   $50
-
-L0719_finevibrenv:  .db   $00,$00,$01,$01,$00,$00,$FF,$FF,$1F
-
-L0400_beginmusic:  .ds 1
-
-; part of compiled music adapted to universal player
-
-;Lo patterns addr
-L0722_lpatternad:  .ds 64
-;Lo instr addr
-L0762_linstrenvad:  .ds 32
-;Hi patterns addr
-L0782_hpatternad:  .ds 64
-;Hi instr addr
-L07C2_hinstrenvad:  .ds 32
-;Note duration (calculated based on tempo)
-L07E2_delaytab:  .ds 32
-        
-;Lo track addr
-L0802_ltrackad:  .ds 3
-;Hi track addr
-L0805_htrackad:  .ds 3
-
-  ert * >= 0xa00
-
-  end
-
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/fc.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/fc.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/fp3depk.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/fp3depk.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/fp3depk.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/fp3depk.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-outerFlags	equ	$fc
-innerFlags	equ	$fd
-outPtr	equ	$fe
-
-	org	$8000
-getByte
-	lda	$aaaa
-	inw	getByte+1
-	rts
-exit
-	jmp	$aaaa
-copyTwoOrThree
-	sta	outPtr
-	txa	; lda #1
-	rol	@
-copyMany
-	tax
-	beq	exit
-copy
-	lda	(outPtr),y
-putByte
-	sta	$8080,y
-	iny
-	bne	samePage
-	tya	; lda #0
-	sec
-	adc	outPtr+1
-setPage
-	sta	outPtr+1
-	sta	putByte+2
-samePage
-	dex
-	bne	copy
-
-	asl	innerFlags
-	bne	gotInnerFlags
-	asl	outerFlags
-	bne	gotOuterFlags
-
-start
-	sec
-	jsr	getByte
-	rol	@
-	sta	outerFlags
-gotOuterFlags
-	lda	#1
-	bcc	setInnerFlags
-	jsr	getByte
-	rol	@
-setInnerFlags
-	sta	innerFlags
-gotInnerFlags
-	jsr	getByte
-	ldx	#1
-	bcc	putByte
-	lsr	@
-	bne	copyTwoOrThree
-	jsr	getByte
-	bcs	copyMany
-	tay
-	jsr	getByte
-	bcc	setPage	; jmp
-
-	end
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/mpt.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/mpt.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/mpt.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/mpt.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,904 +0,0 @@
-*----------------*
-* Player MPT 2.4 *
-* ver.spackowana *
-*----------------*
-
- org $0500
-
-*--- strona 0
-
-addr   equ $ec ,$ed
-word   equ $ee ,$ef
-audzer equ $f0 ,$f1 ,$f2 ,$f3
-licslp equ $f4 ,$f5 ,$f6 ,$f7
-lensmp equ $f8
-lsbmsb equ $f9
-adrs1  equ $fa ,$fb
-adrs2  equ $fc ,$fd
-adrsmp equ $fe ,$ff
-
-*--- program
-
- jmp init
-
-play lda czygrc
- bne *+3
- rts
- lda #0
- sta oraaud
- inc licz
- lda pozptr
- cmp maxptr
- bcc r1
- dec zegar
- beq p1
- jmp r5
-p1 ldx #0
- stx pozptr
-p2 lda #0
- sta ptrwsk,x
- sta licspc,x
- lda adrtrl,x
- sta addr
- lda adrtrh,x
- sta addr+1
- ldy pozsng
-p3 lda (addr),y
- iny
- cmp #$ff
- beq p5
- cmp #$fe
- bne p6
-p4 jmp inic2
-p5 lda (addr),y
- bmi p4
- asl @
- tay
- sty pozsng
- jmp p3
-p6 sta numptr,x
- lda (addr),y
- sta poddzw,x
-p7 inx
- cpx #4
- bne p2
- iny
- sty pozsng
- jmp r5
-r1 dec zegar
- bpl r5
- lda tempo
- sta zegar
- ldx #3
-r2 dec licspc,x
- bpl r4
- lda numptr,x
- asl @
- tay
-aptrlz lda $ffff,y
- sta addr
- iny
-aptrhz lda $ffff,y
- sta addr+1
- ora addr
- beq r4
- lda ptrwsk,x
- sta licptr
- jsr newdzw
- ldy licptr
- iny
- tya
- sta ptrwsk,x
- lda ilespc,x
- sta licspc,x
- cpx #2
- bne r4
- lda adcvol,x
- eor #$f
- asl @
- asl @
- asl @
- asl @
- adc <volstb
- sta volsmp+1
- lda >volstb
- adc #0
- sta volsmp+2
-r4 dex
- bpl r2
- inc pozptr
-r5 ldx #1
- lda typsmp
- cmp #2
- beq r6
- ldx #3
-r6 lda typsmp
- cmp #2
- bne r7
- cpx kansmp
- beq r8
-r7 jmp dzwiek
-r8 lda audzer,x
- and filtry,x
- beq r9
- ldy #$28
- lda (addr),y
- clc
- adc numdzw,x
- jsr czest
- sec
- adc p1pom,x
- sta freq+2,x
-r9 dex
- bpl r6
- lda #3
- sta $d20f
- lda audzer+1
- and #$10
- beq w1
- ldy numdzw+1
- lda bsfrql,y
- sta freq
- lda bsfrqh,y
- sta freq+1
-w1 lda freq
- sta $d200
- lda freq+1
- sta $d202
- lda freq+2
- sta $d204
- lda freq+3
- sta $d206
- lda volume
- ldx #$ff
- ldy typsmp
- cpy #1
- bne w2
- ldx kansmp
- beq w3
-w2 sta $d201
-w3 lda volume+1
- cpx #1
- beq w4
- sta $d203
-w4 cpy #2
- beq w6
- lda volume+2
- cpx #2
- beq w5
- sta $d205
-w5 lda volume+3
- cpx #3
- beq w6
- sta $d207
-w6 lda audzer
- ora audzer+1
- ora audzer+2
- ora audzer+3
- ora oraaud
- sta $d208
- rts
-filtry dta b(4),b(2),b(0),b(0)
-
-dzwiek lda adrinl,x
- sta addr
- lda adrinh,x
- sta addr+1
- ora addr
- bne d0
- sta volume,x
- sta audzer,x
- jmp r9
-d0 ldy licslp,x
- cpy #$20
- beq d3
- lda (addr),y
- sec
- sbc adcvol,x
- bit sprvol
- beq d1
- and #$f0
-d1 sta volume,x
- iny
- lda (addr),y
- sta przech
- iny
- sty licslp,x
- and #7
- beq d4
- tay
- lda akcadl-1,y
- sta akjmpz+1
- lda akcadh-1,y
- sta akjmpz+2
- lda przech
- lsr @
- lsr @
- lsr @
- lsr @
- lsr @
- ora #$28
- tay
- lda (addr),y
- clc
-akjmpz jsr $ffff
-d2 lda #0
- sta audzer,x
- jmp r9
-d3 lda p3max,x
- beq d4
- dec p3lic,x
- bne d4
- sta p3lic,x
- lda volume,x
- and #15
- beq d4
- dec volume,x
-d4 ldy #$23
- lda (addr),y
- sta audzer,x
- lda trnlic,x
- clc
- adc #$25
- tay
- and #3
- sta trnlic,x
- dey
- lda (addr),y
- adc adcdzw,x
- sta numdzw,x
- jsr czest+2
- sta freq,x
- lda p2lic,x
- beq d5
- dec p2lic,x
- jmp r8
-d5 lda branch,x
- sta p1jmpz+1
-p1jmpz bpl *
- jmp typ0dz
- brk
- jmp typ1dz
- brk
- jmp typ2dz
- brk
- jmp typ3dz
-czygrc dta b(0)
- jmp typ4dz
-zapisx dta b(0)
- jmp typ5dz
-zapisy dta b(0)
- jmp typ6dz
-sprvol dta b($10)
- jmp typ7dz
-
-newdzw lda #0
- sta adcvol,x
- ldy licptr
- dey
-new iny
- lda (addr),y
- cmp #$fe
- bne q0
- sty licptr
- rts
-q0 cmp #$e0
- bcc q1
- lda maxptr
- sta pozptr
- bne new
-q1 cmp #$d0
- bcc q2
- and #15
- sta tempo
- sta zegar
- bpl new
-q2 cmp #$c0
- bcc q3
- and #15
- eor #15
- sta adcvol,x
- bpl new
-q3 cmp #$80
- bcc q4
- and #$3f
- sta ilespc,x
- bpl new
-q4 cmp #$40
- bcc q5
- iny
- sty licptr
- and #$1f
- sta numsmp,x
- asl @
- tay
-ainslz lda $ffff,y
- sta adrinl,x
- iny
-ainshz lda $ffff,y
- sta adrinh,x
- jmp newdzw
-
-q5 sty licptr
- sta przech
- clc
- adc poddzw,x
- sta adcdzw,x
- lda typsmp
- beq n9
- cmp #2
- beq n8
- lda numsmp,x
- cmp #$1f
- bne n9
- lda przech
- sec
- sbc #1
-n6 and #15
- tay
- lda (adrsmp),y
- sta adrs2+1
- tya
- ora #$10
- tay
- lda (adrsmp),y
- sta lensmp
- ldy #1
- ora adrs2+1
- bne n7
- ldy #0
-n7 sty czysmp
- lda #0
- sta adrs2
- sta adrinl,x
- sta adrinh,x
- txa
- asl @
- sta wsksmp
- stx kansmp
- rts
-n8 cpx #2
- bcs nb
-n9 lda adrinl,x
- sta word
- lda adrinh,x
- sta word+1
- ora word
- beq na-1
- ldy #$20
- lda (word),y
- and #15
- sta p1lsb,x
- lda (word),y
- and #$70
- lsr @
- lsr @
- sta branch,x
- iny
- lda (word),y
- asl @
- asl @
- pha
- and #$3f
- sta p2lic,x
- pla
- and #$c0
- sta frqwsk,x
- iny
- lda (word),y
- sta p3max,x
- sta p3lic,x
- lda #0
- sta licslp,x
- sta trnlic,x
- sta p1lic,x
- sta p1pom,x
- lda adcdzw,x
- sta numdzw,x
- jsr czest
- sta freq,x
- cpx kansmp
- beq na
- rts
-na ldy #$ff
- sty kansmp
- iny
- sty czysmp
- rts
-nb cpx #2
- bne nd
- ldy adcdzw+2
- lda frsmpl,y
- sta smpl1z+1
- lda frsmph,y
- sta smpl2z+1
- lda #0
- sta lsbmsb
- sta adrs1
- lda numsmp+2
- and #15
- tay
- lda (adrsmp),y
- sta adrs1+1
- tya
- ora #$10
- tay
- lda (adrsmp),y
- sta smpl3z+1
- ora adrs1+1
- bne nc
- sta smpl1z+1
- sta smpl2z+1
-nc rts
-nd lda numsmp+3
- and #15
- tay
- lda (adrsmp),y
- sta adrs2+1
- tya
- ora #$10
- tay
- lda (adrsmp),y
- ora adrs2+1
- beq ne
- lda (adrsmp),y
- sec
- sbc adrs2+1
- sta lensmp
- lda #0
- sta adrs2
- lda #$8d
- bne nf
-ne lda #$ad
-nf sta drum2z
- sta drum1z
- lda #$18
- sta $d207
- rts
-
-typ0dz lda licz
- and #7
- lsr @
- lsr @
- bcc t2
- bne typ1dz
- lda p1lsb,x
-t1 clc
- sta p1pom,x
- adc freq,x
- sta freq,x
- jmp r8
-t2 lda #0
- sta p1pom,x
- jmp r8
-typ1dz lda freq,x
- sec
- sbc p1lsb,x
- sta freq,x
- sec
- lda #0
- sbc p1lsb,x
- sta p1pom,x
- jmp r8
-typ2dz lda p1lic,x
- clc
- sta p1pom,x
- adc freq,x
-t3 sta freq,x
- clc
- lda p1lic,x
- adc p1lsb,x
- sta p1lic,x
- jmp r8
-typ3dz lda numdzw,x
- sec
- sbc p1lic,x
-t4 sta numdzw,x
- jsr czest
- jmp t3
-typ4dz lda #0
- sec
- sbc p1lic,x
- sta p1pom,x
- lda freq,x
- sec
- sbc p1lic,x
- jmp t3
-typ5dz lda numdzw,x
- clc
- adc p1lic,x
- jmp t4
-typ6dz jsr t5
- jmp t1
-typ7dz jsr t5
- clc
- adc numdzw,x
- jsr a3
- jmp r8
-t5 ldy p1lic,x
- lda p1lsb,x
- bmi t6
- iny
- iny
-t6 dey
- tya
- sta p1lic,x
- cmp p1lsb,x
- bne t7
- lda p1lsb,x
- eor #$ff
- sta p1lsb,x
-t7 lda p1lic,x
- rts
-czest and #$3f
- ora frqwsk,x
- tay
-t1frqz lda $ffff,y
- rts
-
-akcadl dta l(a1),l(a0),l(a2)
- dta l(a4),l(a5),l(a6),l(a8)
-akcadh dta h(a1),h(a0),h(a2)
- dta h(a4),h(a5),h(a6),h(a8)
-audora dta b($40),b(0),b($20),b(0)
-
-a0 adc freq,x
-a1 sta freq,x
- rts
-a2 adc adcdzw,x
-a3 sta numdzw,x
- jsr czest
- sta freq,x
- rts
-a4 sta freq,x
- lda audora,x
- bpl a7
-a5 sta freq,x
- lda #$80
- bne a7
-a6 sta freq,x
- lda #1
-a7 ora oraaud
- sta oraaud
- rts
-a8 and $d20a
- sta freq,x
-a9 rts
-
-bsfrql equ *-1
- dta b($f2),b($33),b($96)
- dta b($e2),b($38),b($8c),b(0)
- dta b($6a),b($e8),b($6a),b($ef)
- dta b($80),b(8),b($ae),b($46)
- dta b($e6),b($95),b($41),b($f6)
- dta b($b0),b($6e),b($30),b($f6)
- dta b($bb),b($84),b($52),b($22)
- dta b($f4),b($c8),b($a0),b($7a)
- dta b($55),b($34),b($14),b($f5)
- dta b($d8),b($bd),b($a4),b($8d)
- dta b($77),b($60),b($4e),b($38)
- dta b($27),b($15),b(6),b($f7)
- dta b($e8),b($db),b($cf),b($c3)
- dta b($b8),b($ac),b($a2),b($9a)
- dta b($90),b($88),b($7f),b($78)
- dta b($70),b($6a),b($64),b($5e)
-
-bsfrqh equ *-1
- dta b(13,13,12,11,11,10,10,9,8,8,7,7,7,6,6)
- dta b(5,5,5,4,4,4,4,3,3,3,3,3,2,2,2,2)
- dta b(2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,0)
- dta b(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-
-volstb dta d'8888888888888888'
- dta d'667777888889999:'
- dta d'556667788899:::;'
- dta d'455667788899::;;'
- dta d'44556677899::;;<'
- dta d'34456677899::;<<'
- dta d'33455677899:;;<='
- dta d'23445677899:;<<='
- dta d'2334566789::;<=='
- dta d'2234566789::;<=>'
- dta d'1234566789::;<=>'
- dta d'1234556789:;;<=>'
- dta d'1234456789:;<<=>'
- dta d'1233456789:;<==>'
- dta d'1223456789:;<=>>'
- dta d'0123456789:;<=>?'
-
-frsmpl dta b($20),b($22),b($24),b($26),b($29)
- dta b($2b),b($2e),b($30),b($33),b($37)
- dta b($3a),b($3d),b($41),b($45),b($49)
- dta b($4d),b($52),b($57),b($5c),b($61)
- dta b($67),b($6e),b($74),b($7b),b($82)
- dta b($8a),b($92),b($9b),b($a4),b($ae)
- dta b($b8),b($c3),b($cf),b($dc),b($e9)
- dta b($f6),b(5),b($15),b($25),b($37)
- dta b($49),b($5d),b($71),b($87),b($9f)
- dta b($b8),b($d2),b($ed),b($b),b($2a)
- dta b($4b),b($6e),b($93),b($ba),b($e3)
- dta b($f),b($3e),b($70),b($a4),b($db)
-
-frsmph dta d'               '
- dta d'               '
- dta d'      !!!!!!!!!'
- dta d'!!!"""""""#####'
-
-*--- inicjacja
-
-iniadl dta l(inic0),l(inic2)
- dta l(inic4),l(inic5)
- dta l(inic6),l(inic7)
- dta l(inic8),l(inic9)
-iniadh dta h(inic0),h(inic2)
- dta h(inic4),h(inic5)
- dta h(inic6),h(inic7)
- dta h(inic8),h(inic9)
-
-init stx zapisx
- sty zapisy
- and #7
- tay
- lda iniadl,y
- sta inic1+1
- lda iniadh,y
- sta inic1+2
-inic1 jmp $ffff
-
-inic0 lda zapisy
- ldx zapisx
- sta ainslz+1
- sta ainshz+1
- stx ainslz+2
- stx ainshz+2
- clc
- adc #$40
- sta aptrlz+1
- sta aptrhz+1
- bcc i2
- inx
-i2 stx aptrlz+2
- stx aptrhz+2
- clc
- adc #$80
- sta t1frqz+1
- bcc i4
- inx
-i4 stx t1frqz+2
- inx
- sta j4+1
- stx j4+2
- ldx #9
-j4 lda $ffff,x
- sta adrtrl,x
- dex
- bpl j4
- dec tempo
-
-inic2 lda #0
- sta czygrc
- ldx <licptr-branch
-i9 sta branch,x
- dex
- bpl i9
- ldx #8
-k9 sta $d200,x
- dex
- bpl k9
- rts
-
-inic4 jsr inic2
- lda zapisx
- asl @
- sta pozsng
- lda maxptr
- sta pozptr
- lda #1
- sta zegar
- sta czygrc
- rts
-
-inic5 lda zapisy
- sta adrsmp
- lda zapisx
- sta adrsmp+1
-j5 rts
-
-inic6 lda zapisy
- and #3
- tax
- lda zapisx
- jsr n6
- lda czysmp
- beq j5
- asl  zapisy
-j6 jsr nopy
- lda #1
- sta typsmp
-j7 lda czysmp
- beq j5
- cmp #1
- bne j9
- ldy #0
- inc czysmp
-j9 lda (adrs2),y
- ldx wsksmp
- lsr @
- lsr @
- lsr @
- lsr @
- ora #$10
-k15h1z sta $d40a
- sta $d40a
- sta $d201,x
- lda (adrs2),y
- ora #$10
-k15h2z sta $d40a
- sta $d40a
- sta $d201,x
- iny
- bne j7
- inc adrs2+1
- lda adrs2+1
- cmp lensmp
- bne j7
- sty czysmp
- rts
-
-nopy bcc j8
- lda #$ea
- sta k15h1z
- sta k15h1z+1
- sta k15h1z+2
- sta k15h2z
- sta k15h2z+1
- sta k15h2z+2
- rts
-j8 lda #$8d
- sta k15h1z
- sta k15h2z
- lda #$a
- sta k15h1z+1
- sta k15h2z+1
- lda #$d4
- sta k15h1z+2
- sta k15h2z+2
- rts
-
-inic7 lda #0
- sta czysmp
- lda zapisx
- lsr @
- jsr nopy
- lda #1
- sta typsmp
-k1 jsr j7
- lda typsmp
- bne k1
- rts
-
-inic8 lda #2
- sta typsmp
- sta kansmp
-ressmp lda #$18
- sta $d207
- lda <ressmp+1
- sta adrs1
- lda >ressmp+1
- sta adrs1+1
- lda #$ad
- sta drum2z
- sta drum1z
- ldy #0
- sty smpl1z+1
- sty smpl2z+1
-k2 ldx $d40b
- lda (adrs2),y
- lsr @
- lsr @
- lsr @
- lsr @
- ora #$10
-drum1z sta $d207
- jsr k6
-k3 cpx $d40b
- beq k3
- sta $d205
- ldx $d40b
- lda (adrs2),y
- inc adrs2
- bne k4
- inc adrs2+1
- dec lensmp
- bne k4
- lda #$ad
- sta drum2z
- sta drum1z
- lda #8
-k4 ora #$10
-drum2z sta $d207
- jsr k6
-k5 cpx $d40b
- beq k5
- sta $d205
- lda typsmp
- bne k2
- rts
-
-k6 clc
- lda lsbmsb
-smpl1z adc #0
- sta lsbmsb
- lda adrs1
-smpl2z adc #0
- sta adrs1
- bcc k7
- inc adrs1+1
- lda adrs1+1
-smpl3z cmp #0
- bne k7
- sty smpl1z+1
- sty smpl2z+1
- rts
-k7 lda (adrs1),y
- bit lsbmsb
- bmi k8
- lsr @
- lsr @
- lsr @
- lsr @
-k8 and #15
- tay
-volsmp lda volstb,y
- ldy #0
- rts
-
-inic9 ldy #0
- sty typsmp
- sty czysmp
- dey
- sty kansmp
- rts
-
-*--- zmienne
-
-adrtrl org *+4
-adrtrh org *+4
-maxptr org *+1
-tempo  org *+1
-
-branch org *+4
-volume org *+4
-adcvol org *+4
-freq   org *+4
-frqwsk org *+4
-adcdzw org *+4
-poddzw org *+4
-adrinl org *+4
-adrinh org *+4
-numdzw org *+4
-numsmp org *+4
-numptr org *+4
-ptrwsk org *+4
-ilespc org *+4
-licspc org *+4
-p1lsb  org *+4
-p1lic  org *+4
-p1pom  org *+4
-p2lic  org *+4
-p3max  org *+4
-p3lic  org *+4
-trnlic org *+4
-zegar  org *+1
-pozsng org *+1
-pozptr org *+1
-wsksmp org *+1
-kansmp org *+1
-czysmp org *+1
-typsmp org *+1
-oraaud org *+1
-licz   org *+1
-przech org *+1
-licptr org *+1
-
- end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/mpt.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/mpt.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/os.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/os.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/os.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/os.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-	org	$c000
-nmi
-	bit	$d40f
-	bpl	nmi_vbl
-	jmp	($200)
-nmi_vbl
-	cld
-	pha
-	txa:pha
-	tya:pha
-	sta	$d40f
-	jmp	($222)
-
-vbl
-	inc	20
-	bne	vbl_1
-	inc	19
-	bne	vbl_1
-	inc	18
-vbl_1
-	jmp	($224)
-
-vbld
-	pla:tay
-	pla:tax
-	pla:rti
-
-irq
-	cld
-	jmp	($216)
-
-setvbv
-	asl	@
-	sta	$22d
-	txa
-	ldx	#5
-	sta	$d40a
-	dex:rne
-	ldx	$22d
-	sta	$217,x
-	tya:sta	$216,x
-	rts
-
-reset
-	mwa	#vbl	$222
-	mwa	#vbld	$224
-	rts
-
-	org	$e45c
-	jmp	setvbv
-	jmp	vbl
-	jmp	vbld
-
-	org	$fffa
-	dta	a(nmi,reset,irq)
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/rmt4.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/rmt4.obx differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/rmt8.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/rmt8.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/rmt.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/rmt.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/rmt.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/rmt.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,1326 +0,0 @@
-;*
-;* Raster Music Tracker, RMT Atari routine version 1.20051226
-;* (c) Radek Sterba, Raster/C.P.U., 2002 - 2005
-;* http://raster.atari.org
-;*
-;* Warnings:
-;*
-;* 1. RMT player routine needs 19 itself reserved bytes in zero page (no accessed
-;*    from any other routines) as well as cca 1KB of memory before the "PLAYER"
-;*    address for frequency tables and functionary variables. It's:
-;*	  a) from PLAYER-$400 to PLAYER for stereo RMTplayer
-;*    b) from PLAYER-$380 to PLAYER for mono RMTplayer
-;*
-;* 2. RMT player routine MUST (!!!) be compiled from the begin of the memory page.
-;*    i.e. "PLAYER" address can be $..00 only!
-;*
-;* 3. Because of RMTplayer provides a lot of effects, it spent a lot of CPU time.
-;*
-;* STEREOMODE	equ 0				;0 => compile RMTplayer for 4 tracks mono
-;*									;1 => compile RMTplayer for 8 tracks stereo
-;*									;2 => compile RMTplayer for 4 tracks stereo L1 R2 R3 L4
-;*									;3 => compile RMTplayer for 4 tracks stereo L1 L2 R3 R4
-;*
-PLAYER		equ $0600
-;*
-	IFT STEREOMODE==1
-TRACKS		equ 8
-	ELS
-TRACKS		equ 4
-	EIF
-;*
-;* RMT FEATures definitions
-;* For optimizations of RMT player routine to concrete RMT modul only!
-;* --------BEGIN--------
-FEAT_INSTRSPEED		equ 0			;* cca 21 or 5 bytes
-FEAT_CONSTANTSPEED	equ 0			;* cca 28 bytes
-;* VARIOUS COMMANDS
-FEAT_COMMAND1		equ 1			;* cca 8 bytes
-FEAT_COMMAND2		equ 1			;* cca 20 bytes (+save 1 address in zero page) and quicker whole RMT routine
-FEAT_COMMAND3		equ 1			;* cca 12 bytes
-FEAT_COMMAND4		equ 1			;* cca 15 bytes
-FEAT_COMMAND5		equ 1			;* cca 67 bytes
-FEAT_COMMAND6		equ 1			;* cca 15 bytes
-;* COMMAND7 SETNOTE (i.e. command 7 with parameter != $80)
-FEAT_COMMAND7SETNOTE		equ 1		;* cca 12 bytes
-;* COMMAND7 VOLUMEONLY (i.e. command 7 with parameter == $80)
-FEAT_COMMAND7VOLUMEONLY		equ 1		;* cca 74 bytes
-;* PORTAMENTO
-FEAT_PORTAMENTO		equ 1			;* cca 138 bytes and quicker whole RMT routine
-;* FILTER
-FEAT_FILTER			equ 1			;* cca 179 bytes and quicker whole RMT routine
-FEAT_FILTERG0L		equ	1			;* (cca 38 bytes for each)
-FEAT_FILTERG1L		equ	1
-FEAT_FILTERG0R		equ	1
-FEAT_FILTERG1R		equ	1
-;* BASS16B (i.e. distortion value 6)
-FEAT_BASS16			equ 1			;* cca 194 bytes +128bytes freq table and quicker whole RMT routine
-FEAT_BASS16G1L		equ 1			;* (cca 47 bytes for each)
-FEAT_BASS16G3L		equ 1
-FEAT_BASS16G1R		equ 1
-FEAT_BASS16G3R		equ 1
-;* VOLUME ONLY for particular generators
-FEAT_VOLUMEONLYG0L	equ 1			;* (cca 7 bytes for each)
-FEAT_VOLUMEONLYG2L	equ 1
-FEAT_VOLUMEONLYG3L	equ 1
-FEAT_VOLUMEONLYG0R	equ 1
-FEAT_VOLUMEONLYG2R	equ 1
-FEAT_VOLUMEONLYG3R	equ 1
-;* TABLE TYPE (i.e. TABLETYPE=1)
-FEAT_TABLETYPE		equ 1			;* cca 53 bytes and quicker whole RMT routine
-;* TABLE MODE (i.e. TABLEMODE=1)
-FEAT_TABLEMODE		equ 1			;* cca 16 bytes and quicker whole RMT routine
-;* TABLE GO (i.e. TGO is nonzero value)
-FEAT_TABLEGO		equ 1			;* cca 6 bytes and quicker whole RMT routine
-;* AUDCTLMANUALSET (i.e. any MANUAL AUDCTL setting is nonzero value)
-FEAT_AUDCTLMANUALSET	equ 1		;* cca 27 bytes and quicker whole RMT routine
-;* VOLUME MINIMUM (i.e. VMIN is nonzero value)
-FEAT_VOLUMEMIN		equ 1			;* cca 12 bytes and quicker whole RMT routine
-;* --------END--------
-
-;*
-;* RMT ZeroPage addresses
-	org 203
-p_tis
-p_instrstable	org *+2
-p_trackslbstable	org *+2
-p_trackshbstable	org *+2
-p_song			org *+2
-ns				org *+2
-nr				org *+2
-nt				org *+2
-reg1			org *+1
-reg2			org *+1
-reg3			org *+1
-tmp				org *+1
-	IFT FEAT_COMMAND2
-frqaddcmd2		org *+1
-	EIF
-	IFT TRACKS>4
-	org PLAYER-$400
-	ELS
-	org PLAYER-$380
-	EIF
-track_variables
-trackn_db	org *+TRACKS
-trackn_hb	org *+TRACKS
-trackn_idx	org *+TRACKS
-trackn_pause	org *+TRACKS
-trackn_note	org *+TRACKS
-trackn_volume	org *+TRACKS
-trackn_distor 	org *+TRACKS
-trackn_shiftfrq	org *+TRACKS
-	IFT FEAT_PORTAMENTO
-trackn_portafrqc org *+TRACKS
-trackn_portafrqa org *+TRACKS
-trackn_portaspeed org *+TRACKS
-trackn_portaspeeda org *+TRACKS
-trackn_portadepth org *+TRACKS
-	EIF
-trackn_instrx2	org *+TRACKS
-trackn_instrdb	org *+TRACKS
-trackn_instrhb	org *+TRACKS
-trackn_instridx	org *+TRACKS
-trackn_instrlen	org *+TRACKS
-trackn_instrlop	org *+TRACKS
-trackn_instrreachend	org *+TRACKS
-trackn_volumeslidedepth org *+TRACKS
-trackn_volumeslidevalue org *+TRACKS
-	IFT FEAT_VOLUMEMIN
-trackn_volumemin		org *+TRACKS
-	EIF
-trackn_effdelay			org *+TRACKS
-trackn_effvibratoa		org *+TRACKS
-trackn_effvibratobeg	org *+TRACKS
-trackn_effvibratoend	org *+TRACKS
-trackn_effshift		org *+TRACKS
-trackn_tabletypespeed org *+TRACKS
-	IFT FEAT_TABLEMODE
-trackn_tablemode	org *+TRACKS
-	EIF
-trackn_tablenote	org *+TRACKS
-trackn_tablea		org *+TRACKS
-trackn_tableend		org *+TRACKS
-	IFT FEAT_TABLEGO
-trackn_tablelop		org *+TRACKS
-	EIF
-trackn_tablespeeda	org *+TRACKS
-trackn_command		org *+TRACKS
-	IFT FEAT_BASS16
-trackn_outnote		org *+TRACKS
-	EIF
-	IFT FEAT_FILTER
-trackn_filter		org *+TRACKS
-	EIF
-trackn_audf	org *+TRACKS
-trackn_audc	org *+TRACKS
-	IFT FEAT_AUDCTLMANUALSET
-trackn_audctl	org *+TRACKS
-	EIF
-	IFT FEAT_CONSTANTSPEED==0
-v_speed			org *+1
-	EIF
-v_aspeed		org *+1
-	IFT FEAT_INSTRSPEED==0||FEAT_INSTRSPEED>1
-v_ainstrspeed	org *+1
-	EIF
-v_abeat			org *+1
-track_endvariables
-		org PLAYER-$100-$140-$30
-INSTRPAR	equ 12
-tabbeganddistor
- dta frqtabpure-frqtab,$00
- dta frqtabpure-frqtab,$20
- dta frqtabpure-frqtab,$40
- dta frqtabbass1-frqtab,$c0
- dta frqtabpure-frqtab,$80
- dta frqtabpure-frqtab,$a0
- dta frqtabbass1-frqtab,$c0
- dta frqtabbass2-frqtab,$c0
-vibtabbeg dta 0,vib1-vib0,vib2-vib0,vib3-vib0,vibx-vib0
-vib0	dta 0
-vib1	dta 1,-1,-1,1
-vib2	dta 1,0,-1,-1,0,1
-vib3	dta 1,1,0,-1,-1,-1,-1,0,1,1
-vibx
-:PLAYER-$100-$140-* dta 0
-;		org PLAYER-$100-$140
-	IFT FEAT_BASS16
-frqtabbasslo
-	dta $F2,$33,$96,$E2,$38,$8C,$00,$6A,$E8,$6A,$EF,$80,$08,$AE,$46,$E6
-	dta $95,$41,$F6,$B0,$6E,$30,$F6,$BB,$84,$52,$22,$F4,$C8,$A0,$7A,$55
-	dta $34,$14,$F5,$D8,$BD,$A4,$8D,$77,$60,$4E,$38,$27,$15,$06,$F7,$E8
-	dta $DB,$CF,$C3,$B8,$AC,$A2,$9A,$90,$88,$7F,$78,$70,$6A,$64,$5E,$00
-	EIF
-		org PLAYER-$100-$100
-frqtab
-	ERT [<frqtab]!=0	;* frqtab must begin at the memory page bound! (i.e. $..00 address)
-frqtabbass1
-	dta $BF,$B6,$AA,$A1,$98,$8F,$89,$80,$F2,$E6,$DA,$CE,$BF,$B6,$AA,$A1
-	dta $98,$8F,$89,$80,$7A,$71,$6B,$65,$5F,$5C,$56,$50,$4D,$47,$44,$3E
-	dta $3C,$38,$35,$32,$2F,$2D,$2A,$28,$25,$23,$21,$1F,$1D,$1C,$1A,$18
-	dta $17,$16,$14,$13,$12,$11,$10,$0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07
-frqtabbass2
-	dta $FF,$F1,$E4,$D8,$CA,$C0,$B5,$AB,$A2,$99,$8E,$87,$7F,$79,$73,$70
-	dta $66,$61,$5A,$55,$52,$4B,$48,$43,$3F,$3C,$39,$37,$33,$30,$2D,$2A
-	dta $28,$25,$24,$21,$1F,$1E,$1C,$1B,$19,$17,$16,$15,$13,$12,$11,$10
-	dta $0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00
-frqtabpure
-	dta $F3,$E6,$D9,$CC,$C1,$B5,$AD,$A2,$99,$90,$88,$80,$79,$72,$6C,$66
-	dta $60,$5B,$55,$51,$4C,$48,$44,$40,$3C,$39,$35,$32,$2F,$2D,$2A,$28
-	dta $25,$23,$21,$1F,$1D,$1C,$1A,$18,$17,$16,$14,$13,$12,$11,$10,$0F
-	dta $0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00,$00
-	IFT FEAT_BASS16
-frqtabbasshi
-	dta $0D,$0D,$0C,$0B,$0B,$0A,$0A,$09,$08,$08,$07,$07,$07,$06,$06,$05
-	dta $05,$05,$04,$04,$04,$04,$03,$03,$03,$03,$03,$02,$02,$02,$02,$02
-	dta $02,$02,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00
-	dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-	EIF
-		org PLAYER-$0100
-volumetab
-	dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-	dta $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01
-	dta $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$02,$02,$02,$02
-	dta $00,$00,$00,$01,$01,$01,$01,$01,$02,$02,$02,$02,$02,$03,$03,$03
-	dta $00,$00,$01,$01,$01,$01,$02,$02,$02,$02,$03,$03,$03,$03,$04,$04
-	dta $00,$00,$01,$01,$01,$02,$02,$02,$03,$03,$03,$04,$04,$04,$05,$05
-	dta $00,$00,$01,$01,$02,$02,$02,$03,$03,$04,$04,$04,$05,$05,$06,$06
-	dta $00,$00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07
-	dta $00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07,$08
-	dta $00,$01,$01,$02,$02,$03,$04,$04,$05,$05,$06,$07,$07,$08,$08,$09
-	dta $00,$01,$01,$02,$03,$03,$04,$05,$05,$06,$07,$07,$08,$09,$09,$0A
-	dta $00,$01,$01,$02,$03,$04,$04,$05,$06,$07,$07,$08,$09,$0A,$0A,$0B
-	dta $00,$01,$02,$02,$03,$04,$05,$06,$06,$07,$08,$09,$0A,$0A,$0B,$0C
-	dta $00,$01,$02,$03,$03,$04,$05,$06,$07,$08,$09,$0A,$0A,$0B,$0C,$0D
-	dta $00,$01,$02,$03,$04,$05,$06,$07,$07,$08,$09,$0A,$0B,$0C,$0D,$0E
-	dta $00,$01,$02,$03,$04,$05,$06,$07,$08,$09,$0A,$0B,$0C,$0D,$0E,$0F
-	org PLAYER
-;*
-;* Set of RMT main vectors:
-;*
-RASTERMUSICTRACKER
-	jmp rmt_init
-	jmp rmt_play
-	jmp rmt_p3
-	jmp rmt_silence
-	jmp SetPokey
-rmt_init
-	stx ns
-	sty ns+1
-	pha
-	IFT track_endvariables-track_variables>255
-	ldy #0
-	tya
-ri0	sta track_variables,y
-	sta track_endvariables-$100,y
-	iny
-	bne ri0
-	ELS
-	ldy #track_endvariables-track_variables
-	lda #0
-ri0	sta track_variables-1,y
-	dey
-	bne ri0
-	EIF
-	ldy #4
-	lda (ns),y
-	sta v_maxtracklen
-	iny
-	IFT FEAT_CONSTANTSPEED==0
-	lda (ns),y
-	sta v_speed
-	EIF
-	IFT FEAT_INSTRSPEED==0
-	iny
-	lda (ns),y
-	sta v_instrspeed
-	sta v_ainstrspeed
-	ELI FEAT_INSTRSPEED>1
-	lda #FEAT_INSTRSPEED
-	sta v_ainstrspeed
-	EIF
-	ldy #8
-ri1	lda (ns),y
-	sta p_tis-8,y
-	iny
-	cpy #8+8
-	bne ri1
-	pla
-	pha
-	IFT TRACKS>4
-	asl @
-	asl @
-	asl @
-	clc
-	adc p_song
-	sta p_song
-	pla
-	php
-	and #$e0
-	asl @
-	rol @
-	rol @
-	rol @
-	ELS
-	asl @
-	asl @
-	clc
-	adc p_song
-	sta p_song
-	pla
-	php
-	and #$c0
-	asl @
-	rol @
-	rol @
-	EIF
-	plp
-	adc p_song+1
-	sta p_song+1
-	jsr GetSongLineTrackLineInitOfNewSetInstrumentsOnlyRmtp3
-rmt_silence
-	IFT STEREOMODE>0
-	lda #0
-	sta $d208
-	sta $d218
-	ldy #3
-	sty $d20f
-	sty $d21f
-	ldy #8
-si1	sta $d200,y
-	sta $d210,y
-	dey
-	bpl si1
-	ELS
-	lda #0
-	sta $d208
-	ldy #3
-	sty $d20f
-	ldy #8
-si1	sta $d200,y
-	dey
-	bpl si1
-	EIF
-	IFT FEAT_INSTRSPEED==0
-	lda v_instrspeed
-	ELS
-	lda #FEAT_INSTRSPEED
-	EIF
-	rts
-GetSongLineTrackLineInitOfNewSetInstrumentsOnlyRmtp3
-GetSongLine
-	ldx #0
-	stx v_abeat
-nn0
-nn1	txa
-	tay
-	lda (p_song),y
-	cmp #$fe
-	bcs nn2
-	tay
-	lda (p_trackslbstable),y
-	sta trackn_db,x
-	lda (p_trackshbstable),y
-nn1a sta trackn_hb,x
-	lda #0
-	sta trackn_idx,x
-	lda #1
-nn1a2 sta trackn_pause,x
-	lda #$80
-	sta trackn_instrx2,x
-	inx
-xtracks01	cpx #TRACKS
-	bne nn1
-	lda p_song
-	clc
-xtracks02	adc #TRACKS
-	sta p_song
-	bcc GetTrackLine
-	inc p_song+1
-nn1b
-	jmp GetTrackLine
-nn2
-	beq nn3
-nn2a
-	lda #0
-	beq nn1a2
-nn3
-	ldy #2
-	lda (p_song),y
-	tax
-	iny
-	lda (p_song),y
-	sta p_song+1
-	stx p_song
-	ldx #0
-	beq nn0
-GetTrackLine
-oo0
-oo0a
-	IFT FEAT_CONSTANTSPEED==0
-	lda v_speed
-	sta v_bspeed
-	EIF
-	ldx #-1
-oo1
-	inx
-	dec trackn_pause,x
-	bne oo1x
-oo1b
-	lda trackn_db,x
-	sta ns
-	lda trackn_hb,x
-	sta ns+1
-oo1i
-	ldy trackn_idx,x
-	inc trackn_idx,x
-	lda (ns),y
-	sta reg1
-	and #$3f
-	cmp #61
-	beq oo1a
-	bcs oo2
-	sta trackn_note,x
-	IFT FEAT_BASS16
-	sta trackn_outnote,x
-	EIF
-	iny
-	lda (ns),y
-	lsr @
-	and #$3f*2
-	sta trackn_instrx2,x
-oo1a
-	lda #1
-	sta trackn_pause,x
-	ldy trackn_idx,x
-	inc trackn_idx,x
-	lda (ns),y
-	lsr @
-	ror reg1
-	lsr @
-	ror reg1
-	lda reg1
-	and #$f0
-	sta trackn_volume,x
-oo1x
-xtracks03sub1	cpx #TRACKS-1
-	bne oo1
-	IFT FEAT_CONSTANTSPEED==0
-	lda #$ff
-v_bspeed equ *-1
-	sta v_speed
-	ELS
-	lda #FEAT_CONSTANTSPEED
-	EIF
-	sta v_aspeed
-	jmp InitOfNewSetInstrumentsOnly
-oo2
-	cmp #63
-	beq oo63
-	lda reg1
-	and #$c0
-	beq oo62_b
-	asl @
-	rol @
-	rol @
-	sta trackn_pause,x
-	jmp oo1x
-oo62_b
-	iny
-	lda (ns),y
-	sta trackn_pause,x
-	inc trackn_idx,x
-	jmp oo1x
-oo63
-	lda reg1
-	IFT FEAT_CONSTANTSPEED==0
-	bmi oo63_1X
-	iny
-	lda (ns),y
-	sta v_bspeed
-	inc trackn_idx,x
-	jmp oo1i
-oo63_1X
-	EIF
-	cmp #255
-	beq oo63_11
-	iny
-	lda (ns),y
-	sta trackn_idx,x
-	jmp oo1i
-oo63_11
-	jmp GetSongLine
-p2xrmtp3	jmp rmt_p3
-p2x0 dex
-	 bmi p2xrmtp3
-InitOfNewSetInstrumentsOnly
-p2x1 ldy trackn_instrx2,x
-	bmi p2x0
-SetUpInstrumentY2
-	lda (p_instrstable),y
-	sta trackn_instrdb,x
-	sta nt
-	iny
-	lda (p_instrstable),y
-	sta trackn_instrhb,x
-	sta nt+1
-	IFT FEAT_FILTER
-	lda #1
-	sta trackn_filter,x
-	EIF
-	IFT FEAT_TABLEGO
-	IFT FEAT_FILTER
-	tay
-	ELS
-	ldy #1
-	EIF
-	lda (nt),y
-	sta trackn_tablelop,x
-	iny
-	ELS
-	ldy #2
-	EIF
-	lda (nt),y
-	sta trackn_instrlen,x
-	iny
-	lda (nt),y
-	sta trackn_instrlop,x
-	iny
-	lda (nt),y
-	sta trackn_tabletypespeed,x
-	IFT FEAT_TABLETYPE||FEAT_TABLEMODE
-	and #$3f
-	EIF
-	sta trackn_tablespeeda,x
-	IFT FEAT_TABLEMODE
-	lda (nt),y
-	and #$40
-	sta trackn_tablemode,x
-	EIF
-	IFT FEAT_AUDCTLMANUALSET
-	iny
-	lda (nt),y
-	sta trackn_audctl,x
-	iny
-	ELS
-	ldy #6
-	EIF
-	lda (nt),y
-	sta trackn_volumeslidedepth,x
-	IFT FEAT_VOLUMEMIN
-	iny
-	lda (nt),y
-	sta trackn_volumemin,x
-	iny
-	ELS
-	ldy #8
-	EIF
-	lda (nt),y
-	sta trackn_effdelay,x
-	iny
-	lda (nt),y
-	tay
-	lda vibtabbeg,y
-	sta trackn_effvibratoa,x
-	sta trackn_effvibratobeg,x
-	lda vibtabbeg+1,y
-	sta trackn_effvibratoend,x
-	ldy #10
-	lda (nt),y
-	sta trackn_effshift,x
-	lda #128
-	sta trackn_volumeslidevalue,x
-	sta trackn_instrx2,x
-	asl @
-	sta trackn_instrreachend,x
-	sta trackn_shiftfrq,x
-	tay
-	lda (nt),y
-	sta trackn_tableend,x
-	adc #0
-	sta trackn_instridx,x
-	lda #INSTRPAR
-	sta trackn_tablea,x
-	tay
-	lda (nt),y
-	sta trackn_tablenote,x
-xata_rtshere
-	jmp p2x0
-rmt_play
-rmt_p0
-	jsr SetPokey
-rmt_p1
-	IFT FEAT_INSTRSPEED==0||FEAT_INSTRSPEED>1
-	dec v_ainstrspeed
-	bne rmt_p3
-	EIF
-	IFT FEAT_INSTRSPEED==0
-	lda #$ff
-v_instrspeed	equ *-1
-	sta v_ainstrspeed
-	ELI FEAT_INSTRSPEED>1
-	lda #FEAT_INSTRSPEED
-	sta v_ainstrspeed
-	EIF
-rmt_p2
-	dec v_aspeed
-	bne rmt_p3
-	inc v_abeat
-	lda v_abeat
-	cmp #$ff
-v_maxtracklen equ *-1
-	beq p2o3
-	jmp GetTrackLine
-p2o3
-	jmp GetSongLineTrackLineInitOfNewSetInstrumentsOnlyRmtp3
-go_ppnext	jmp ppnext
-rmt_p3
-	lda #>frqtab
-	sta nr+1
-xtracks05sub1	ldx #TRACKS-1
-pp1
-	lda trackn_instrhb,x
-	beq go_ppnext
-	sta ns+1
-	lda trackn_instrdb,x
-	sta ns
-	ldy trackn_instridx,x
-	lda (ns),y
-	sta reg1
-	iny
-	lda (ns),y
-	sta reg2
-	iny
-	lda (ns),y
-	sta reg3
-	iny
-	tya
-	cmp trackn_instrlen,x
-	bcc pp2
-	beq pp2
-	lda #$80
-	sta trackn_instrreachend,x
-pp1b
-	lda trackn_instrlop,x
-pp2	sta trackn_instridx,x
-	lda reg1
-	IFT TRACKS>4
-	cpx #4
-	bcc pp2s
-	lsr @
-	lsr @
-	lsr @
-	lsr @
-pp2s
-	EIF
-	and #$0f
-	ora trackn_volume,x
-	tay
-	lda volumetab,y
-	sta tmp
-	lda reg2
-	and #$0e
-	tay
-	lda tabbeganddistor,y
-	sta nr
-	lda tmp
-	ora tabbeganddistor+1,y
-	sta trackn_audc,x
-InstrumentsEffects
-	lda trackn_effdelay,x
-	beq ei2
-	cmp #1
-	bne ei1
-	lda trackn_shiftfrq,x
-	clc
-	adc trackn_effshift,x
-	clc
-	ldy trackn_effvibratoa,x
-	adc vib0,y
-	sta trackn_shiftfrq,x
-	iny
-	tya
-	cmp trackn_effvibratoend,x
-	bne ei1a
-	lda trackn_effvibratobeg,x
-ei1a
-	sta trackn_effvibratoa,x
-	jmp ei2
-ei1
-	dec trackn_effdelay,x
-ei2
-	ldy trackn_tableend,x
-	cpy #INSTRPAR+1
-	bcc ei3
-	lda trackn_tablespeeda,x
-	bpl ei2f
-ei2c
-	tya
-	cmp trackn_tablea,x
-	bne ei2c2
-	IFT FEAT_TABLEGO
-	lda trackn_tablelop,x
-	ELS
-	lda #INSTRPAR
-	EIF
-	sta trackn_tablea,x
-	bne ei2a
-ei2c2
-	inc trackn_tablea,x
-ei2a
-	lda trackn_instrdb,x
-	sta nt
-	lda trackn_instrhb,x
-	sta nt+1
-	ldy trackn_tablea,x
-	lda (nt),y
-	IFT FEAT_TABLEMODE
-	ldy trackn_tablemode,x
-	beq ei2e
-	clc
-	adc trackn_tablenote,x
-ei2e
-	EIF
-	sta trackn_tablenote,x
-	lda trackn_tabletypespeed,x
-	IFT FEAT_TABLETYPE||FEAT_TABLEMODE
-	and #$3f
-	EIF
-ei2f
-	sec
-	sbc #1
-	sta trackn_tablespeeda,x
-ei3
-	lda trackn_instrreachend,x
-	bpl ei4
-	lda trackn_volume,x
-	beq ei4
-	IFT FEAT_VOLUMEMIN
-	cmp trackn_volumemin,x
-	beq ei4
-	bcc ei4
-	EIF
-	tay
-	lda trackn_volumeslidevalue,x
-	clc
-	adc trackn_volumeslidedepth,x
-	sta trackn_volumeslidevalue,x
-	bcc ei4
-	tya
-	sbc #16
-	sta trackn_volume,x
-ei4
-	IFT FEAT_COMMAND2
-	lda #0
-	sta frqaddcmd2
-	EIF
-	lda reg2
-	sta trackn_command,x
-	and #$70
-	lsr @
-	lsr @
-	sta jmx+1
-jmx	bcc *
-	jmp cmd0
-	nop
-	jmp cmd1
-	nop
-	jmp cmd2
-	nop
-	jmp cmd3
-	nop
-	jmp cmd4
-	nop
-	jmp cmd5
-	nop
-	jmp cmd6
-	nop
-	jmp cmd7
-cmd1
-	IFT FEAT_COMMAND1
-	lda reg3
-	jmp cmd0c
-	EIF
-cmd2
-	IFT FEAT_COMMAND2
-	lda reg3
-	sta frqaddcmd2
-	lda trackn_note,x
-	jmp cmd0a
-	EIF
-cmd3
-	IFT FEAT_COMMAND3
-	lda trackn_note,x
-	clc
-	adc reg3
-	sta trackn_note,x
-	jmp cmd0a
-	EIF
-cmd4
-	IFT FEAT_COMMAND4
-	lda trackn_shiftfrq,x
-	clc
-	adc reg3
-	sta trackn_shiftfrq,x
-	lda trackn_note,x
-	jmp cmd0a
-	EIF
-cmd5
-	IFT FEAT_COMMAND5&&FEAT_PORTAMENTO
-	IFT FEAT_TABLETYPE
-	lda trackn_tabletypespeed,x
-	bpl cmd5a1
-	ldy trackn_note,x
-	lda (nr),y
-	clc
-	adc trackn_tablenote,x
-	jmp cmd5ax
-	EIF
-cmd5a1
-	lda trackn_note,x
-	clc
-	adc trackn_tablenote,x
-	cmp #61
-	bcc cmd5a2
-	lda #63
-cmd5a2
-	tay
-	lda (nr),y
-cmd5ax
-	sta trackn_portafrqc,x
-	ldy reg3
-	bne cmd5a
-	sta trackn_portafrqa,x
-cmd5a
-	tya
-	lsr @
-	lsr @
-	lsr @
-	lsr @
-	sta trackn_portaspeed,x
-	sta trackn_portaspeeda,x
-	lda reg3
-	and #$0f
-	sta trackn_portadepth,x
-	lda trackn_note,x
-	jmp cmd0a
-	ELI FEAT_COMMAND5
-	jmp pp9
-	EIF
-cmd6
-	IFT FEAT_COMMAND6&&FEAT_FILTER
-	lda reg3
-	clc
-	adc trackn_filter,x
-	sta trackn_filter,x
-	lda trackn_note,x
-	jmp cmd0a
-	ELI FEAT_COMMAND6
-	jmp pp9
-	EIF
-cmd7
-	IFT FEAT_COMMAND7SETNOTE||FEAT_COMMAND7VOLUMEONLY
-	IFT FEAT_COMMAND7SETNOTE
-	lda reg3
-	IFT FEAT_COMMAND7VOLUMEONLY
-	cmp #$80
-	beq cmd7a
-	EIF
-	sta trackn_note,x
-	jmp cmd0a
-	EIF
-	IFT FEAT_COMMAND7VOLUMEONLY
-cmd7a
-	lda trackn_audc,x
-	ora #$f0
-	sta trackn_audc,x
-	lda trackn_note,x
-	jmp cmd0a
-	EIF
-	EIF
-cmd0
-	lda trackn_note,x
-	clc
-	adc reg3
-cmd0a
-	IFT FEAT_TABLETYPE
-	ldy trackn_tabletypespeed,x
-	bmi cmd0b
-	EIF
-	clc
-	adc trackn_tablenote,x
-	cmp #61
-	bcc cmd0a1
-	lda #0
-	sta trackn_audc,x
-	lda #63
-cmd0a1
-	IFT FEAT_BASS16
-	sta trackn_outnote,x
-	EIF
-	tay
-	lda (nr),y
-	clc
-	adc trackn_shiftfrq,x
-	IFT FEAT_COMMAND2
-	clc
-	adc frqaddcmd2
-	EIF
-	IFT FEAT_TABLETYPE
-	jmp cmd0c
-cmd0b
-	cmp #61
-	bcc cmd0b1
-	lda #0
-	sta trackn_audc,x
-	lda #63
-cmd0b1
-	tay
-	lda trackn_shiftfrq,x
-	clc
-	adc trackn_tablenote,x
-	clc
-	adc (nr),y
-	IFT FEAT_COMMAND2
-	clc
-	adc frqaddcmd2
-	EIF
-	EIF
-cmd0c
-	sta trackn_audf,x
-pp9
-	IFT FEAT_PORTAMENTO
-	lda trackn_portaspeeda,x
-	beq pp10
-	dec trackn_portaspeeda,x
-	bne pp10
-	lda trackn_portaspeed,x
-	sta trackn_portaspeeda,x
-	lda trackn_portafrqa,x
-	cmp trackn_portafrqc,x
-	beq pp10
-	bcs pps1
-	adc trackn_portadepth,x
-	bcs pps8
-	cmp trackn_portafrqc,x
-	bcs pps8
-	jmp pps9
-pps1
-	sbc trackn_portadepth,x
-	bcc pps8
-	cmp trackn_portafrqc,x
-	bcs pps9
-pps8
-	lda trackn_portafrqc,x
-pps9
-	sta trackn_portafrqa,x
-pp10
-	lda reg2
-	and #$01
-	beq pp11
-	lda trackn_portafrqa,x
-	clc
-	adc trackn_shiftfrq,x
-	sta trackn_audf,x
-pp11
-	EIF
-ppnext
-	dex
-	bmi rmt_p4
-	jmp pp1
-rmt_p4
-	IFT FEAT_AUDCTLMANUALSET
-	lda trackn_audctl+0
-	ora trackn_audctl+1
-	ora trackn_audctl+2
-	ora trackn_audctl+3
-	tax
-	ELS
-	ldx #0
-	EIF
-qq1
-	stx v_audctl
-	IFT FEAT_FILTER
-	IFT FEAT_FILTERG0L
-	lda trackn_command+0
-	bpl qq2
-	lda trackn_audc+0
-	and #$0f
-	beq qq2
-	lda trackn_audf+0
-	clc
-	adc trackn_filter+0
-	sta trackn_audf+2
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2L
-	lda trackn_audc+2
-	and #$10
-	bne qq1a
-	EIF
-	lda #0
-	sta trackn_audc+2
-qq1a
-	txa
-	ora #4
-	tax
-	EIF
-qq2
-	IFT FEAT_FILTERG1L
-	lda trackn_command+1
-	bpl qq3
-	lda trackn_audc+1
-	and #$0f
-	beq qq3
-	lda trackn_audf+1
-	clc
-	adc trackn_filter+1
-	sta trackn_audf+3
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG3L
-	lda trackn_audc+3
-	and #$10
-	bne qq2a
-	EIF
-	lda #0
-	sta trackn_audc+3
-qq2a
-	txa
-	ora #2
-	tax
-	EIF
-qq3
-	IFT FEAT_FILTERG0L||FEAT_FILTERG1L
-	cpx v_audctl
-	bne qq5
-	EIF
-	EIF
-	IFT FEAT_BASS16
-	IFT FEAT_BASS16G1L
-	lda trackn_command+1
-	and #$0e
-	cmp #6
-	bne qq4
-	lda trackn_audc+1
-	and #$0f
-	beq qq4
-	ldy trackn_outnote+1
-	lda frqtabbasslo,y
-	sta trackn_audf+0
-	lda frqtabbasshi,y
-	sta trackn_audf+1
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG0L
-	lda trackn_audc+0
-	and #$10
-	bne qq3a
-	EIF
-	lda #0
-	sta trackn_audc+0
-qq3a
-	txa
-	ora #$50
-	tax
-	EIF
-qq4
-	IFT FEAT_BASS16G3L
-	lda trackn_command+3
-	and #$0e
-	cmp #6
-	bne qq5
-	lda trackn_audc+3
-	and #$0f
-	beq qq5
-	ldy trackn_outnote+3
-	lda frqtabbasslo,y
-	sta trackn_audf+2
-	lda frqtabbasshi,y
-	sta trackn_audf+3
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2L
-	lda trackn_audc+2
-	and #$10
-	bne qq4a
-	EIF
-	lda #0
-	sta trackn_audc+2
-qq4a
-	txa
-	ora #$28
-	tax
-	EIF
-	EIF
-qq5
-	stx v_audctl
-	IFT TRACKS>4
-	IFT FEAT_AUDCTLMANUALSET
-	lda trackn_audctl+4
-	ora trackn_audctl+5
-	ora trackn_audctl+6
-	ora trackn_audctl+7
-	tax
-	ELS
-	ldx #0
-	EIF
-	stx v_audctl2
-	IFT FEAT_FILTER
-	IFT FEAT_FILTERG0R
-	lda trackn_command+0+4
-	bpl qs2
-	lda trackn_audc+0+4
-	and #$0f
-	beq qs2
-	lda trackn_audf+0+4
-	clc
-	adc trackn_filter+0+4
-	sta trackn_audf+2+4
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2R
-	lda trackn_audc+2+4
-	and #$10
-	bne qs1a
-	EIF
-	lda #0
-	sta trackn_audc+2+4
-qs1a
-	txa
-	ora #4
-	tax
-	EIF
-qs2
-	IFT FEAT_FILTERG1R
-	lda trackn_command+1+4
-	bpl qs3
-	lda trackn_audc+1+4
-	and #$0f
-	beq qs3
-	lda trackn_audf+1+4
-	clc
-	adc trackn_filter+1+4
-	sta trackn_audf+3+4
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG3R
-	lda trackn_audc+3+4
-	and #$10
-	bne qs2a
-	EIF
-	lda #0
-	sta trackn_audc+3+4
-qs2a
-	txa
-	ora #2
-	tax
-	EIF
-qs3
-	IFT FEAT_FILTERG0R||FEAT_FILTERG1R
-	cpx v_audctl2
-	bne qs5
-	EIF
-	EIF
-	IFT FEAT_BASS16
-	IFT FEAT_BASS16G1R
-	lda trackn_command+1+4
-	and #$0e
-	cmp #6
-	bne qs4
-	lda trackn_audc+1+4
-	and #$0f
-	beq qs4
-	ldy trackn_outnote+1+4
-	lda frqtabbasslo,y
-	sta trackn_audf+0+4
-	lda frqtabbasshi,y
-	sta trackn_audf+1+4
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG0R
-	lda trackn_audc+0+4
-	and #$10
-	bne qs3a
-	EIF
-	lda #0
-	sta trackn_audc+0+4
-qs3a
-	txa
-	ora #$50
-	tax
-	EIF
-qs4
-	IFT FEAT_BASS16G3R
-	lda trackn_command+3+4
-	and #$0e
-	cmp #6
-	bne qs5
-	lda trackn_audc+3+4
-	and #$0f
-	beq qs5
-	ldy trackn_outnote+3+4
-	lda frqtabbasslo,y
-	sta trackn_audf+2+4
-	lda frqtabbasshi,y
-	sta trackn_audf+3+4
-	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2R
-	lda trackn_audc+2+4
-	and #$10
-	bne qs4a
-	EIF
-	lda #0
-	sta trackn_audc+2+4
-qs4a
-	txa
-	ora #$28
-	tax
-	EIF
-	EIF
-qs5
-	stx v_audctl2
-	EIF
-rmt_p5
-	IFT FEAT_INSTRSPEED==0||FEAT_INSTRSPEED>1
-	lda v_ainstrspeed
-	ELS
-	lda #1
-	EIF
-	rts
-SetPokey
-	IFT STEREOMODE==1		;* L1 L2 L3 L4 R1 R2 R3 R4
-	ldy #$ff
-v_audctl2 equ *-1
-	lda trackn_audf+0+4
-	ldx trackn_audf+0
-xstastx01	sta $d210
-	stx $d200
-	lda trackn_audc+0+4
-	ldx trackn_audc+0
-xstastx02	sta $d211
-	stx $d201
-	lda trackn_audf+1+4
-	ldx trackn_audf+1
-xstastx03	sta $d212
-	stx $d202
-	lda trackn_audc+1+4
-	ldx trackn_audc+1
-xstastx04	sta $d213
-	stx $d203
-	lda trackn_audf+2+4
-	ldx trackn_audf+2
-xstastx05	sta $d214
-	stx $d204
-	lda trackn_audc+2+4
-	ldx trackn_audc+2
-xstastx06	sta $d215
-	stx $d205
-	lda trackn_audf+3+4
-	ldx trackn_audf+3
-xstastx07	sta $d216
-	stx $d206
-	lda trackn_audc+3+4
-	ldx trackn_audc+3
-xstastx08	sta $d217
-	stx $d207
-	lda #$ff
-v_audctl equ *-1
-xstysta01	sty $d218
-	sta $d208
-	ELI STEREOMODE==0		;* L1 L2 L3 L4
-	ldy #$ff
-v_audctl equ *-1
-	lda trackn_audf+0
-	ldx trackn_audc+0
-	sta $d200
-	stx $d201
-	lda trackn_audf+1
-	ldx trackn_audc+1
-	sta $d200+2
-	stx $d201+2
-	lda trackn_audf+2
-	ldx trackn_audc+2
-	sta $d200+4
-	stx $d201+4
-	lda trackn_audf+3
-	ldx trackn_audc+3
-	sta $d200+6
-	stx $d201+6
-	sty $d208
-	ELI STEREOMODE==2		;* L1 R2 R3 L4
-	ldy #$ff
-v_audctl equ *-1
-	lda trackn_audf+0
-	ldx trackn_audc+0
-	sta $d200
-	stx $d201
-	sta $d210
-	lda trackn_audf+1
-	ldx trackn_audc+1
-	sta $d210+2
-	stx $d211+2
-	lda trackn_audf+2
-	ldx trackn_audc+2
-	sta $d210+4
-	stx $d211+4
-	sta $d200+4
-	lda trackn_audf+3
-	ldx trackn_audc+3
-	sta $d200+6
-	stx $d201+6
-	sta $d210+6
-	sty $d218
-	sty $d208
-	ELI STEREOMODE==3		;* L1 L2 R3 R4
-	ldy #$ff
-v_audctl equ *-1
-	lda trackn_audf+0
-	ldx trackn_audc+0
-	sta $d200
-	stx $d201
-	lda trackn_audf+1
-	ldx trackn_audc+1
-	sta $d200+2
-	stx $d201+2
-	lda trackn_audf+2
-	ldx trackn_audc+2
-	sta $d210+4
-	stx $d211+4
-	sta $d200+4
-	lda trackn_audf+3
-	ldx trackn_audc+3
-	sta $d210+6
-	stx $d211+6
-	sta $d200+6
-	sty $d218
-	sty $d208
-	EIF
-	rts
-RMTEND
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/tm2.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/tm2.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/tm2.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/tm2.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,1551 +0,0 @@
-;-------------------
-;  TMC 2.00 Player
-;------------------
-
-player equ $500
-normal equ 1 ; change to 0 for short version
-
-       org player
-
-addr   equ $fa
-byte   equ $fc
-bajt   equ $fd
-filter equ $fe
-maxvol equ $ff
-
-; some tables on start (to avoid page breaking)
-
-voltab dta d'                '
-       dta d'        !!!!!!!!'
-       dta d'    !!!!!!!!""""'
-       dta d'   !!!!!"""""###'
-       dta d'  !!!!""""####$$'
-       dta d'  !!!"""###$$$%%'
-       dta d'  !!"""##$$$%%&&'
-       dta d'  !!""##$$%%&&'''''
-       dta d' !!""##$$%%&&''''('
-       dta d' !!""#$$%%&''''(()'
-       dta d' !!"##$%%&''''())*'
-       dta d' !!"#$$%&''''()**+'
-       dta d' !""#$%&&''()**+,'
-       dta d' !"##$%&''()**+,-'
-       dta d' !"#$%&''''()*+,-.'
-       dta d' !"#$%&''()*+,-./'
-
-frqtab dta 0,$f1,$e4,$d7
-       dta $cb,$c0,$b5,$aa
-       dta $a1,$98,$8f,$87
-       dta $7f,$78,$72,$6b
-       dta $65,$5f,$5a,$55
-       dta $50,$4b,$47,$43
-       dta $3f,$3c,$38,$35
-       dta $32,$2f,$2c,$2a
-       dta $27,$25,$23,$21
-       dta $1f,$1d,$1c,$1a
-       dta $18,$17,$16,$14
-       dta $13,$12,$11,$10
-       dta 15,14,13,12
-       dta 11,10,9,8
-       dta 7,6,5,4
-       dta 3,2,1,0
-
-       dta 0,$f2,$e9,$da
-       dta $ce,$bf,$b6,$aa
-       dta $a1,$98,$8f,$89
-       dta $80,$7a,$71,$6b
-       dta $65,$5f,$5c,$56
-       dta $50,$4d,$47,$44
-       dta $3e,$3c,$38,$35
-       dta $32,$2f,$2d,$2a
-       dta $28,$25,$23,$21
-       dta $1f,$1d,$1c,$1a
-       dta $18,$17,$16,$14
-       dta $13,$12,$11,$10
-       dta 15,14,13,12
-       dta 11,10,9,8
-       dta 7,6,5,4
-       dta 3,2,1,0
-
-       dta 0,$ff,$f1,$e4
-       dta $d8,$ca,$c0,$b5
-       dta $ab,$a2,$99,$8e
-       dta $87,$7f,$79,$73
-       dta $70,$66,$61,$5a
-       dta $55,$52,$4b,$48
-       dta $43,$3f,$3c,$39
-       dta $37,$33,$30,$2d
-       dta $2a,$28,$25,$24
-       dta $21,$1f,$1e,$1c
-       dta $1b,$19,$17,$16
-       dta $15,$13,$12,$11
-       dta $10,15,14,13
-       dta 12,11,10,9
-       dta 8,7,6,5
-       dta 4,3,2,1
-
-       dta 0,$f3,$e6,$d9
-       dta $cc,$c1,$b5,$ad
-       dta $a2,$99,$90,$88
-       dta $80,$79,$72,$6c
-       dta $66,$60,$5b,$55
-       dta $51,$4c,$48,$44
-       dta $40,$3c,$39,$35
-       dta $32,$2f,$2d,$2a
-       dta $28,$25,$23,$21
-       dta $1f,$1d,$1c,$1a
-       dta $18,$17,$16,$14
-       dta $13,$12,$11,$10
-       dta 15,14,13,12
-       dta 11,10,9,8
-       dta 7,6,5,4
-       dta 3,2,1,0
-
-basslo dta l($be2,$b38,$a8c,$a00)
-       dta l($96a,$8e8,$86a,$7ef)
-       dta l($780,$708,$6ae,$646)
-       dta l($5e6,$595,$541,$4f6)
-       dta l($4b0,$46e,$430,$3f6)
-       dta l($3bb,$384,$352,$322)
-       dta l($2f4,$2c8,$2a0,$27a)
-       dta l($255,$234,$214,$1f5)
-       dta l($1d8,$1bd,$1a4,$18d)
-       dta l($177,$160,$14e,$138)
-       dta l($127,$115,$106,$0f7)
-       dta l($0e8,$0db,$0cf,$0c3)
-       dta l($0b8,$0ac,$0a2,$09a)
-       dta l($090,$088,$07f,$078)
-       dta l($070,$06a,$064,$05e)
-       dta l($057,$052,$032,$00a)
-
-       dta 0,$f2,$33,$96
-       dta $e2,$38,$8c,$00
-       dta $6a,$e8,$6a,$ef
-       dta $80,$08,$ae,$46
-       dta $e6,$95,$41,$f6
-       dta $b0,$6e,$30,$f6
-       dta $bb,$84,$52,$22
-       dta $f4,$c8,$a0,$7a
-       dta $55,$34,$14,$f5
-       dta $d8,$bd,$a4,$8d
-       dta $77,$60,$4e,$38
-       dta $27,$15,$06,$f7
-       dta $e8,$db,$cf,$c3
-       dta $b8,$ac,$a2,$9a
-       dta $90,$88,$7f,$78
-       dta $70,$6a,$64,$5e
-
-basshi dta h($be2,$b38,$a8c,$a00)
-       dta h($96a,$8e8,$86a,$7ef)
-       dta h($780,$708,$6ae,$646)
-       dta h($5e6,$595,$541,$4f6)
-       dta h($4b0,$46e,$430,$3f6)
-       dta h($3bb,$384,$352,$322)
-       dta h($2f4,$2c8,$2a0,$27a)
-       dta h($255,$234,$214,$1f5)
-       dta h($1d8,$1bd,$1a4,$18d)
-       dta h($177,$160,$14e,$138)
-       dta h($127,$115,$106,$0f7)
-       dta h($0e8,$0db,$0cf,$0c3)
-       dta h($0b8,$0ac,$0a2,$09a)
-       dta h($090,$088,$07f,$078)
-       dta h($070,$06a,$064,$05e)
-       dta h($057,$052,$032,$00a)
-
-       dta 0,13,13,12
-       dta 11,11,10,10
-       dta 9,8,8,7
-       dta 7,7,6,6
-       dta 5,5,5,4
-       dta 4,4,4,3
-       dta 3,3,3,3
-       dta 2,2,2,2
-       dta 2,2,2,1
-       dta 1,1,1,1
-       dta 1,1,1,1
-       dta 1,1,1,0
-       dta 0,0,0,0
-       dta 0,0,0,0
-       dta 0,0,0,0
-       dta 0,0,0,0
-
-tables_len equ *-player
-
-;      org +$300
-       jmp init
-       jmp play
-       jmp sound
-
-; some external controls
-quadro dta 1           ; 0=mono, 1-63=stereo, 64-127= RMT stereo, 128-255=quadro
-pokeys dta 16          ; which data should go to which pokey (0,1,2 and 3 respectively)
-       dta 20          ; for stereo config: 16=first 4 tracks, 20=last 4 tracks
-       dta 0           ; for quadro values should be:
-       dta 0           ; 0=main volume from tracks 0-3, 4=main volume from tracks 4-5
-                       ; 8=additional volume from tracks 0-3, 12=additional volume from tracks 4-5
-                       ; typical: 0,4,12,8 which should sound well on pokeys 0&2 on left channel
-                       ; and pokeys 1&3 on right channel
-                       ; (on stereo atari these settings should also sound well)
-silent dta d'        ' ; which channel should be silent
-
-; these values are usable from the outside of player
-czygrc dta 0           ; if song should be played
-pozsng dta 0           ; position in song
-
-specialflag dta 0      ; flag triggered in song data
-adrsng dta a(0)        ; address of song line
-
-tempo  dta 0           ; tempo of song
-ltempo dta 0           ; counter of tempo
-pozptr dta 0           ; counter of positions in patterns (64 means end of pattern)
-
-       ift normal ; !!!
-
-aud1   dta 0           ; total AUDCTL of left channel
-aud2   dta 0           ; and right
-
-voltabs equ *          ; (24 bytes)
-
-       eif ; !!!
-
-vol1ch dta d'        ' ; volume of main channels
-
-       ift normal ; !!!
-
-vol2ch dta d'        ' ; volume of additional channels
-volume dta d'        ' ; volume of channels in stereo (taken from vol1ch and vol2ch)
-
-freqtabs equ *         ; (24 bytes)
-
-       eif ; !!!
-
-frq    dta d'        ' ; frequency
-
-       ift normal ; !!!
-
-note   dta d'        ' ; actual note played on channel (taken from aktwys)
-freqen dta d'        ' ; frequency of channels in stereo (taken from frq)
-
-       eif ; !!!
-
-; data for accesing pattern data
-adrptl dta d'        ' ; address of pattern data
-adrpth dta d'        ' ;
-pozwpt dta d'        ' ; index for accesing data in pattern
-poddzw dta d'        ' ; change of note
-delay  dta d'        ' ; how many spaces in pattern should be skipped
-
-; data for accesing instrument data
-czygrx dta d'        ' ; if something is played on channel
-adrsnl dta d'        ' ; address of instrument data
-adrsnh dta d'        ' ;
-numdzw dta d'        ' ; number of instrument
-wysdzw dta d'        ' ; note to play
-aktwys dta d'        ' ; actual played note
-znksz  dta d'        ' ; distortion
-audctl dta d'        ' ; AUDCTL
-slupy  dta d'        ' ; counter for data inside instrument
-
-; data for specific sound effects
-sndlen dta d'        ' ; length of instrument
-sndlop dta d'        ' ; where to loop sound data
-actvol dta d'        ' ; volume of sounds
-actvl1 dta d'        ' ; actual control of main volume
-
-       ift normal ; !!!
-
-actvl2 dta d'        ' ; and additional volume
-
-       eif ; !!!
-
-opad1  dta d'        ' ; how soon the sound should fade (main volume)
-opad2  dta d'        ' ; and additional volume
-lopad1 dta d'        ' ; counters for fading
-lopad2 dta d'        ' ;
-opadst dta d'        ' ; start of fading
-typ    dta d'        ' ; type of effect
-param  dta d'        ' ; parameter for effect
-typdat dta d'        ' ; data for effect
-czekaj dta d'        ' ; how soon the effect should start
-dtyp   dta d'        ' ; how often the effect should chanfe
-ltyp   dta d'        ' ; counter for effect change
-ilperm dta d'        ' ; how many arpeggio sounds
-aperm  dta d'        ' ; actual arpeggio sound
-dperm  dta d'        ' ; how soon the arpeggio should change
-lperm  dta d'        ' ; counter for arpeggio
-kolejn dta d'        ' ; order of arpeggio
-sndfilter dta d'        ' ; filter from sound data
-mainaudctl dta d'        ' ; main audctl
-addaudctl dta d'        ' ; additional audctl
-shiftfrq dta d'        '
-shiftnote dta d'        '
-shiftfilter dta d'        '
-
-; some useful tables
-
-       ift normal ; !!!
-
-przeci dta 4,5,6,7     ; which channel is the opposite (used only in stereo)
-       dta 0,1,2,3
-
-       eif ; !!!
-
-audtb1 dta 4,2,0,0     ; which byte in audctl has to be set to make sound "2 channel synth"
-       dta 4,2,0,0
-audtb2 dta 0,16,0,8    ; which byte in audctl has to be set to make sound "2 channel bass"
-       dta 0,16,0,8
-usedaudctl dta 4+129,$50+2+129,129,$28+129 ; bits of AUDCTL used in channel
-       dta 4+129,$50+2+129,129,$28+129
-
-;-------------------------
-; start of player program
-
-player_program equ *
-
-; new address of song line
-p3     dey
-       lda (addr),y
-       sta pozsng
-       mvx #0 byte
-       asl @
-       rol byte
-       asl @
-       rol byte
-       asl @
-       rol byte
-       asl @
-       rol byte
-       adc pozsng ; clc
-       scc:inc byte
-       clc
-zm0    adc #0
-       sta addr
-       lda byte
-zm1    adc #0
-       sta addr+1
-       jmp p1
-
-; play song (call only one time per frame)
-play   jsr pokey
-       lda czygrc
-       beq rsound
-       dec ltempo
-       bmi p4
-rsound jmp sound+3
-
-p4     dec pozptr
-       bne r1
-
-; get new patterns from song
-       ldx #0
-       inc pozsng
-       mwa adrsng addr
-
-p1     ldy #16
-       lda (addr),y
-       bmi p3
-       jeq stop
-       sta pozptr
-       dey
-
-p2     lda (addr),y
-       dey
-       sty byte
-       tay
-zm2    lda $ffff,y
-       sta adrptl,x
-zm3    lda $ffff,y
-       sta adrpth,x
-       lda #0
-       sta delay,x
-       sta pozwpt,x
-       ldy byte
-       lda (addr),y
-       sta poddzw,x
-       inx
-       dey
-       bpl p2
-       lda #17
-       add addr
-       sta adrsng
-       lda #0
-       adc addr+1
-       sta adrsng+1
-
-; get new data from patterns
-r1     mva tempo ltempo
-
-       ldx #7
-r2     dec delay,x
-       bmi r13
-
-r14    dex
-       bpl r2
-       jmp sound+3
-
-r13    mva adrptl,x addr
-       mva adrpth,x addr+1
-
-       ldy pozwpt,x
-r3     lda (addr),y ; get data
-       bne r4
-
-       iny ; $00: only new volume
-       lda (addr),y
-       sta actvol,x
-       and #$f0
-       sta actvl1,x
-
-       ift normal ; !!!
-
-       lda (addr),y
-       asl @
-       asl @
-       asl @
-       asl @
-       sta actvl2,x
-
-       eif ; !!!
-
-       iny
-       tya
-       sta pozwpt,x
-       jmp r14
-
-r4     cmp #$40
-       bcs r5
-       adc poddzw,x ; $01-$3f: new note with sound and maybe volume
-       sta wysdzw,x
-       iny
-       lda (addr),y
-       bpl r11
-       and #$7f
-       sta byte
-       iny
-       lda (addr),y
-       sta actvol,x
-       and #$f0
-       sta actvl1,x
-
-       ift normal ; !!!
-
-       lda (addr),y
-       asl @
-       asl @
-       asl @
-       asl @
-       sta actvl2,x
-
-       eif ; !!!
-
-       iny
-       tya
-       sta pozwpt,x
-       ldy byte
-       jsr dzwiek
-       jmp r14
-
-r11    tay ; without volume
-       inc pozwpt,x
-       inc pozwpt,x
-       lda actvol,x
-       and #$f0
-       sta actvl1,x
-
-       ift normal ; !!!
-
-       lda actvol,x
-       asl @
-       asl @
-       asl @
-       asl @
-       sta actvl2,x
-
-       eif ; !!!
-
-       jsr dzwiek
-       jmp r14
-
-r5     cmp #$80
-       bcs r6
-       and #$3f ; $41-$7f: new note with volume
-       add poddzw,x
-       sta wysdzw,x
-       iny
-       lda (addr),y
-       sta actvol,x
-       and #$f0
-       sta actvl1,x
-
-       ift normal ; !!!
-
-       lda (addr),y
-       asl @
-       asl @
-       asl @
-       asl @
-       sta actvl2,x
-
-       eif ; !!!
-
-       iny
-       tya
-       sta pozwpt,x
-       jmp r14
-
-r6     bne r7
-       iny ; $80: more than 15 spaces
-       lda (addr),y
-       sta delay,x
-       iny
-       tya
-       sta pozwpt,x
-       jmp r14
-
-r7     cmp #$c0
-       bcs r8
-       and #$3f ; $81-$bf: new note
-       add poddzw,x
-       sta wysdzw,x
-       inc pozwpt,x
-       jmp r14
-
-r8     cmp #$d0
-       bcs r9
-       iny ; $c0-$cf: new tempo
-       inc pozwpt,x
-       and #15
-       sta tempo
-       sta ltempo
-       jmp r3
-
-r9     cmp #$e0 ; special code
-       bcs r15
-       mva (addr),y byte
-       iny
-       mva (addr),y bajt
-       iny
-       tya
-       sta pozwpt,x
-       lda byte
-       jsr specialcode
-       jmp r14
-
-r15    cmp #$f0 ; special code with volume
-       bcs r12
-       mva (addr),y byte
-       iny
-       mva (addr),y bajt
-       lda byte
-       jsr specialcode
-       ldy pozwpt,x
-       iny
-       iny
-       lda (addr),y
-       sta actvol,x
-       and #$f0
-       sta actvl1,x
-
-       ift normal ; !!!
-
-       lda (addr),y
-       asl @
-       asl @
-       asl @
-       asl @
-       sta actvl2,x
-
-       eif ; !!!
-
-       iny
-       tya
-       sta pozwpt,x
-       jmp r14
-
-r12    cmp #$ff
-       bcs r10
-       sbc #$ef ; $f0-$fe: spaces-$f0 (c is clear here)
-       sta delay,x
-       inc pozwpt,x
-       jmp r14
-
-r10    lda #$40 ; $ff: spaces till the end of pattern
-       sta delay,x
-       jmp r14
-
-; main play sound loop
-sound  jsr pokey
-       ldx #7
-p5     lda czygrx,x
-       beq p6
-       jmp graj
-
-grajreturn equ *
-       lda silent,x
-       beq p7
-
-       lda #0 ; silent channel
-       sta vol1ch,x
-
-       ift normal ; !!!
-
-       sta vol2ch,x
-
-       eif ; !!!
-
-       dex
-       bpl p5
-       jmp p8
-
-p7     ldy bajt
-       lda frqtab,y
-       add byte
-       sta frq,x
-       tya
-       sta aktwys,x
-
-       lda audctl,x
-       and audtb2,x
-       beq p11
-       lda bajt ; 2 channel bass
-       and #$7f
-       tay
-       lda basslo,y
-       add byte
-       sta frq-1,x
-       lda basshi,y
-       adc #0
-       sta frq,x
-       lda #0
-       sta vol1ch-1,x
-       ldy przeci,x
-       sta vol2ch-1,y
-       dex
-       dex
-       bpl p5
-       jmp p8
-
-p11    lda audctl,x
-       and audtb1,x
-       beq p6
-       lda sndfilter,x ;two channel filter
-       add bajt
-       sta aktwys+2,x
-       tay
-       lda frqtab,y
-       add byte
-       sec
-       adc filter
-       sta frq+2,x
-
-p6     dex
-       bpl p5
-
-; sound postprocessing
-p8     inx
-       stx byte
-
-       ift normal ; !!!
-
-       ldx #3
-       lda quadro
-       beq p9
-       and #$40
-       bne p12
-
-       ldx #7 ; standard stereo settings
-p9     txa
-       tay
-       lda vol1ch,y
-       bne p10
-       ldy przeci,x
-       lda vol2ch,y
-       bne p10
-       txa
-       tay
-       lda #0
-p10    ora znksz,y
-       sta volume,x
-       lda frq,y
-       sta freqen,x
-       lda aktwys,y
-       sta note,x
-
-       lda audctl,y
-       ora byte
-       sta byte
-
-       cpx #4
-       sne:sta aud2
-       dex
-       bpl p9
-       sta aud1
-       rts
-
-p12    equ * ; RMT stereo
-p13    lda vol1ch,x
-       ora znksz,x
-       sta volume,x
-       lda vol2ch+4,x
-       ora znksz+4,x
-       sta volume+4,x
-       mva frq,x freqen,x
-       mva frq+4,x freqen+4,x
-       mva aktwys,x note,x
-       mva aktwys+4,x note+4,x
-       dex
-       bpl p13
-
-       lda audctl
-       ora audctl+1
-       ora audctl+2
-       ora audctl+3
-       sta aud1
-       lda audctl+4
-       ora audctl+5
-       ora audctl+6
-       ora audctl+7
-       sta aud2
-       rts
-
-; set pokey
-pokey  lda quadro
-       jeq pokey1
-       jpl pokey2
-
-       lda pokeys+3 ; data for pokey 3
-       tax
-       lsr @
-       lsr @
-       and #1
-       tay
-       lda aud1,y
-       sta $d238
-       txa
-       and #4
-       tay
-       lda freqtabs,y
-       sta $d230
-       lda voltabs,x
-       sta $d231
-       lda freqtabs+1,y
-       sta $d232
-       lda voltabs+1,x
-       sta $d233
-       lda freqtabs+2,y
-       sta $d234
-       lda voltabs+2,x
-       sta $d235
-       lda freqtabs+3,y
-       sta $d236
-       lda voltabs+3,x
-       sta $d237
-
-       lda pokeys+2 ; data for pokey 2
-       tax
-       lsr @
-       lsr @
-       and #1
-       tay
-       lda aud1,y
-       sta $d228
-       txa
-       and #4
-       tay
-       lda freqtabs,y
-       sta $d220
-       lda voltabs,x
-       sta $d221
-       lda freqtabs+1,y
-       sta $d222
-       lda voltabs+1,x
-       sta $d223
-       lda freqtabs+2,y
-       sta $d224
-       lda voltabs+2,x
-       sta $d225
-       lda freqtabs+3,y
-       sta $d226
-       lda voltabs+3,x
-       sta $d227
-
-pokey2 lda pokeys+1 ; data for pokey 1
-       tax
-       lsr @
-       lsr @
-       and #1
-       tay
-       lda aud1,y
-       sta $d218
-       txa
-       ldy quadro
-       spl:and #4
-       tay
-       lda freqtabs,y
-       sta $d210
-       lda voltabs,x
-       sta $d211
-       lda freqtabs+1,y
-       sta $d212
-       lda voltabs+1,x
-       sta $d213
-       lda freqtabs+2,y
-       sta $d214
-       lda voltabs+2,x
-       sta $d215
-       lda freqtabs+3,y
-       sta $d216
-       lda voltabs+3,x
-       sta $d217
-
-pokey1 lda pokeys ; data for pokey 0
-       tax
-       lsr @
-       lsr @
-       and #1
-       tay
-       lda aud1,y
-       sta $d208
-       txa
-       ldy quadro
-       spl:and #4
-       tay
-       lda freqtabs,y
-       sta $d200
-       lda voltabs,x
-       sta $d201
-       lda freqtabs+1,y
-       sta $d202
-       lda voltabs+1,x
-       sta $d203
-       lda freqtabs+2,y
-       sta $d204
-       lda voltabs+2,x
-       sta $d205
-       lda freqtabs+3,y
-       sta $d206
-       lda voltabs+3,x
-       sta $d207
-       rts
-
-       els ; !!!
-
-       rts
-
-pokey  lda audctl+4
-       ora audctl+5
-       ora audctl+6
-       ora audctl+7
-       sta $d218
-       lda frq+4
-       sta $d210
-       lda vol1ch+4
-       ora znksz+4
-       sta $d211
-       lda frq+5
-       sta $d212
-       lda vol1ch+5
-       ora znksz+5
-       sta $d213
-       lda frq+6
-       sta $d214
-       lda vol1ch+6
-       ora znksz+6
-       sta $d215
-       lda frq+7
-       sta $d216
-       lda vol1ch+7
-       ora znksz+7
-       sta $d217
-
-       lda audctl+0
-       ora audctl+1
-       ora audctl+2
-       ora audctl+3
-       sta $d208
-       lda frq+0
-       sta $d200
-       lda vol1ch+0
-       ora znksz+0
-       sta $d201
-       lda frq+1
-       sta $d202
-       lda vol1ch+1
-       ora znksz+1
-       sta $d203
-       lda frq+2
-       sta $d204
-       lda vol1ch+2
-       ora znksz+2
-       sta $d205
-       lda frq+3
-       sta $d206
-       lda vol1ch+3
-       ora znksz+3
-       sta $d207
-       rts
-
-       eif ; !!!
-
-; sound processing
-graj   lda adrsnl,x
-       sta addr
-       lda adrsnh,x
-       sta addr+1
-
-       mva shiftfrq,x byte
-       mva shiftnote,x bajt
-       mva shiftfilter,x filter
-
-       lda slupy,x
-       cmp sndlen,x
-       bcc n1
-       sta opadst,x
-       lda sndlop,x
-       sta slupy,x
-       jmp n0
-
-n1     lda opadst,x ; sound fading
-       beq n6
-n0     lda opad1,x
-       beq n7
-       dec lopad1,x
-       bne n7
-       sta lopad1,x
-       lda actvl1,x
-       beq n7
-       sub #16
-       sta actvl1,x
-n7     lda opad2,x
-       beq n6
-       dec lopad2,x
-       bne n6
-       sta lopad2,x
-
-       ift normal ; !!!
-
-       lda actvl2,x
-       beq n6
-       sub #16
-       sta actvl2,x
-
-       eif ; !!!
-
-n6     ldy aperm,x ; arpeggio
-       lda (addr),y
-       add wysdzw,x
-       add:sta bajt
-       dec lperm,x
-       bpl m1
-       lda dperm,x
-       sta lperm,x
-       lda kolejn,x
-       beq m6
-       add aperm,x
-       sta aperm,x
-       beq m7
-       cmp ilperm,x
-       bcc m1
-       lda #$ff
-       sta kolejn,x
-       jmp m1
-
-m7     lda #1
-       sta kolejn,x
-       jmp m1
-
-m6     inc aperm,x
-       lda ilperm,x
-       cmp aperm,x
-       bcs m1
-       lda #0
-       sta aperm,x
-
-m1     lda #19
-       add:sta addr
-       scc:inc addr+1
-
-       ldy slupy,x
-       lda (addr),y ; main sound data
-       and #$f0
-       sta znksz,x
-       lda (addr),y
-       and #15
-       ora actvl1,x
-       tay
-       lda voltab,y
-       ora maxvol
-       tay
-       lda voltab,y
-       sta vol1ch,x
-
-       ift normal ; !!!
-
-       ldy slupy,x
-       iny
-       lda (addr),y
-       and #15
-       ora actvl2,x
-       tay
-       lda voltab,y
-       ora maxvol
-       tay
-       lda voltab,y
-       sta vol2ch,x
-
-       eif ; !!!
-
-       lda czekaj,x
-       bne m2
-       lda typ,x
-       sta m5+1
-m5     bpl * ; jmp
-       jmp typ0
-       nop
-       jmp typ1
-       nop
-       jmp typ2
-       nop
-       jmp typ3
-       nop
-       jmp typ4
-       nop
-       jmp typ5
-       nop
-       jmp typ6
-       nop
-       jmp typ7
-
-m2     dec czekaj,x
-m3     ldy slupy,x ; accents
-       iny
-       lda (addr),y
-       and #$70
-       lsr @
-       lsr @
-       lsr @
-       sta n5+1
-       lda (addr),y
-       bmi n3
-       lda mainaudctl,x
-       jmp n4
-n3     lda addaudctl,x
-n4     and usedaudctl,x
-       sta audctl,x
-       iny
-       iny
-       tya
-       sta slupy,x
-       dey
-       lda (addr),y
-n5     bcc * ; jmp
-       bcc a0
-       bcc a1
-       bcc a2
-       bcc a3
-       bcc a4
-       bcc a5
-       bcc a6
-       bcc a7
-
-; accents
-a1     adc:sta shiftfrq,x
-       lda (addr),y
-a0     add:sta byte
-       jmp grajreturn
-
-a3     adc:sta shiftnote,x
-       lda (addr),y
-a2     add:sta bajt
-       jmp grajreturn
-
-a5     adc:sta shiftfilter,x
-       lda (addr),y
-a4     add:sta filter
-       jmp grajreturn
-
-a6     sta byte
-       lda #0
-a7     sta bajt
-       jmp grajreturn
-
-; effects
-typ1   lda typdat,x
-       and #3
-       lsr @
-       bcc t0
-       bne t1
-       lda param,x
-       add:sta byte
-t0     dec ltyp,x
-       bpl typ0
-       inc typdat,x
-       mva dtyp,x ltyp,x
-       jmp m3
-
-t1     lda byte
-       sbc param,x ; sec
-       sta byte
-       dec ltyp,x
-       bpl typ0
-       inc typdat,x
-       mva dtyp,x ltyp,x
-       jmp m3
-
-typ2   ldy typdat,x
-       lda param,x
-       bmi t2
-       iny
-       iny
-t2     dey
-       tya
-       add:sta byte
-       dec ltyp,x
-       bpl typ0
-       tya
-       sta typdat,x
-       cmp param,x
-       bne t3
-       eor #$ff
-       sta param,x
-t3     mva dtyp,x ltyp,x
-typ0   jmp m3
-
-typ3   ldy typdat,x
-       lda param,x
-       bmi t4
-       iny
-       iny
-t4     dey
-       tya
-       add:sta bajt
-       dec ltyp,x
-       bpl typ0
-       tya
-       sta typdat,x
-       cmp param,x
-       bne t3
-       eor #$ff
-       sta param,x
-       mva dtyp,x ltyp,x
-       jmp m3
-
-typ4   lda typdat,x
-       add:sta byte
-       dec ltyp,x
-       bpl typ0
-       lda param,x
-       add:sta typdat,x
-       mva dtyp,x ltyp,x
-       jmp m3
-
-typ5   lda bajt
-       sub typdat,x
-       sta bajt
-       dec ltyp,x
-       bpl typ0
-       lda param,x
-       add:sta typdat,x
-       mva dtyp,x ltyp,x
-       jmp m3
-
-typ6   lda param,x
-       add:sta byte
-typ7   jmp m3 ; placeholder for new type of sound
-
-;----------------
-; init functions
-
-; play song, X=number of song
-songx  ldy #16
-zm4    lda #0
-       sta addr
-zm5    lda #0
-       sta addr+1
-       mva #0 pozsng
-d5     txa
-       beq inic
-       lda (addr),y
-       seq:bpl d4
-       dex
-d4     lda #17
-       add:sta addr
-       scc:inc addr+1
-       inc pozsng
-       bne d5
-       ldx #0
-
-; play song, X=line of song
-playx  lda #0
-       sta byte
-       txa
-       sta pozsng
-       asl @
-       rol byte
-       asl @
-       rol byte
-       asl @
-       rol byte
-       asl @
-       rol byte
-       adc pozsng ; clc
-       scc:inc byte
-       clc
-zm6    adc #0
-       sta addr
-       lda byte
-zm7    adc #0
-       sta addr+1
-inic   jsr stop
-       mwa addr adrsng
-       ldx #7
-i4     mva #$ff actvol,x
-       lda #$f0
-       sta actvl1,x
-
-       ift normal ; !!!
-
-       sta actvl2,x
-
-       eif ; !!!
-
-       dex
-       bpl i4
-       lda #3
-       sta $d20f
-       sta $d21f
-
-       ift normal ; !!!
-
-       sta $d22f
-       sta $d23f
-
-       eif ; !!!
-
-       dec pozsng
-       inx
-       stx ltempo
-       inx
-       stx pozptr
-       stx czygrc
-       rts
-
-i1     txa ; change of tempo
-       and #15
-       sta tempo
-       rts
-i2     stx czygrc ; pause, continue
-       rts
-
-init   cmp #$10 ; A=$00
-       jcc songx
-       cmp #$20 ; A=$10
-       bcc playx
-       cmp #$30 ; A=$20
-       jcc d2
-       cmp #$40 ; A=$30
-       bcc i1
-       cmp #$50 ; A=$40
-       jcc stop
-       cmp #$60 ; A=$50
-       bcc i2
-       cmp #$70 ; A=$60
-       jcs i3
-       sty bajt
-
-specialcode and #15
-       asl @
-       sta sc17+1
-       lda bajt
-sc17   bcc * ; jmp
-       bcc sc0
-       bcc sc1
-       bcc sc2
-       bcc sc3
-       bcc sc4
-       bcc sc5
-       bcc sc6
-       bcc sc7
-       bcc sc8
-       bcc sc9
-       bcc sc10
-       bcc sc11
-       bcc sc12
-       bcc sc13
-       bcc sc14
-       bcc sc15
-
-sc0    sta specialflag ; code 0: set special flag
-sc10   equ *
-sc11   equ *
-sc12   equ *
-sc13   equ *
-sc14   equ *
-sc15   equ *
-       rts
-
-; special codes
-sc4    sta sndfilter,x
-       rts
-sc5    sta mainaudctl,x
-       rts
-sc6    sta addaudctl,x
-       rts
-sc7    sta shiftfilter,x
-       rts
-sc8    sta shiftfrq,x
-       rts
-sc9    sta shiftnote,x
-       rts
-
-sc1    and #$70
-       lsr @
-       lsr @
-       sta typ,x
-       and #$30
-       sne:sta typdat,x
-       lda bajt
-       bmi sc16
-       and #15
-       sta param,x
-       rts
-
-sc16   and #15
-       eor #$ff
-       add #1
-       sta param,x
-       rts
-
-sc2    and #$3f
-       sta dtyp,x
-       sta ltyp,x
-       rts
-
-sc3    and #$80
-       asl @
-       rol @
-       sta kolejn,x
-       lda bajt
-       and #$70
-       lsr @
-       lsr @
-       lsr @
-       lsr @
-       sta ilperm,x
-       sne:sta kolejn,x
-       lda bajt
-       and #15
-       sta dperm,x
-       sta lperm,x
-       lda aperm,x
-       cmp ilperm,x
-       bcc sc0
-       lda ilperm,x
-       seq:sbc #1 ; sec
-       sta aperm,x
-       rts
-
-; init of new song
-i3     sty addr
-       stx addr+1
-
-       ldy #25
-       mva (addr),y+ quadro
-       mva (addr),y+ pokeys
-       mva (addr),y+ pokeys+1
-       mva (addr),y+ pokeys+2
-       mva (addr),y+ pokeys+3
-       lda (addr),y
-       sta tempo
-
-       lda addr ; low byte of instruments data
-       eor #$80
-       smi:inx
-       sta zm8+1
-       stx zm8+2
-
-       eor #$80 ; low byte of pattern data
-       smi:inx
-       sta zm2+1
-       stx zm2+2
-
-       inx      ; high byte of pattern data
-       sta zm3+1
-       stx zm3+2
-
-       inx      ; high byte of instrument data
-       sta zm9+1
-       stx zm9+2
-
-       eor #$80 ; track data
-       smi:inx
-       sta adrsng
-       sta zm0+1
-       sta zm4+1
-       sta zm6+1
-       stx adrsng+1
-       stx zm1+1
-       stx zm5+1
-       stx zm7+1
-
-       mva #$f0 maxvol
-       lda #0
-       sta czygrc
-       sta specialflag
-
-; stop playing
-stop   ldx #7
-       lda #0
-       sta czygrc
-d9     sta czygrx,x
-       sta audctl,x
-       sta vol1ch,x
-
-       ift normal ; !!!
-
-       sta vol2ch,x
-       sta volume,x
-       sta $d230,x
-       sta $d220,x
-
-       eif ; !!!
-
-       sta $d210,x
-       sta $d200,x
-       dex
-       bpl d9
-       sta $d218
-       sta $d208
-
-       ift normal ; !!!
-
-       sta $d238
-       sta $d228
-       sta aud1
-       sta aud2
-
-       eif ; !!!
-       rts
-
-; procedures for play new instrument
-d1     sta vol1ch,x ; if attempt to play empty sound - clear data
-
-       ift normal ; !!!
-
-       sta vol2ch,x
-       sta volume,x
-
-       eif ; !!!
-
-       sta audctl,x
-       rts
-
-d0     tya ; change only volume
-       sta actvol,x
-d3     and #$f0
-       sta actvl1,x
-       lda actvol,x
-
-       ift normal ; !!!
-
-       asl @
-       asl @
-       asl @
-       asl @
-       sta actvl2,x
-
-       eif ; !!!
-
-       rts
-
-d2     and #7
-       sta addr
-       txa
-       ldx addr
-       and #$3f
-       beq d0
-       sta wysdzw,x
-       tya
-       bmi d2-1
-       lda actvol,x
-       jsr d3
-dzwiek mva #0 czygrx,x
-zm9    lda $ffff,y
-       beq d1
-       sta adrsnh,x
-       sta addr+1
-zm8    lda $ffff,y
-       sta adrsnl,x
-       sta addr
-       tya
-       sta numdzw,x
-
-       ldy #8
-       mva (addr),y+ sndlen,x
-       mva (addr),y+ sndlop,x
-       mva (addr),y+ sndfilter,x
-       mva (addr),y+ mainaudctl,x
-       mva (addr),y+ addaudctl,x
-       mva (addr),y+ opad1,x
-       sta lopad1,x
-       mva (addr),y+ opad2,x
-       sta lopad2,x
-       lda (addr),y
-       and #$70
-       lsr @
-       lsr @
-       sta typ,x
-
-       lda (addr),y+
-       bmi d7
-       and #15
-       sta param,x
-       jmp d8
-d7     and #15
-       eor #$ff
-       add #1
-       sta param,x
-
-d8     mva (addr),y+ czekaj,x
-       lda (addr),y+
-       and #$3f
-       sta dtyp,x
-       sta ltyp,x
-       lda (addr),y
-       and #$80
-       asl @
-       rol @
-       sta kolejn,x
-       lda (addr),y
-       and #$70
-       lsr @
-       lsr @
-       lsr @
-       lsr @
-       sta ilperm,x
-       bne d6
-       sta kolejn,x
-d6     lda (addr),y-
-       and #15
-       sta dperm,x
-       sta lperm,x
-       lda (addr),y
-       and #$c0
-       ora wysdzw,x
-       sta wysdzw,x
-       tay
-       lda frqtab,y
-       sta frq,x
-
-       lda #0
-       sta slupy,x
-       sta typdat,x
-       sta opadst,x
-       sta aperm,x
-       sta shiftfrq,x
-       sta shiftnote,x
-       sta shiftfilter,x
-       lda #1
-       sta czygrx,x
-       rts
-
-endplr end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/tm2.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/tm2.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/tmc.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/tmc.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/tmc.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/tmc.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,963 +0,0 @@
-*---------------*
-*  TMC  Player  *
-*Jaskier/Taquart*
-*---------------*
-
- org $0500
-
-byte equ $fa
-bajt equ $fb
-addr equ $fc
-adrsng equ $fe
-
-player equ *
- jmp init
- jmp play
- jmp sound
-
-maxvol dta b(15)
-volume dta d'        '
-freqen dta d'        '
-kanal  dta d'        '
-aktwys dta d'        '
-numdzw dta d'        '
-audctl dta d'        '
-aud1   dta b(0)
-aud2   dta b(0)
-
-voltab dta d'                '
- dta d'        !!!!!!!!'
- dta d'    !!!!!!!!""""'
- dta d'   !!!!!"""""###'
- dta d'  !!!!""""####$$'
- dta d'  !!!"""###$$$%%'
- dta d'  !!"""##$$$%%&&'
- dta d'  !!""##$$%%&&'''''
- dta d' !!""##$$%%&&''''('
- dta d' !!""#$$%%&''''(()'
- dta d' !!"##$%%&''''())*'
- dta d' !!"#$$%&''''()**+'
- dta d' !""#$%&&''()**+,'
- dta d' !"##$%&''()**+,-'
- dta d' !"#$%&''''()*+,-.'
- dta d' !"#$%&''()*+,-./'
-
-frqtab dta b(0),b($f1),b($e4),b($d7)
- dta b($cb),b($c0),b($b5),b($aa)
- dta b($a1),b($98),b($8f),b($87)
- dta b($7f),b($78),b($72),b($6b)
- dta b($65),b($5f),b($5a),b($55)
- dta b($50),b($4b),b($47),b($43)
- dta b($3f),b($3c),b($38),b($35)
- dta b($32),b($2f),b($2c),b($2a)
- dta b($27),b($25),b($23),b($21)
- dta b($1f),b($1d),b($1c),b($1a)
- dta b($18),b($17),b($16),b($14)
- dta b($13),b($12),b($11),b($10)
- dta b(15),b(14),b(13),b(12)
- dta b(11),b(10),b(9),b(8)
- dta b(7),b(6),b(5),b(4)
- dta b(3),b(2),b(1),b(0)
-
- dta b(0),b($f2),b($e6),b($da)
- dta b($ce),b($bf),b($b6),b($aa)
- dta b($a1),b($98),b($8f),b($89)
- dta b($80),b($7a),b($71),b($6b)
- dta b($65),b($5f),b($5c),b($56)
- dta b($50),b($4d),b($47),b($44)
- dta b($3e),b($3c),b($38),b($35)
- dta b($32),b($2f),b($2d),b($2a)
- dta b($28),b($25),b($23),b($21)
- dta b($1f),b($1d),b($1c),b($1a)
- dta b($18),b($17),b($16),b($14)
- dta b($13),b($12),b($11),b($10)
- dta b(15),b(14),b(13),b(12)
- dta b(11),b(10),b(9),b(8)
- dta b(7),b(6),b(5),b(4)
- dta b(3),b(2),b(1),b(0)
-
- dta b(0),b($ff),b($f1),b($e4)
- dta b($d8),b($ca),b($c0),b($b5)
- dta b($ab),b($a2),b($99),b($8e)
- dta b($87),b($7f),b($79),b($73)
- dta b($70),b($66),b($61),b($5a)
- dta b($55),b($52),b($4b),b($48)
- dta b($43),b($3f),b($3c),b($39)
- dta b($37),b($33),b($30),b($2d)
- dta b($2a),b($28),b($25),b($24)
- dta b($21),b($1f),b($1e),b($1c)
- dta b($1b),b($19),b($17),b($16)
- dta b($15),b($13),b($12),b($11)
- dta b($10),b(15),b(14),b(13)
- dta b(12),b(11),b(10),b(9)
- dta b(8),b(7),b(6),b(5)
- dta b(4),b(3),b(2),b(1)
-
- dta b(0),b($f3),b($e6),b($d9)
- dta b($cc),b($c1),b($b5),b($ad)
- dta b($a2),b($99),b($90),b($88)
- dta b($80),b($79),b($72),b($6c)
- dta b($66),b($60),b($5b),b($55)
- dta b($51),b($4c),b($48),b($44)
- dta b($40),b($3c),b($39),b($35)
- dta b($32),b($2f),b($2d),b($2a)
- dta b($28),b($25),b($23),b($21)
- dta b($1f),b($1d),b($1c),b($1a)
- dta b($18),b($17),b($16),b($14)
- dta b($13),b($12),b($11),b($10)
- dta b(15),b(14),b(13),b(12)
- dta b(11),b(10),b(9),b(8)
- dta b(7),b(6),b(5),b(4)
- dta b(3),b(2),b(1),b(0)
-
-basslo dta b(0),b($f2),b($33),b($96)
- dta b($e2),b($38),b($8c),b($00)
- dta b($6a),b($e8),b($6a),b($ef)
- dta b($80),b($08),b($ae),b($46)
- dta b($e6),b($95),b($41),b($f6)
- dta b($b0),b($6e),b($30),b($f6)
- dta b($bb),b($84),b($52),b($22)
- dta b($f4),b($c8),b($a0),b($7a)
- dta b($55),b($34),b($14),b($f5)
- dta b($d8),b($bd),b($a4),b($8d)
- dta b($77),b($60),b($4e),b($38)
- dta b($27),b($15),b($06),b($f7)
- dta b($e8),b($db),b($cf),b($c3)
- dta b($b8),b($ac),b($a2),b($9a)
- dta b($90),b($88),b($7f),b($78)
- dta b($70),b($6a),b($64),b($5e)
-
-basshi dta b(0),b(13),b(13),b(12)
- dta b(11),b(11),b(10),b(10)
- dta b(9),b(8),b(8),b(7)
- dta b(7),b(7),b(6),b(6)
- dta b(5),b(5),b(5),b(4)
- dta b(4),b(4),b(4),b(3)
- dta b(3),b(3),b(3),b(3)
- dta b(2),b(2),b(2),b(2)
- dta b(2),b(2),b(2),b(1)
- dta b(1),b(1),b(1),b(1)
- dta b(1),b(1),b(1),b(1)
- dta b(1),b(1),b(1),b(0)
- dta b(0),b(0),b(0),b(0)
- dta b(0),b(0),b(0),b(0)
- dta b(0),b(0),b(0),b(0)
- dta b(0),b(0),b(0),b(0)
-
-czygrx dta d'        '
-pozwpt dta d'        '
-delay  dta d'        '
-numptr dta d'        '
-poddzw dta d'        '
-wysdzw dta d'        '
-znksz  dta d'        '
-frq    dta d'        '
-vol1ch dta d'        '
-vol2ch dta d'        '
-adcvl1 dta d'        '
-adcvl2 dta d'        '
-adrsnl dta d'        '
-adrsnh dta d'        '
-slupy  dta d'        '
-opad1  dta d'        '
-opad2  dta d'        '
-lopad1 dta d'        '
-lopad2 dta d'        '
-typ    dta d'        '
-param  dta d'        '
-pomoc1 dta d'        '
-pomoc2 dta d'        '
-czekaj dta d'        '
-dtyp   dta d'        '
-ltyp   dta d'        '
-ilperm dta d'        '
-aperm  dta d'        '
-dperm  dta d'        '
-lperm  dta d'        '
-kolejn dta d'        '
-tempo  dta b(0)
-ltempo dta b(0)
-pozptr dta b(0)
-czygrc dta b(0)
-
-przeci dta b(4),b(5),b(6),b(7)
- dta b(0),b(1),b(2),b(3)
-audtb1 dta b(4),b(2),b(0),b(0)
- dta b(4),b(2),b(0),b(0)
-audtb2 dta b(0),b(16),b(0),b(8)
- dta b(0),b(16),b(0),b(8)
-
-play lda czygrc
- beq r1-3
- lda pozptr
- cmp #64
- bcc r1
- dec ltempo
- beq *+5
- jmp sound
-
- ldx #7
- lda #0
-p1 sta pozwpt,x
- sta delay,x
- dex
- bpl p1
- sta pozptr
- tax
- ldy #15
-p2 lda (adrsng),y
- bpl p3
- dey
- lda (adrsng),y
- bpl *+5
- jmp stop
- stx addr
- asl @
- asl @
- rol addr
- asl @
- rol addr
- asl @
- rol addr
-zm0 adc #0
- sta adrsng
- lda addr
-zm1 adc #0
- sta adrsng+1
- bcc p2-2
-p3 sta numptr,x
- dey
- lda (adrsng),y
- sta poddzw,x
- inx
- dey
- bpl p2
- clc
- lda adrsng
- adc #16
- sta adrsng
- bcc *+4
- inc adrsng+1
- jmp sound
-
-r1 dec ltempo
- bpl r1-3
- inc pozptr
- lda tempo
- sta ltempo
- ldx #7
-r2 dec delay,x
- bmi *+5
- jmp r14
- ldy numptr,x
-zm2 lda $ffff,y
- sta addr
-zm3 lda $ffff,y
- sta addr+1
- ldy pozwpt,x
-r3 lda (addr),y
- bne r4
- jsr nparam
- jmp r13
-r4 cmp #$40
- bcs r5
- adc poddzw,x
- sta wysdzw,x
- jsr nparam
- ldy numdzw,x
- jsr dzwiek
- jmp r13
-r5 bne r8
- iny
- inc pozwpt,x
- lda (addr),y
- bpl r6
- sta bajt
- jsr nparam
- lda bajt
-r6 and #$7f
- bne r7
- lda #64
- sta pozptr
- bne r13
-r7 sta tempo
- sta ltempo
- bne r13
-r8 cmp #$80
- bcs r11
- and #$3f
- adc poddzw,x
- sta wysdzw,x
- iny
- inc pozwpt,x
- lda (addr),y
- and #127
- bne r9
- lda #64
- sta pozptr
- bne r10
-r9 sta tempo
- sta ltempo
-r10 jsr nparam
- ldy numdzw,x
- jsr dzwiek
- jmp r13
-r11 cmp #$c0
- bcs r12
- and #$3f
- sta numdzw,x
- iny
- inc pozwpt,x
- jmp r3
-r12 and #$3f
- sta delay,x
-r13 inc pozwpt,x
-r14 dex
- bmi sound
- jmp r2
-
-sound ldx #7
-p5 lda czygrx,x
- beq p6
- jsr graj
- lda audctl,x
- and audtb1,x
- beq p6
- ldy #71
- lda (addr),y
- clc
- adc aktwys,x
- sta aktwys+2,x
- tay
- lda frqtab,y
- sec
- adc pomoc1,x
- sta frq+2,x
-p6 dex
- bpl p5
-
- asl maxvol
- asl maxvol
- asl maxvol
- asl maxvol
- inx
- stx addr
- stx addr+1
- ldx #7
-p9 txa
- tay
- lda vol1ch,y
- bne p10
- ldy przeci,x
- lda vol2ch,y
- bne p10
- txa
- tay
- lda #0
-p10 sta byte
- tya
- sta kanal,x
- lda frq,y
- sta freqen,x
- lda audctl,y
- sta bajt
- ora addr+1
- sta addr+1
- lda bajt
- and audtb1,x
- beq p11
- lda frq+2,y
- sta freqen+2,x
-p11 lda bajt
- and audtb2,x
- beq p12
- lda aktwys,y
- and #$3f
- tay
- iny
- sty addr
- lda basshi-1,y
- sta freqen,x
- jmp p13
-p12 ldy addr
- beq p13
- lda basslo-1,y
- sta freqen,x
- lda #0
- sta addr
-p13 lda byte
- ora maxvol
- tay
- lda voltab,y
- ldy kanal,x
- ora znksz,y
- sta volume,x
- cpx #4
- bne p14
- lda addr+1
- sta aud2
- lda #0
- sta addr+1
-p14 dex
- bpl p9
- lsr maxvol
- lsr maxvol
- lsr maxvol
- lsr maxvol
- lda addr+1
-quit ldx #3
- stx $d21f
- stx $d20f
- ldx freqen+4
- ldy freqen
- stx $d210
- sty $d200
- ldx volume+4
- ldy volume
- stx $d211
- sty $d201
- ldx freqen+5
- ldy freqen+1
- stx $d212
- sty $d202
- ldx volume+5
- ldy volume+1
- stx $d213
- sty $d203
- ldx freqen+6
- ldy freqen+2
- stx $d214
- sty $d204
- ldx volume+6
- ldy volume+2
- stx $d215
- sty $d205
- ldx freqen+7
- ldy freqen+3
- stx $d216
- sty $d206
- ldx volume+7
- ldy volume+3
- stx $d217
- sty $d207
- sta aud1
- ldx aud2
- stx $d218
- sta $d208
- rts
-
-graj lda adrsnl,x
- sta addr
- lda adrsnh,x
- sta addr+1
- ldy slupy,x
- cpy #63
- beq n6
- inc slupy,x
- inc slupy,x
- inc slupy,x
- lda (addr),y
- and #$f0
- sta znksz,x
- lda (addr),y
- and #15
- sec
- sbc adcvl1,x
- bpl n1
- lda #0
-n1 sta vol1ch,x
- iny
- lda (addr),y
- and #15
- sec
- sbc adcvl2,x
- bpl n2
- lda #0
-n2 sta vol2ch,x
- lda (addr),y
- and #$f0
- beq n8
- bpl n3
- ldy #73
- lda (addr),y
- ldy slupy,x
- dey
- dey
- bpl n4
-n3 lda #0
-n4 sta audctl,x
- lda (addr),y
- and #$70
- beq n9
- lsr @
- lsr @
- sta n5+1
- lda #0
- sta pomoc1,x
- iny
- lda (addr),y
-n5 bcc *
- nop
- nop
- nop
- nop
- jmp a1
- nop
- jmp a2
- nop
- jmp a3
- nop
- jmp a4
- nop
- jmp a5
- nop
- jmp a6
- nop
- jmp a7
-n6 lda opad1,x
- beq n7
- dec lopad1,x
- bne n7
- sta lopad1,x
- lda vol1ch,x
- and #15
- beq n7
- dec vol1ch,x
-n7 lda opad2,x
- beq n8
- dec lopad2,x
- bne n8
- sta lopad2,x
- lda vol2ch,x
- and #15
- beq n8
- dec vol2ch,x
-n8 ldy #72
- lda (addr),y
- sta audctl,x
-n9 lda aperm,x
- clc
- adc #63
- tay
- lda (addr),y
- adc wysdzw,x
- sta aktwys,x
- tay
- lda frqtab,y
- sta frq,x
- dec lperm,x
- bpl m1
- lda dperm,x
- sta lperm,x
- lda kolejn,x
- beq m6
- clc
- adc aperm,x
- sta aperm,x
- beq m7
- cmp ilperm,x
- bne m1
- lda #$fe
-m7 clc
- adc #1
- sta kolejn,x
- bne m1
-m6 inc aperm,x
- lda ilperm,x
- cmp aperm,x
- bcs m1
- lda #0
- sta aperm,x
-m1 lda czekaj,x
- beq m2
- dec czekaj,x
- rts
-m2 lda pomoc2,x
- sta byte
- lda param,x
- sta bajt
- jsr m4
- dec ltyp,x
- bpl m4-1
- lda byte
- sta pomoc2,x
- lda bajt
- sta param,x
- lda dtyp,x
- sta ltyp,x
- rts
-m4 lda typ,x
- sta m5+1
-m5 bpl *
- jmp typ0
- nop
- jmp typ1
- nop
- jmp typ2
- nop
- jmp typ3
- nop
- jmp typ4
- nop
- jmp typ5
- nop
- jmp typ6
- nop
- jmp typ7
-
-typ1 lda byte
- inc byte
- and #3
- lsr @
- bcc t2
- bne typ6
- lda bajt
-t1 sta pomoc1,x
- clc
- adc frq,x
- sta frq,x
-typ0 rts
-t2 lda #0
- sta pomoc1,x
- rts
-typ2 jsr t5
- jmp t1
-typ3 jsr t5
- clc
- adc aktwys,x
- jmp a5
-typ4 lda byte
- sta pomoc1,x
- clc
- adc frq,x
-t3 sta frq,x
- lda byte
- clc
- adc bajt
- sta byte
- rts
-typ5 lda aktwys,x
- sec
- sbc byte
- sta aktwys,x
- tay
- lda frqtab,y
- jmp t3
-typ6 lda frq,x
- sec
- sbc bajt
- sta frq,x
- sec
- lda #0
- sbc bajt
- sta pomoc1,x
- rts
-typ7 lda ltyp,x
- bne typ0
- lda bajt
- bpl t4
- lda vol2ch,x
- beq typ0
- lda vol1ch,x
- cmp #15
- beq typ0
- inc vol1ch,x
- rts
-t4 lda vol1ch,x
- beq typ0
- lda vol2ch,x
- cmp #15
- beq typ0
- inc vol2ch,x
- rts
-t5 ldy byte
- lda bajt
- bmi t6
- iny
- iny
-t6 dey
- tya
- sta byte
- cmp bajt
- bne t7
- lda bajt
- eor #$ff
- sta bajt
-t7 tya
- rts
-
-a2 adc frq,x
-a1 sta frq,x
- rts
-a3 ldy wysdzw,x
- adc frqtab,y
- sta frq,x
- tya
- sta aktwys,x
- rts
-a4 and $d20a
- sta frq,x
- rts
-a7 adc wysdzw,x
-a5 sta aktwys,x
- tay
- lda frqtab,y
- sta frq,x
- rts
-a6 sta aktwys,x
- tay
- lda frq,x
- adc frqtab,y
- sta frq,x
- rts
-
-nparam iny
- inc pozwpt,x
- lda (addr),y
- lsr @
- lsr @
- lsr @
- lsr @
- sta adcvl1,x
- lda (addr),y
- and #15
- sta adcvl2,x
- rts
-
-songx jsr stop
- ldy #15
-zm4 lda #0
- sta adrsng
-zm5 lda #0
- sta adrsng+1
-d5 txa
- beq inic
-d3 lda (adrsng),y
- bpl d4
- dex
-d4 clc
- lda adrsng
- adc #16
- sta adrsng
- bcc d5
- inc adrsng+1
- bcs d5
-
-playx jsr stop
- lda #0
- sta addr
- txa
- asl @
- asl @
- rol addr
- asl @
- rol addr
- asl @
- rol addr
-zm6 adc #0
- sta adrsng
- lda addr
-zm7 adc #0
- sta adrsng+1
-inic lda #64
- sta pozptr
- lda #1
- sta ltempo
- sta czygrc
- rts
-
-init cmp #$10
- bcc songx
- cmp #$20
- bcc playx
- cmp #$30
- bcs *+5
- jmp d2
- cmp #$40
- bcs i1
- txa
- and #15
- beq i1-1
- sta tempo
- rts
-i1 cmp #$50
- bcc stop
- cmp #$60
- bcs i2
- lda #0
-i3 sta czygrc
- rts
-i2 cmp #$70
- bcc i3
-
- lda #1
- sta ltempo
- lda #64
- sta pozptr
- sty addr
- stx addr+1
- ldy #30
- lda (addr),y
- sta tempo
- lda addr
- clc
- adc #32
- sta zm8+1
- bcc *+3
- inx
- stx zm8+2
- clc
- adc #$40
- sta zm9+1
- bcc *+3
- inx
- stx zm9+2
- clc
- adc #$40
- sta zm2+1
- bcc *+3
- inx
- stx zm2+2
- clc
- adc #$80
- sta zm3+1
- bcc *+3
- inx
- stx zm3+2
- clc
- adc #$80
- sta adrsng
- sta zm0+1
- sta zm4+1
- sta zm6+1
- bcc *+3
- inx
- stx adrsng+1
- stx zm1+1
- stx zm5+1
- stx zm7+1
-
-stop ldy #7
- lda #0
- sta czygrc
-d9 sta $d200,y
- sta $d210,y
- sta volume,y
- sta vol1ch,y
- sta vol2ch,y
- sta audctl,y
- sta czygrx,y
- dey
- bpl d9
- sta $d208
- sta $d218
- sta aud1
- sta aud2
- rts
-
-d1 sta vol1ch,x
- sta vol2ch,x
- sta audctl,x
- lda wysdzw,x
- sta aktwys,x
- rts
-d0 tya
- eor #$f0
- lsr @
- lsr @
- lsr @
- lsr @
- sta adcvl1,x
- tya
- and #15
- eor #15
- sta adcvl2,x
- rts
-d2 and #7
- sta addr
- txa
- ldx addr
- and #$3f
- beq d0
- sta wysdzw,x
-dzwiek lda #0
- sta czygrx,x
-zm8 lda $ffff,y
- sta adrsnl,x
- sta addr
-zm9 lda $ffff,y
- sta adrsnh,x
- sta addr+1
- ora addr
- beq d1
- ldy #74
- lda (addr),y
- sta opad1,x
- sta lopad1,x
- iny
- lda (addr),y
- sta opad2,x
- sta lopad2,x
- iny
- lda (addr),y
- and #$70
- lsr @
- lsr @
- sta typ,x
- lda (addr),y
- and #15
- sta param,x
- lda (addr),y
- bpl d7
- lda param,x
- eor #$ff
- clc
- adc #1
- sta param,x
-d7 iny
- lda (addr),y
- sta czekaj,x
- iny
- lda (addr),y
- and #$3f
- sta dtyp,x
- sta ltyp,x
- iny
- lda (addr),y
- and #$80
- beq d8
- lda #1
-d8 sta kolejn,x
- lda (addr),y
- and #$70
- lsr @
- lsr @
- lsr @
- lsr @
- sta ilperm,x
- bne d6
- sta kolejn,x
-d6 lda (addr),y
- and #15
- sta dperm,x
- sta lperm,x
- dey
- lda (addr),y
- and #$c0
- clc
- adc wysdzw,x
- sta wysdzw,x
- sta aktwys,x
- tay
- lda frqtab,y
- sta frq,x
- lda #0
- sta slupy,x
- sta pomoc1,x
- sta pomoc2,x
- sta aperm,x
- lda #1
- sta czygrx,x
- rts
-
-endplr end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/tmc.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/tmc.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexb.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexb.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexb.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexb.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-HIDE_AUTHOR	equ	0
-	ift	HIDE_AUTHOR
-countdown	equ	$fca7
-	els
-countdown	equ	$fc98
-	eif
-
-	org	$124
-main
-	sei
-	mvy	#0	^4e
-	lda:rne	^4b
-	sta	^40
-	ldx	#29
-	sta:rpl	^00,x-
-	ert	*!=$13a
-	ldx	#8
-init_pokey_1
-	sta	$d210,x
-	sta	$d200,x
-	dex:bpl	init_pokey_1
-	lda	#3
-	sta	$d21f
-	sta	$d200
-
-; check PAL vs NTSC ANTIC
-; possible NTSC GTIA with PAL ANTIC
-	lda	#130
-	cmp:rne	^4b
-:3	sta	^4a
-	lda	^4b
-	sne:inc	ntsc
-
-	lda	song
-	jsr	init
-
-; TODO: support 400/800/600XL
-	mva	#$fe	^31
-	lda	<nmi
-	ldx	$135
-	seq:lda	<nmi_info
-	sta	$fffa
-	mva	>nmi	$fffb
-	mva	#$40	^4e
-
-	lda	#125
-
-player_loop
-	cmp:rne	^4b
-	jsr	player
-	ldx	#0
-ntsc	equ	*-1
-	lda	fastplay_low_bit
-	lsr	@
-	bcc	fastplay_is_even
-	lda	#0
-calls	equ	*-1
-	inc	calls
-	lsr	@
-fastplay_is_even
-	lda	vcount_period,x
-	adc	#125
-expected_vcount	equ	*-1
-	bcs	next_frame
-	cmp	vcount_wrap,x
-	bcc	same_frame
-next_frame
-	sbc	vcount_wrap,x
-	sec
-same_frame
-	sta	expected_vcount
-	lda	frame_period,x
-	adc	#0
-expected_frame	equ	*-1
-	sta	expected_frame
-	cmp	#0
-frame	equ	*-1
-	rne
-	lda	expected_vcount
-	bcs	player_loop	!
-
-nmi_info
-	pha
-	txa:pha
-	ldx	ntsc
-	jsr	countdown
-	pla:tax
-	pla
-nmi
-	inc	frame
-	rti
-
-vcount_wrap	dta	156,131
-init	dta	{jmp 0}
-	opt	o-
-	dta	a(0)
-player	jmp	0
-song	dta	0
-fastplay_low_bit	dta	0
-vcount_period	dta	0,0
-frame_period	dta	0,0
-
-	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexb.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexb.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexd.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexd.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexd.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexd.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-HIDE_AUTHOR	equ	0
-	ift	HIDE_AUTHOR
-countdown	equ	$fca7
-	els
-countdown	equ	$fc98
-	eif
-
-	org	$124
-main
-	sei
-	mvy	#0	^4e
-	lda:rne	^4b
-	sta	^40
-	ldx	#29
-	sta:rpl	^00,x-
-	ert	*!=$13a
-	sta	^2e
-	ldx	#8
-init_pokey_1
-	sta	$d210,x
-	sta	$d200,x
-	dex:bpl	init_pokey_1
-	lda	#3
-	sta	$d21f
-	sta	$d200
-
-; TODO: support 400/800/600XL
-	mva	#$fe	^31
-	lda	player
-	cmp	#{rts}
-	beq	no_player
-	mwa	#nmi	$fffa
-	mva	#$40	^4e
-no_player
-	lda	song
-	cli
-	jmp	init
-
-nmi
-	plp:php	; unblock IRQ if NMI blocked it
-	pha
-	txa:pha
-	tya:pha
-	jsr	player
-	ldx	$135
-	beq	no_info
-	ldx	$d014
-	dex
-	seq:ldx	#1
-	jsr	countdown
-no_info
-	pla:tay
-	pla:tax
-	pla:rti
-
-init	dta	{jmp 0}
-	opt	o-
-	dta	a(0)
-player	jmp	0
-song	dta	0
-
-	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexd.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexd.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexinfo.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexinfo.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexinfo.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexinfo.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-HIDE_AUTHOR	equ	0
-
-font	equ	$fc00
-
-	ift	TEST
-
-	org	$8000
-scr
-	dta	c'404 Error                       '
-:8	dta	$55
-	ift	HIDE_AUTHOR
-hidden
-	dta	c'(press space to show author)    '
-	dta	c'                                '
-author
-	eif
-	dta	c'by Grzegorz Kwiatek (Greg)      '
-	dta	c' & Lukasz Sychowicz (X-Ray)     '
-date
-	dta	c'01/03/2003          STEREO 02:26'
-
-dl
-:22	dta	$70
-	dta	$30,$62,a(scr),8,0
-	ift	HIDE_AUTHOR
-	dta	$42
-dl_author
-	dta	a(hidden),2,$10,$42,a(date)
-	dta	$41,a(dl)
-show_author
-	mwa	#author	dl_author
-	els
-	dta	2,2,$10,2
-	dta	$41,a(dl)
-	eif
-
-	els
-
-	org	$fc50
-	ift	HIDE_AUTHOR
-dl	org	*+39
-
-show_author
-	org	*+10
-	rts
-
-	els
-dl	org	*+32
-	dta	$41,a(dl)
-	eif
-
-	eif
-
-show_info
-	lda:rne	^4b
-	sta	^45
-	mvx	#$26	^16
-	mvx	#$0a	^17
-	mvx	#$21	^40
-	mwx	#dl	^42
-:>font!=>dl	ldx	>font
-	stx	^49
-
-	ift	TEST
-
-	mwa	#vbl	$fffa
-	mva	#$40	^4e
-	jmp	*
-	
-vbl
-	pha
-	txa:pha
-	ldx	$d014
-	dex
-	seq:ldx	#1
-	jsr	countdown
-	pla:tax
-	pla:rti
-
-	els
-
-	rts
-
-	eif
-
-countdown
-	ift	HIDE_AUTHOR
-	lda	#4
-	bit	$d20f
-	bne	no_author
-	lda	$d209
-	cmp	#$21
-	bne	no_author
-	jsr	show_author
-no_author
-	eif
-
-	cld
-	lda	countdown_framerate_lo,x
-	add	#0
-	sta	*-1
-	lda	countdown_framerate_hi,x
-	adc	#0
-	sta	*-1
-	bcc	countdown_skip
-	lda	dl-5
-	ora	dl-4
-	ora	dl-2
-	ora	dl-1
-	cmp	#'1'
-	ldx	#4
-	bcs	countdown_start
-countdown_skip
-	rts
-
-countdown_wrap
-	lda	#'9'
-	cpx	#3
-	sne:lda	#'5'
-	sta	dl-5,x
-countdown_next
-	dex
-countdown_start
-	lda	dl-5,x
-	cmp	#'1'
-	bcc	countdown_wrap
-	cmp	#':'
-	beq	countdown_next
-
-	dec	dl-5,x
-	rts
-
-countdown_framerate_lo	dta	l(312*114/2*65536/[1773447/2],262*114*65536/1789772)
-countdown_framerate_hi	dta	h(312*114/2*65536/[1773447/2],262*114*65536/1789772)
-
-	org	$100
-main
-	sei
-	mvy	#0	^4e
-	lda:rne	^4b
-	sta	^40
-	ldx	#29
-	sta:rpl	^00,x-
-; copy font from ROM, reordering from ANTIC codes to ASCII, semigraphics not needed
-copy_font_1
-	stx	^31	; #$ff
-	lda:pha	$e000,y	; punctuation
-	lda:pha	$e100,y	; uppercase
-	lda	$e300,y	; lowercase
-	dex:stx	^31
-	inx
-	sta	font+$300,y	; lowercase
-	pla:sta	font+$200,y	; uppercase
-	pla:sta	font+$100,y	; punctuation
-	iny
-	bne	copy_font_1
-	jsr	show_info
-	ert	*!=$13a
-
-	ift	TEST
-	jmp	*
-	run	main
-	eif
-
-	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/6502/xexinfo.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/6502/xexinfo.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/aatr.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/aatr.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/aatr.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/aatr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-/*
- * aatr.c - another ATR file extractor
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "aatr.h"
-
-struct AATR
-{
-	FILE *fp;
-	int bytes_per_sector;
-	int sector4_offset;
-	int file_no;
-	unsigned char dir_sector[128];
-	char filename[8 + 1 + 3 + 1];
-};
-
-AATR *AATR_New(void)
-{
-	AATR *self = (AATR *) malloc(sizeof(AATR));
-	self->fp = NULL;
-	return self;
-}
-
-void AATR_Delete(AATR *self)
-{
-	if (self->fp != NULL)
-		fclose(self->fp);
-	free(self);
-}
-
-static int fgetw(FILE *fp)
-{
-	int lo = fgetc(fp);
-	int hi;
-	if (lo < 0)
-		return -1;
-	hi = fgetc(fp);
-	if (hi < 0)
-		return -1;
-	return lo + (hi << 8);
-}
-
-cibool AATR_Open(AATR *self, const char *filename)
-{
-	FILE *fp;
-	int paragraphs;
-	fp = fopen(filename, "rb");
-	if (fp == NULL)
-		return FALSE;
-	if (fgetw(fp) != 0x296) {
-		fclose(fp);
-		return FALSE;
-	}
-	paragraphs = fgetw(fp);
-	if ((paragraphs & 7) != 0) {
-		fclose(fp);
-		return FALSE;
-	}
-	self->bytes_per_sector = fgetw(fp);
-	self->sector4_offset = 0x190;
-	switch (self->bytes_per_sector) {
-	case 0x80:
-		break;
-	case 0x100:
-		if ((paragraphs & 8) == 0)
-			self->sector4_offset = 0x310;
-		break;
-	default:
-		fclose(fp);
-		return FALSE;
-	}
-	self->fp = fp;
-	self->file_no = -1;
-	return TRUE;
-}
-
-static cibool AATR_ReadSector(AATR *self, int sector, unsigned char buffer[], int length)
-{
-	if (sector < 4)
-		return FALSE;
-	if (fseek(self->fp, self->sector4_offset + (sector - 4) * self->bytes_per_sector, SEEK_SET) != 0)
-		return FALSE;
-	return fread(buffer, length, 1, self->fp) == 1;
-}
-
-static int filename_part_chars(const char *p, int max)
-{
-	int i;
-	for (i = 0; i < max; i++) {
-		char c = p[i];
-		if (c == ' ') {
-			int result = i;
-			/* make sure no spaces in filename */
-			while (++i < max) {
-				if (p[i] != ' ')
-					return -1;
-			}
-			return result;
-		}
-		if ((c >= '0' && c <= '9')
-		 || (c >= 'A' && c <= 'Z')
-		 || c == '_')
-			continue;
-		return -1;
-	}
-	return max;
-}
-
-const char *AATR_NextFile(AATR *self)
-{
-	int i;
-	int filename_chars;
-	int ext_chars;
-	for (;;) {
-		const char *filename;
-		if (self->file_no >= 63)
-			break;
-		self->file_no++;
-		i = (self->file_no & 7) << 4;
-		if (i == 0) {
-			if (!AATR_ReadSector(self, 361 + (self->file_no >> 3), self->dir_sector, 128))
-				break;
-		}
-		switch (self->dir_sector[i] & 0xd7) { /* mask out readonly and unused bits */
-		case 0x00: /* end of directory */
-			break;
-		case 0x42: /* DOS 2 file */
-		case 0x46: /* MyDOS file */
-		case 0x03: /* DOS 2.5 file */
-			break;
-		default:
-			continue;
-		}
-		filename = (const char *) self->dir_sector + i + 5;
-		filename_chars = filename_part_chars(filename, 8);
-		ext_chars = filename_part_chars(filename + 8, 3);
-		if (filename_chars < 0 || ext_chars < 0 || (filename_chars == 0 && ext_chars == 0))
-			continue;
-		sprintf(self->filename, "%.*s.%.*s", filename_chars, filename, ext_chars, filename + 8);
-		return self->filename;
-	}
-	fclose(self->fp);
-	self->fp = NULL;
-	return NULL;
-}
-
-int AATR_ReadCurrentFile(AATR *self, unsigned char output[], int length)
-{
-	int result = 0;
-	int i = (self->file_no & 7) << 4;
-	int sector = self->dir_sector[i + 3] + (self->dir_sector[i + 4] << 8);
-	while (sector != 0 && length > 0) {
-		unsigned char sector_data[256];
-		int sector_used;
-		if (!AATR_ReadSector(self, sector, sector_data, self->bytes_per_sector))
-			return -1;
-		sector_used = sector_data[self->bytes_per_sector - 1];
-		if (sector_used > length)
-			sector_used = length;
-		if (output != NULL)
-			memcpy(output + result, sector_data, sector_used);
-		result += sector_used;
-		length -= sector_used;
-		sector = (sector_data[self->bytes_per_sector - 2] + (sector_data[self->bytes_per_sector - 3] << 8)) & 0x3ff;
-	}
-	return result;
-}
-
-int AATR_ReadFile(const char *atr_filename, const char *inside_filename, unsigned char output[], int length)
-{
-	AATR aatr;
-	if (!AATR_Open(&aatr, atr_filename))
-		return -1;
-	for (;;) {
-		const char *current_filename = AATR_NextFile(&aatr);
-		if (current_filename == NULL)
-			return -1;
-		if (strcmp(current_filename, inside_filename) == 0) {
-			length = AATR_ReadCurrentFile(&aatr, output, length);
-			fclose(aatr.fp);
-			return length;
-		}
-	}
-}
-
-#if 0
-int main(int argc, char **argv)
-{
-	AATR aatr;
-	if (!AATR_Open(&aatr, "C:\\0\\a8\\asap\\TMC2.atr"))
-		return 1;
-	for (;;) {
-		const char *current_filename = AATR_NextFile(&aatr);
-		unsigned char buffer[30000];
-		int length;
-		if (current_filename == NULL)
-			break;
-		length = AATR_ReadCurrentFile(&aatr, buffer, sizeof(buffer));
-		printf("%s (%d)\n", current_filename, length);
-	}
-	return 0;
-}
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/aatr.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/aatr.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/aatr.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/aatr.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * aatr.h - another ATR file extractor
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef _AATR_H_
-#define _AATR_H_
-#ifndef _ASAP_H_ /* FIXME */
-typedef int cibool;
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct AATR AATR;
-
-AATR *AATR_New(void);
-void AATR_Delete(AATR *self);
-cibool AATR_Open(AATR *self, const char *filename);
-const char *AATR_NextFile(AATR *self);
-int AATR_ReadCurrentFile(AATR *self, unsigned char output[], int length);
-int AATR_ReadFile(const char *atr_filename, const char *inside_filename, unsigned char output[], int length);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap6502.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap6502.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap6502.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap6502.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// asap6502.ci - player routines for the 6502 CPU
-//
-// Copyright (C) 2011  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-class ASAP6502
-{
-	static byte[] GetPlayerRoutine(ASAPInfo info)
-	{
-		switch (info.Type) {
-		case ASAPModuleType.Cmc: return BinaryResource("cmc.obx");
-		case ASAPModuleType.Cm3: return BinaryResource("cm3.obx");
-		case ASAPModuleType.Cmr: return BinaryResource("cmr.obx");
-		case ASAPModuleType.Cms: return BinaryResource("cms.obx");
-		case ASAPModuleType.Dlt: return BinaryResource("dlt.obx");
-		case ASAPModuleType.Mpt: return BinaryResource("mpt.obx");
-		case ASAPModuleType.Rmt: return info.Channels == 1 ? BinaryResource("rmt4.obx") : BinaryResource("rmt8.obx");
-		case ASAPModuleType.Tmc: return BinaryResource("tmc.obx");
-		case ASAPModuleType.Tm2: return BinaryResource("tm2.obx");
-		case ASAPModuleType.Fc:  return BinaryResource("fc.obx");
-		default: return null;
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9159 +0,0 @@
-/* Generated automatically with "cito". Do not edit. */
-#include <stdlib.h>
-#include <string.h>
-#include "asap.h"
-
-typedef enum {
-	ASAPModuleType_SAP_B,
-	ASAPModuleType_SAP_C,
-	ASAPModuleType_SAP_D,
-	ASAPModuleType_SAP_S,
-	ASAPModuleType_CMC,
-	ASAPModuleType_CM3,
-	ASAPModuleType_CMR,
-	ASAPModuleType_CMS,
-	ASAPModuleType_DLT,
-	ASAPModuleType_MPT,
-	ASAPModuleType_RMT,
-	ASAPModuleType_TMC,
-	ASAPModuleType_TM2,
-	ASAPModuleType_FC
-}
-ASAPModuleType;
-typedef struct Cpu6502 Cpu6502;
-typedef struct FlashPack FlashPack;
-typedef struct FlashPackItem FlashPackItem;
-
-typedef enum {
-	FlashPackItemType_LITERAL,
-	FlashPackItemType_COPY_TWO_BYTES,
-	FlashPackItemType_COPY_THREE_BYTES,
-	FlashPackItemType_COPY_MANY_BYTES,
-	FlashPackItemType_SET_ADDRESS,
-	FlashPackItemType_END_OF_STREAM
-}
-FlashPackItemType;
-
-typedef enum {
-	FlashPackLoadState_START_LOW_BYTE,
-	FlashPackLoadState_START_HIGH_BYTE,
-	FlashPackLoadState_END_LOW_BYTE,
-	FlashPackLoadState_END_HIGH_BYTE,
-	FlashPackLoadState_CONTENT
-}
-FlashPackLoadState;
-
-typedef enum {
-	NmiStatus_RESET,
-	NmiStatus_ON_V_BLANK,
-	NmiStatus_WAS_V_BLANK
-}
-NmiStatus;
-typedef struct Pokey Pokey;
-typedef struct PokeyPair PokeyPair;
-
-struct Cpu6502 {
-	int a;
-	int c;
-	int nz;
-	int pc;
-	int s;
-	int vdi;
-	int x;
-	int y;
-};
-static void Cpu6502_DoFrame(Cpu6502 *self, ASAP *asap, int cycleLimit);
-
-struct ASAPInfo {
-	int channels;
-	int covoxAddr;
-	int defaultSong;
-	int fastplay;
-	int headerLen;
-	int init;
-	int music;
-	cibool ntsc;
-	int player;
-	int songs;
-	ASAPModuleType type;
-	unsigned char songPos[32];
-	char author[128];
-	char date[128];
-	int durations[32];
-	char filename[128];
-	cibool loops[32];
-	char title[128];
-};
-static void ASAPInfo_AddSong(ASAPInfo *self, int playerCalls);
-static int ASAPInfo_AfterFF(unsigned char const *module, int moduleLen, int currentOffset);
-static int ASAPInfo_CheckDate(ASAPInfo const *self);
-static cibool ASAPInfo_CheckTwoDateDigits(ASAPInfo const *self, int i);
-static cibool ASAPInfo_CheckValidChar(int c);
-static cibool ASAPInfo_CheckValidText(const char *s);
-static int ASAPInfo_GetPackedExt(const char *filename);
-static int ASAPInfo_GetRmtInstrumentFrames(unsigned char const *module, int instrument, int volume, int volumeFrame, cibool onExtraPokey);
-static int ASAPInfo_GetRmtSapOffset(ASAPInfo const *self, unsigned char const *module, int moduleLen);
-static int ASAPInfo_GetTwoDateDigits(ASAPInfo const *self, int i);
-static int ASAPInfo_GetWord(unsigned char const *array, int i);
-static int ASAPInfo_GuessPackedExt(unsigned char const *module, int moduleLen);
-static cibool ASAPInfo_HasStringAt(unsigned char const *module, int moduleIndex, const char *s);
-static cibool ASAPInfo_IsDltPatternEnd(unsigned char const *module, int pos, int i);
-static cibool ASAPInfo_IsDltTrackEmpty(unsigned char const *module, int pos);
-static cibool ASAPInfo_IsFcSongEnd(unsigned char const *module, int const *trackPos);
-static cibool ASAPInfo_IsOurPackedExt(int ext);
-static cibool ASAPInfo_IsValidChar(int c);
-static cibool ASAPInfo_ParseCmc(ASAPInfo *self, unsigned char const *module, int moduleLen, ASAPModuleType type);
-static void ASAPInfo_ParseCmcSong(ASAPInfo *self, unsigned char const *module, int pos);
-static int ASAPInfo_ParseDec(unsigned char const *module, int moduleIndex, int maxVal);
-static cibool ASAPInfo_ParseDlt(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static void ASAPInfo_ParseDltSong(ASAPInfo *self, unsigned char const *module, cibool *seen, int pos);
-static cibool ASAPInfo_ParseFc(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static int ASAPInfo_ParseHex(unsigned char const *module, int moduleIndex);
-static cibool ASAPInfo_ParseModule(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static cibool ASAPInfo_ParseMpt(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static void ASAPInfo_ParseMptSong(ASAPInfo *self, unsigned char const *module, cibool *globalSeen, int songLen, int pos);
-static cibool ASAPInfo_ParseRmt(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static void ASAPInfo_ParseRmtSong(ASAPInfo *self, unsigned char const *module, cibool *globalSeen, int songLen, int posShift, int pos);
-static cibool ASAPInfo_ParseSap(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static int ASAPInfo_ParseText(unsigned char const *module, int moduleIndex);
-static cibool ASAPInfo_ParseTm2(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static void ASAPInfo_ParseTm2Song(ASAPInfo *self, unsigned char const *module, int pos);
-static cibool ASAPInfo_ParseTmc(ASAPInfo *self, unsigned char const *module, int moduleLen);
-static void ASAPInfo_ParseTmcSong(ASAPInfo *self, unsigned char const *module, int pos);
-static int ASAPInfo_ParseTmcTitle(unsigned char *title, int titleLen, unsigned char const *module, int moduleOffset);
-static cibool ASAPInfo_ValidateFc(unsigned char const *module, int moduleLen);
-static cibool ASAPInfo_ValidateRmt(unsigned char const *module, int moduleLen);
-static cibool ASAPInfo_ValidateSap(unsigned char const *module, int moduleLen);
-
-struct Pokey {
-	int audc1;
-	int audc2;
-	int audc3;
-	int audc4;
-	int audctl;
-	int audf1;
-	int audf2;
-	int audf3;
-	int audf4;
-	int delta1;
-	int delta2;
-	int delta3;
-	int delta4;
-	int divCycles;
-	cibool init;
-	int mute1;
-	int mute2;
-	int mute3;
-	int mute4;
-	int out1;
-	int out2;
-	int out3;
-	int out4;
-	int periodCycles1;
-	int periodCycles2;
-	int periodCycles3;
-	int periodCycles4;
-	int polyIndex;
-	int reloadCycles1;
-	int reloadCycles3;
-	int skctl;
-	int tickCycle1;
-	int tickCycle2;
-	int tickCycle3;
-	int tickCycle4;
-	int deltaBuffer[888];
-};
-static void Pokey_AddDelta(Pokey *self, PokeyPair const *pokeys, int cycle, int delta);
-static void Pokey_EndFrame(Pokey *self, PokeyPair const *pokeys, int cycle);
-static void Pokey_GenerateUntilCycle(Pokey *self, PokeyPair const *pokeys, int cycleLimit);
-static void Pokey_Initialize(Pokey *self);
-static cibool Pokey_IsSilent(Pokey const *self);
-static void Pokey_Mute(Pokey *self, int mask);
-
-struct PokeyPair {
-	int extraPokeyMask;
-	int iirAccLeft;
-	int iirAccRight;
-	int irqst;
-	int readySamplesEnd;
-	int readySamplesStart;
-	int sampleFactor;
-	int sampleOffset;
-	int timer1Cycle;
-	int timer2Cycle;
-	int timer4Cycle;
-	unsigned char poly9Lookup[511];
-	Pokey basePokey;
-	Pokey extraPokey;
-	unsigned char poly17Lookup[16385];
-};
-static void PokeyPair_Construct(PokeyPair *self);
-static int PokeyPair_EndFrame(PokeyPair *self, int cycle);
-static int PokeyPair_Generate(PokeyPair *self, unsigned char *buffer, int bufferOffset, int blocks, ASAPSampleFormat format);
-static int PokeyPair_GetRandom(PokeyPair const *self, int addr, int cycle);
-static void PokeyPair_Initialize(PokeyPair *self, cibool ntsc, cibool stereo);
-static cibool PokeyPair_IsSilent(PokeyPair const *self);
-static void PokeyPair_Poke(PokeyPair *self, int addr, int data, int cycle);
-static void PokeyPair_StartFrame(PokeyPair *self);
-
-struct ASAP {
-	int blocksPlayed;
-	int consol;
-	unsigned char covox[4];
-	int currentDuration;
-	int currentSong;
-	int cycle;
-	int nextEventCycle;
-	int nextPlayerCycle;
-	int nextScanlineCycle;
-	NmiStatus nmist;
-	int silenceCycles;
-	int silenceCyclesCounter;
-	int tmcPerFrameCounter;
-	Cpu6502 cpu;
-	ASAPInfo moduleInfo;
-	PokeyPair pokeys;
-	unsigned char memory[65536];
-};
-static void ASAP_Construct(ASAP *self);
-static void ASAP_Call6502(ASAP *self, int addr);
-static void ASAP_Call6502Player(ASAP *self);
-static int ASAP_Do6502Frame(ASAP *self);
-static cibool ASAP_Do6502Init(ASAP *self, int pc, int a, int x, int y);
-static int ASAP_DoFrame(ASAP *self);
-static int ASAP_GenerateAt(ASAP *self, unsigned char *buffer, int bufferOffset, int bufferLen, ASAPSampleFormat format);
-static void ASAP_HandleEvent(ASAP *self);
-static int ASAP_MillisecondsToBlocks(int milliseconds);
-static int ASAP_PeekHardware(ASAP const *self, int addr);
-static void ASAP_PokeHardware(ASAP *self, int addr, int data);
-static void ASAP_PutLittleEndian(unsigned char *buffer, int offset, int value);
-static void ASAP_PutLittleEndians(unsigned char *buffer, int offset, int value1, int value2);
-static int ASAP_PutWavMetadata(unsigned char *buffer, int offset, int fourCC, const char *value);
-
-static unsigned char const *ASAP6502_GetPlayerRoutine(ASAPInfo const *info);
-static const unsigned char CiBinaryResource_cm3_obx[2022] = { 255, 255, 0, 5, 223, 12, 76, 18, 11, 76, 120, 5, 76, 203, 7, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 160, 227, 237, 227, 160, 240, 236, 225,
-	249, 229, 242, 160, 246, 160, 178, 174, 177, 160, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
-	255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 110,
-	5, 142, 111, 5, 140, 112, 5, 41, 112, 74, 74, 74, 170, 189, 148, 11,
-	141, 169, 5, 189, 149, 11, 141, 170, 5, 169, 3, 141, 15, 210, 216, 165,
-	254, 72, 165, 255, 72, 172, 112, 5, 174, 111, 5, 173, 110, 5, 32, 178,
-	5, 104, 133, 255, 104, 133, 254, 96, 173, 118, 5, 133, 254, 173, 119, 5,
-	133, 255, 160, 0, 138, 240, 28, 177, 254, 201, 143, 240, 4, 201, 239, 208,
-	12, 202, 208, 9, 200, 192, 84, 176, 9, 152, 170, 16, 6, 200, 192, 84,
-	144, 229, 96, 142, 104, 5, 32, 123, 6, 169, 0, 162, 9, 157, 69, 5,
-	202, 16, 250, 141, 103, 5, 169, 1, 141, 113, 5, 169, 255, 141, 106, 5,
-	173, 114, 5, 133, 254, 173, 115, 5, 133, 255, 160, 19, 177, 254, 170, 173,
-	118, 5, 133, 254, 173, 119, 5, 133, 255, 172, 104, 5, 177, 254, 201, 207,
-	208, 13, 152, 24, 105, 85, 168, 177, 254, 48, 15, 170, 76, 52, 6, 201,
-	143, 240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 108, 5, 142, 109, 5,
-	96, 41, 15, 240, 245, 142, 221, 10, 142, 243, 10, 142, 2, 11, 140, 222,
-	10, 140, 244, 10, 140, 3, 11, 96, 142, 114, 5, 134, 254, 140, 115, 5,
-	132, 255, 24, 138, 105, 20, 141, 116, 5, 152, 105, 0, 141, 117, 5, 142,
-	118, 5, 200, 200, 140, 119, 5, 160, 19, 177, 254, 141, 108, 5, 141, 109,
-	5, 162, 8, 169, 0, 141, 113, 5, 157, 0, 210, 224, 3, 176, 8, 157,
-	9, 5, 169, 255, 157, 57, 5, 202, 16, 233, 169, 128, 162, 3, 157, 75,
-	5, 202, 16, 250, 96, 169, 1, 141, 113, 5, 169, 0, 240, 238, 41, 3,
-	201, 3, 240, 240, 224, 64, 176, 236, 192, 26, 176, 232, 170, 169, 128, 157,
-	75, 5, 169, 0, 157, 57, 5, 157, 60, 5, 157, 63, 5, 173, 111, 5,
-	157, 12, 5, 173, 112, 5, 10, 10, 10, 133, 254, 24, 173, 114, 5, 105,
-	48, 72, 173, 115, 5, 105, 1, 168, 104, 24, 101, 254, 157, 97, 5, 152,
-	105, 0, 157, 100, 5, 24, 173, 114, 5, 105, 148, 133, 254, 173, 115, 5,
-	105, 0, 133, 255, 173, 112, 5, 10, 109, 112, 5, 10, 168, 177, 254, 157,
-	79, 5, 200, 177, 254, 157, 82, 5, 41, 7, 141, 110, 5, 200, 177, 254,
-	157, 85, 5, 200, 177, 254, 157, 88, 5, 200, 177, 254, 157, 91, 5, 200,
-	177, 254, 157, 94, 5, 160, 0, 173, 110, 5, 201, 3, 208, 2, 160, 2,
-	201, 7, 208, 2, 160, 4, 185, 178, 11, 133, 254, 185, 179, 11, 133, 255,
-	189, 85, 5, 74, 74, 74, 74, 24, 109, 111, 5, 141, 111, 5, 141, 194,
-	7, 168, 173, 110, 5, 201, 7, 208, 15, 152, 10, 168, 177, 254, 157, 45,
-	5, 200, 140, 111, 5, 76, 131, 7, 177, 254, 157, 45, 5, 189, 85, 5,
-	41, 15, 24, 109, 111, 5, 141, 111, 5, 172, 111, 5, 173, 110, 5, 201,
-	5, 8, 177, 254, 40, 240, 8, 221, 45, 5, 208, 3, 56, 233, 1, 157,
-	48, 5, 189, 79, 5, 72, 41, 3, 168, 185, 184, 11, 157, 54, 5, 104,
-	74, 74, 74, 74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10,
-	160, 48, 201, 13, 240, 4, 24, 105, 0, 168, 185, 188, 11, 157, 51, 5,
-	96, 216, 165, 252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 113,
-	5, 208, 3, 76, 5, 11, 173, 78, 5, 240, 3, 76, 110, 9, 173, 108,
-	5, 205, 109, 5, 240, 3, 76, 91, 9, 173, 103, 5, 240, 3, 76, 220,
-	8, 162, 2, 188, 75, 5, 48, 3, 157, 75, 5, 157, 69, 5, 202, 16,
-	242, 173, 118, 5, 133, 252, 173, 119, 5, 133, 253, 172, 104, 5, 132, 254,
-	204, 106, 5, 208, 25, 173, 107, 5, 240, 20, 173, 104, 5, 172, 105, 5,
-	140, 104, 5, 206, 107, 5, 208, 232, 141, 104, 5, 168, 16, 226, 162, 0,
-	177, 252, 201, 254, 208, 14, 172, 104, 5, 200, 196, 254, 240, 67, 140, 104,
-	5, 76, 26, 8, 157, 66, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144,
-	223, 172, 104, 5, 177, 252, 16, 122, 201, 255, 240, 118, 74, 74, 74, 41,
-	14, 170, 189, 164, 11, 141, 126, 8, 189, 165, 11, 141, 127, 8, 173, 67,
-	5, 133, 255, 32, 147, 8, 140, 104, 5, 192, 85, 176, 4, 196, 254, 208,
-	143, 164, 254, 140, 104, 5, 76, 5, 11, 32, 148, 6, 160, 255, 96, 48,
-	251, 168, 96, 48, 247, 56, 152, 229, 255, 168, 96, 48, 239, 24, 152, 101,
-	255, 168, 96, 48, 231, 141, 108, 5, 141, 109, 5, 200, 96, 48, 221, 173,
-	68, 5, 48, 216, 141, 107, 5, 200, 140, 105, 5, 24, 152, 101, 255, 141,
-	106, 5, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239, 208, 243,
-	200, 96, 162, 2, 189, 72, 5, 240, 5, 222, 72, 5, 16, 99, 189, 75,
-	5, 208, 94, 188, 66, 5, 192, 64, 176, 87, 173, 116, 5, 133, 252, 173,
-	117, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177, 252, 133,
-	255, 37, 254, 201, 255, 240, 58, 188, 69, 5, 177, 254, 41, 192, 208, 12,
-	177, 254, 41, 63, 157, 15, 5, 254, 69, 5, 16, 235, 201, 64, 208, 19,
-	177, 254, 41, 63, 141, 111, 5, 189, 15, 5, 141, 112, 5, 32, 188, 6,
-	76, 72, 9, 201, 128, 208, 10, 177, 254, 41, 63, 157, 72, 5, 254, 69,
-	5, 202, 16, 144, 174, 103, 5, 232, 224, 48, 144, 2, 162, 0, 142, 103,
-	5, 206, 109, 5, 208, 14, 173, 108, 5, 141, 109, 5, 173, 103, 5, 208,
-	3, 238, 104, 5, 172, 48, 5, 173, 82, 5, 41, 7, 201, 5, 240, 4,
-	201, 6, 208, 1, 136, 140, 39, 5, 160, 0, 201, 5, 240, 4, 201, 6,
-	208, 2, 160, 2, 201, 7, 208, 2, 160, 40, 140, 44, 5, 162, 2, 189,
-	82, 5, 41, 224, 157, 40, 5, 189, 97, 5, 133, 252, 189, 100, 5, 133,
-	253, 189, 57, 5, 201, 255, 240, 54, 201, 15, 208, 32, 189, 63, 5, 240,
-	45, 222, 63, 5, 189, 63, 5, 208, 37, 188, 9, 5, 240, 1, 136, 152,
-	157, 9, 5, 189, 88, 5, 157, 63, 5, 76, 232, 9, 189, 57, 5, 74,
-	168, 177, 252, 144, 4, 74, 74, 74, 74, 41, 15, 157, 9, 5, 188, 45,
-	5, 189, 82, 5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 48, 5,
-	8, 169, 1, 40, 208, 2, 10, 10, 61, 60, 5, 240, 12, 188, 48, 5,
-	192, 255, 208, 5, 169, 0, 157, 9, 5, 152, 157, 36, 5, 169, 1, 141,
-	110, 5, 189, 57, 5, 201, 15, 240, 56, 41, 7, 168, 185, 208, 12, 133,
-	254, 189, 57, 5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 3, 168, 185,
-	91, 5, 37, 254, 240, 27, 189, 51, 5, 157, 36, 5, 142, 110, 5, 202,
-	16, 8, 141, 39, 5, 169, 0, 141, 44, 5, 232, 189, 54, 5, 157, 40,
-	5, 189, 57, 5, 41, 15, 201, 15, 240, 16, 254, 57, 5, 189, 57, 5,
-	201, 15, 208, 6, 189, 88, 5, 157, 63, 5, 189, 75, 5, 16, 10, 189,
-	9, 5, 208, 5, 169, 64, 157, 75, 5, 254, 60, 5, 160, 0, 189, 82,
-	5, 74, 74, 74, 74, 144, 1, 136, 74, 144, 1, 200, 24, 152, 125, 45,
-	5, 157, 45, 5, 189, 48, 5, 201, 255, 208, 2, 160, 0, 24, 152, 125,
-	48, 5, 157, 48, 5, 202, 48, 3, 76, 153, 9, 173, 40, 5, 141, 43,
-	5, 173, 82, 5, 41, 7, 170, 160, 3, 173, 110, 5, 240, 3, 188, 216,
-	12, 152, 72, 185, 188, 12, 8, 41, 127, 170, 152, 41, 3, 10, 168, 189,
-	36, 5, 153, 0, 210, 200, 189, 9, 5, 224, 3, 208, 3, 173, 9, 5,
-	29, 40, 5, 40, 16, 2, 169, 0, 153, 0, 210, 104, 168, 136, 41, 3,
-	208, 207, 160, 8, 173, 44, 5, 153, 0, 210, 24, 104, 133, 255, 104, 133,
-	254, 104, 133, 253, 104, 133, 252, 96, 104, 170, 240, 78, 201, 2, 240, 6,
-	104, 104, 202, 208, 251, 96, 165, 20, 197, 20, 240, 252, 173, 36, 2, 201,
-	137, 208, 7, 173, 37, 2, 201, 11, 240, 230, 173, 36, 2, 141, 146, 11,
-	173, 37, 2, 141, 147, 11, 169, 137, 141, 36, 2, 169, 11, 141, 37, 2,
-	104, 104, 240, 3, 56, 233, 1, 141, 96, 11, 104, 168, 104, 170, 169, 112,
-	32, 120, 5, 169, 0, 162, 0, 76, 120, 5, 165, 20, 197, 20, 240, 252,
-	173, 36, 2, 201, 137, 208, 174, 173, 37, 2, 201, 11, 208, 167, 173, 146,
-	11, 141, 36, 2, 173, 147, 11, 141, 37, 2, 169, 64, 76, 120, 5, 32,
-	203, 7, 144, 3, 32, 120, 11, 76, 255, 255, 178, 5, 221, 5, 168, 6,
-	59, 6, 123, 6, 148, 6, 159, 6, 82, 6, 147, 8, 153, 8, 157, 8,
-	165, 8, 173, 8, 183, 8, 205, 8, 188, 11, 253, 11, 62, 12, 128, 160,
-	32, 64, 255, 241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120,
-	114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47,
-	44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
-	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
-	1, 0, 0, 0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152,
-	143, 137, 128, 122, 113, 107, 101, 95, 0, 86, 80, 103, 96, 90, 85, 81,
-	76, 72, 67, 63, 61, 57, 52, 51, 57, 45, 42, 40, 37, 36, 33, 31,
-	30, 0, 0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3,
-	2, 1, 0, 0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8,
-	239, 7, 128, 7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5,
-	246, 4, 176, 4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3,
-	34, 3, 244, 2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2,
-	245, 1, 216, 1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1,
-	56, 1, 39, 1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0,
-	195, 0, 184, 0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0,
-	120, 0, 112, 0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0,
-	10, 0, 0, 1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0,
-	2, 3, 1, 2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 3, 3,
-	3, 3, 7, 11, 15, 19 };
-static const unsigned char CiBinaryResource_cmc_obx[2019] = { 255, 255, 0, 5, 220, 12, 76, 15, 11, 76, 120, 5, 76, 203, 7, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 160, 227, 237, 227, 160, 240, 236, 225,
-	249, 229, 242, 160, 246, 160, 178, 174, 177, 160, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
-	255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 110,
-	5, 142, 111, 5, 140, 112, 5, 41, 112, 74, 74, 74, 170, 189, 145, 11,
-	141, 169, 5, 189, 146, 11, 141, 170, 5, 169, 3, 141, 15, 210, 216, 165,
-	254, 72, 165, 255, 72, 172, 112, 5, 174, 111, 5, 173, 110, 5, 32, 178,
-	5, 104, 133, 255, 104, 133, 254, 96, 173, 118, 5, 133, 254, 173, 119, 5,
-	133, 255, 160, 0, 138, 240, 28, 177, 254, 201, 143, 240, 4, 201, 239, 208,
-	12, 202, 208, 9, 200, 192, 84, 176, 9, 152, 170, 16, 6, 200, 192, 84,
-	144, 229, 96, 142, 104, 5, 32, 123, 6, 169, 0, 162, 9, 157, 69, 5,
-	202, 16, 250, 141, 103, 5, 169, 1, 141, 113, 5, 169, 255, 141, 106, 5,
-	173, 114, 5, 133, 254, 173, 115, 5, 133, 255, 160, 19, 177, 254, 170, 173,
-	118, 5, 133, 254, 173, 119, 5, 133, 255, 172, 104, 5, 177, 254, 201, 207,
-	208, 13, 152, 24, 105, 85, 168, 177, 254, 48, 15, 170, 76, 52, 6, 201,
-	143, 240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 108, 5, 142, 109, 5,
-	96, 41, 15, 240, 245, 142, 218, 10, 142, 240, 10, 142, 255, 10, 140, 219,
-	10, 140, 241, 10, 140, 0, 11, 96, 142, 114, 5, 134, 254, 140, 115, 5,
-	132, 255, 24, 138, 105, 20, 141, 116, 5, 152, 105, 0, 141, 117, 5, 142,
-	118, 5, 200, 200, 140, 119, 5, 160, 19, 177, 254, 141, 108, 5, 141, 109,
-	5, 162, 8, 169, 0, 141, 113, 5, 157, 0, 210, 224, 3, 176, 8, 157,
-	9, 5, 169, 255, 157, 57, 5, 202, 16, 233, 169, 128, 162, 3, 157, 75,
-	5, 202, 16, 250, 96, 169, 1, 141, 113, 5, 169, 0, 240, 238, 41, 3,
-	201, 3, 240, 240, 224, 64, 176, 236, 192, 26, 176, 232, 170, 169, 128, 157,
-	75, 5, 169, 0, 157, 57, 5, 157, 60, 5, 157, 63, 5, 173, 111, 5,
-	157, 12, 5, 173, 112, 5, 10, 10, 10, 133, 254, 24, 173, 114, 5, 105,
-	48, 72, 173, 115, 5, 105, 1, 168, 104, 24, 101, 254, 157, 97, 5, 152,
-	105, 0, 157, 100, 5, 24, 173, 114, 5, 105, 148, 133, 254, 173, 115, 5,
-	105, 0, 133, 255, 173, 112, 5, 10, 109, 112, 5, 10, 168, 177, 254, 157,
-	79, 5, 200, 177, 254, 157, 82, 5, 41, 7, 141, 110, 5, 200, 177, 254,
-	157, 85, 5, 200, 177, 254, 157, 88, 5, 200, 177, 254, 157, 91, 5, 200,
-	177, 254, 157, 94, 5, 160, 0, 173, 110, 5, 201, 3, 208, 2, 160, 2,
-	201, 7, 208, 2, 160, 4, 185, 175, 11, 133, 254, 185, 176, 11, 133, 255,
-	189, 85, 5, 74, 74, 74, 74, 24, 109, 111, 5, 141, 111, 5, 141, 194,
-	7, 168, 173, 110, 5, 201, 7, 208, 15, 152, 10, 168, 177, 254, 157, 45,
-	5, 200, 140, 111, 5, 76, 131, 7, 177, 254, 157, 45, 5, 189, 85, 5,
-	41, 15, 24, 109, 111, 5, 141, 111, 5, 172, 111, 5, 173, 110, 5, 201,
-	5, 8, 177, 254, 40, 240, 8, 221, 45, 5, 208, 3, 56, 233, 1, 157,
-	48, 5, 189, 79, 5, 72, 41, 3, 168, 185, 181, 11, 157, 54, 5, 104,
-	74, 74, 74, 74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10,
-	160, 48, 201, 13, 240, 4, 24, 105, 0, 168, 185, 185, 11, 157, 51, 5,
-	96, 216, 165, 252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 113,
-	5, 208, 3, 76, 2, 11, 173, 78, 5, 240, 3, 76, 107, 9, 173, 108,
-	5, 205, 109, 5, 240, 3, 76, 88, 9, 173, 103, 5, 240, 3, 76, 220,
-	8, 162, 2, 188, 75, 5, 48, 3, 157, 75, 5, 157, 69, 5, 202, 16,
-	242, 173, 118, 5, 133, 252, 173, 119, 5, 133, 253, 172, 104, 5, 132, 254,
-	204, 106, 5, 208, 25, 173, 107, 5, 240, 20, 173, 104, 5, 172, 105, 5,
-	140, 104, 5, 206, 107, 5, 208, 232, 141, 104, 5, 168, 16, 226, 162, 0,
-	177, 252, 201, 254, 208, 14, 172, 104, 5, 200, 196, 254, 240, 67, 140, 104,
-	5, 76, 26, 8, 157, 66, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144,
-	223, 172, 104, 5, 177, 252, 16, 122, 201, 255, 240, 118, 74, 74, 74, 41,
-	14, 170, 189, 161, 11, 141, 126, 8, 189, 162, 11, 141, 127, 8, 173, 67,
-	5, 133, 255, 32, 147, 8, 140, 104, 5, 192, 85, 176, 4, 196, 254, 208,
-	143, 164, 254, 140, 104, 5, 76, 2, 11, 32, 148, 6, 160, 255, 96, 48,
-	251, 168, 96, 48, 247, 56, 152, 229, 255, 168, 96, 48, 239, 24, 152, 101,
-	255, 168, 96, 48, 231, 141, 108, 5, 141, 109, 5, 200, 96, 48, 221, 173,
-	68, 5, 48, 216, 141, 107, 5, 200, 140, 105, 5, 24, 152, 101, 255, 141,
-	106, 5, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239, 208, 243,
-	200, 96, 162, 2, 189, 72, 5, 240, 5, 222, 72, 5, 16, 99, 189, 75,
-	5, 208, 94, 188, 66, 5, 192, 64, 176, 87, 173, 116, 5, 133, 252, 173,
-	117, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177, 252, 133,
-	255, 37, 254, 201, 255, 240, 58, 188, 69, 5, 177, 254, 41, 192, 208, 12,
-	177, 254, 41, 63, 157, 15, 5, 254, 69, 5, 16, 235, 201, 64, 208, 19,
-	177, 254, 41, 63, 141, 111, 5, 189, 15, 5, 141, 112, 5, 32, 188, 6,
-	76, 72, 9, 201, 128, 208, 10, 177, 254, 41, 63, 157, 72, 5, 254, 69,
-	5, 202, 16, 144, 174, 103, 5, 232, 138, 41, 63, 141, 103, 5, 206, 109,
-	5, 208, 14, 173, 108, 5, 141, 109, 5, 173, 103, 5, 208, 3, 238, 104,
-	5, 172, 48, 5, 173, 82, 5, 41, 7, 201, 5, 240, 4, 201, 6, 208,
-	1, 136, 140, 39, 5, 160, 0, 201, 5, 240, 4, 201, 6, 208, 2, 160,
-	2, 201, 7, 208, 2, 160, 40, 140, 44, 5, 162, 2, 189, 82, 5, 41,
-	224, 157, 40, 5, 189, 97, 5, 133, 252, 189, 100, 5, 133, 253, 189, 57,
-	5, 201, 255, 240, 54, 201, 15, 208, 32, 189, 63, 5, 240, 45, 222, 63,
-	5, 189, 63, 5, 208, 37, 188, 9, 5, 240, 1, 136, 152, 157, 9, 5,
-	189, 88, 5, 157, 63, 5, 76, 229, 9, 189, 57, 5, 74, 168, 177, 252,
-	144, 4, 74, 74, 74, 74, 41, 15, 157, 9, 5, 188, 45, 5, 189, 82,
-	5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 48, 5, 8, 169, 1,
-	40, 208, 2, 10, 10, 61, 60, 5, 240, 12, 188, 48, 5, 192, 255, 208,
-	5, 169, 0, 157, 9, 5, 152, 157, 36, 5, 169, 1, 141, 110, 5, 189,
-	57, 5, 201, 15, 240, 56, 41, 7, 168, 185, 205, 12, 133, 254, 189, 57,
-	5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 3, 168, 185, 91, 5, 37,
-	254, 240, 27, 189, 51, 5, 157, 36, 5, 142, 110, 5, 202, 16, 8, 141,
-	39, 5, 169, 0, 141, 44, 5, 232, 189, 54, 5, 157, 40, 5, 189, 57,
-	5, 41, 15, 201, 15, 240, 16, 254, 57, 5, 189, 57, 5, 201, 15, 208,
-	6, 189, 88, 5, 157, 63, 5, 189, 75, 5, 16, 10, 189, 9, 5, 208,
-	5, 169, 64, 157, 75, 5, 254, 60, 5, 160, 0, 189, 82, 5, 74, 74,
-	74, 74, 144, 1, 136, 74, 144, 1, 200, 24, 152, 125, 45, 5, 157, 45,
-	5, 189, 48, 5, 201, 255, 208, 2, 160, 0, 24, 152, 125, 48, 5, 157,
-	48, 5, 202, 48, 3, 76, 150, 9, 173, 40, 5, 141, 43, 5, 173, 82,
-	5, 41, 7, 170, 160, 3, 173, 110, 5, 240, 3, 188, 213, 12, 152, 72,
-	185, 185, 12, 8, 41, 127, 170, 152, 41, 3, 10, 168, 189, 36, 5, 153,
-	0, 210, 200, 189, 9, 5, 224, 3, 208, 3, 173, 9, 5, 29, 40, 5,
-	40, 16, 2, 169, 0, 153, 0, 210, 104, 168, 136, 41, 3, 208, 207, 160,
-	8, 173, 44, 5, 153, 0, 210, 24, 104, 133, 255, 104, 133, 254, 104, 133,
-	253, 104, 133, 252, 96, 104, 170, 240, 78, 201, 2, 240, 6, 104, 104, 202,
-	208, 251, 96, 165, 20, 197, 20, 240, 252, 173, 36, 2, 201, 134, 208, 7,
-	173, 37, 2, 201, 11, 240, 230, 173, 36, 2, 141, 143, 11, 173, 37, 2,
-	141, 144, 11, 169, 134, 141, 36, 2, 169, 11, 141, 37, 2, 104, 104, 240,
-	3, 56, 233, 1, 141, 93, 11, 104, 168, 104, 170, 169, 112, 32, 120, 5,
-	169, 0, 162, 0, 76, 120, 5, 165, 20, 197, 20, 240, 252, 173, 36, 2,
-	201, 134, 208, 174, 173, 37, 2, 201, 11, 208, 167, 173, 143, 11, 141, 36,
-	2, 173, 144, 11, 141, 37, 2, 169, 64, 76, 120, 5, 32, 203, 7, 144,
-	3, 32, 117, 11, 76, 255, 255, 178, 5, 221, 5, 168, 6, 59, 6, 123,
-	6, 148, 6, 159, 6, 82, 6, 147, 8, 153, 8, 157, 8, 165, 8, 173,
-	8, 183, 8, 205, 8, 185, 11, 250, 11, 59, 12, 128, 160, 32, 64, 255,
-	241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120, 114, 107, 101,
-	95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47, 44, 42, 39,
-	37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15,
-	14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0,
-	0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128,
-	122, 113, 107, 101, 95, 0, 86, 80, 103, 96, 90, 85, 81, 76, 72, 67,
-	63, 61, 57, 52, 51, 57, 45, 42, 40, 37, 36, 33, 31, 30, 0, 0,
-	15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
-	0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8, 239, 7, 128,
-	7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5, 246, 4, 176,
-	4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3, 34, 3, 244,
-	2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2, 245, 1, 216,
-	1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1, 56, 1, 39,
-	1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0, 195, 0, 184,
-	0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0, 120, 0, 112,
-	0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0, 10, 0, 0,
-	1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0, 2, 3, 1,
-	2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 3, 3, 3, 3, 7,
-	11, 15, 19 };
-static const unsigned char CiBinaryResource_cmr_obx[2019] = { 255, 255, 0, 5, 220, 12, 76, 15, 11, 76, 120, 5, 76, 203, 7, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 160, 227, 237, 227, 160, 240, 236, 225,
-	249, 229, 242, 160, 246, 160, 178, 174, 177, 160, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
-	255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 110,
-	5, 142, 111, 5, 140, 112, 5, 41, 112, 74, 74, 74, 170, 189, 145, 11,
-	141, 169, 5, 189, 146, 11, 141, 170, 5, 169, 3, 141, 15, 210, 216, 165,
-	254, 72, 165, 255, 72, 172, 112, 5, 174, 111, 5, 173, 110, 5, 32, 178,
-	5, 104, 133, 255, 104, 133, 254, 96, 173, 118, 5, 133, 254, 173, 119, 5,
-	133, 255, 160, 0, 138, 240, 28, 177, 254, 201, 143, 240, 4, 201, 239, 208,
-	12, 202, 208, 9, 200, 192, 84, 176, 9, 152, 170, 16, 6, 200, 192, 84,
-	144, 229, 96, 142, 104, 5, 32, 123, 6, 169, 0, 162, 9, 157, 69, 5,
-	202, 16, 250, 141, 103, 5, 169, 1, 141, 113, 5, 169, 255, 141, 106, 5,
-	173, 114, 5, 133, 254, 173, 115, 5, 133, 255, 160, 19, 177, 254, 170, 173,
-	118, 5, 133, 254, 173, 119, 5, 133, 255, 172, 104, 5, 177, 254, 201, 207,
-	208, 13, 152, 24, 105, 85, 168, 177, 254, 48, 15, 170, 76, 52, 6, 201,
-	143, 240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 108, 5, 142, 109, 5,
-	96, 41, 15, 240, 245, 142, 218, 10, 142, 240, 10, 142, 255, 10, 140, 219,
-	10, 140, 241, 10, 140, 0, 11, 96, 142, 114, 5, 134, 254, 140, 115, 5,
-	132, 255, 24, 138, 105, 20, 141, 116, 5, 152, 105, 0, 141, 117, 5, 142,
-	118, 5, 200, 200, 140, 119, 5, 160, 19, 177, 254, 141, 108, 5, 141, 109,
-	5, 162, 8, 169, 0, 141, 113, 5, 157, 0, 210, 224, 3, 176, 8, 157,
-	9, 5, 169, 255, 157, 57, 5, 202, 16, 233, 169, 128, 162, 3, 157, 75,
-	5, 202, 16, 250, 96, 169, 1, 141, 113, 5, 169, 0, 240, 238, 41, 3,
-	201, 3, 240, 240, 224, 64, 176, 236, 192, 26, 176, 232, 170, 169, 128, 157,
-	75, 5, 169, 0, 157, 57, 5, 157, 60, 5, 157, 63, 5, 173, 111, 5,
-	157, 12, 5, 173, 112, 5, 10, 10, 10, 133, 254, 24, 173, 114, 5, 105,
-	48, 72, 173, 115, 5, 105, 1, 168, 104, 24, 101, 254, 157, 97, 5, 152,
-	105, 0, 157, 100, 5, 24, 173, 114, 5, 105, 148, 133, 254, 173, 115, 5,
-	105, 0, 133, 255, 173, 112, 5, 10, 109, 112, 5, 10, 168, 177, 254, 157,
-	79, 5, 200, 177, 254, 157, 82, 5, 41, 7, 141, 110, 5, 200, 177, 254,
-	157, 85, 5, 200, 177, 254, 157, 88, 5, 200, 177, 254, 157, 91, 5, 200,
-	177, 254, 157, 94, 5, 160, 0, 173, 110, 5, 201, 3, 208, 2, 160, 2,
-	201, 7, 208, 2, 160, 4, 185, 175, 11, 133, 254, 185, 176, 11, 133, 255,
-	189, 85, 5, 74, 74, 74, 74, 24, 109, 111, 5, 141, 111, 5, 141, 194,
-	7, 168, 173, 110, 5, 201, 7, 208, 15, 152, 10, 168, 177, 254, 157, 45,
-	5, 200, 140, 111, 5, 76, 131, 7, 177, 254, 157, 45, 5, 189, 85, 5,
-	41, 15, 24, 109, 111, 5, 141, 111, 5, 172, 111, 5, 173, 110, 5, 201,
-	5, 8, 177, 254, 40, 240, 8, 221, 45, 5, 208, 3, 56, 233, 1, 157,
-	48, 5, 189, 79, 5, 72, 41, 3, 168, 185, 181, 11, 157, 54, 5, 104,
-	74, 74, 74, 74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10,
-	160, 48, 201, 13, 240, 4, 24, 105, 0, 168, 185, 185, 11, 157, 51, 5,
-	96, 216, 165, 252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 113,
-	5, 208, 3, 76, 2, 11, 173, 78, 5, 240, 3, 76, 107, 9, 173, 108,
-	5, 205, 109, 5, 240, 3, 76, 88, 9, 173, 103, 5, 240, 3, 76, 220,
-	8, 162, 2, 188, 75, 5, 48, 3, 157, 75, 5, 157, 69, 5, 202, 16,
-	242, 173, 118, 5, 133, 252, 173, 119, 5, 133, 253, 172, 104, 5, 132, 254,
-	204, 106, 5, 208, 25, 173, 107, 5, 240, 20, 173, 104, 5, 172, 105, 5,
-	140, 104, 5, 206, 107, 5, 208, 232, 141, 104, 5, 168, 16, 226, 162, 0,
-	177, 252, 201, 254, 208, 14, 172, 104, 5, 200, 196, 254, 240, 67, 140, 104,
-	5, 76, 26, 8, 157, 66, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144,
-	223, 172, 104, 5, 177, 252, 16, 122, 201, 255, 240, 118, 74, 74, 74, 41,
-	14, 170, 189, 161, 11, 141, 126, 8, 189, 162, 11, 141, 127, 8, 173, 67,
-	5, 133, 255, 32, 147, 8, 140, 104, 5, 192, 85, 176, 4, 196, 254, 208,
-	143, 164, 254, 140, 104, 5, 76, 2, 11, 32, 148, 6, 160, 255, 96, 48,
-	251, 168, 96, 48, 247, 56, 152, 229, 255, 168, 96, 48, 239, 24, 152, 101,
-	255, 168, 96, 48, 231, 141, 108, 5, 141, 109, 5, 200, 96, 48, 221, 173,
-	68, 5, 48, 216, 141, 107, 5, 200, 140, 105, 5, 24, 152, 101, 255, 141,
-	106, 5, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239, 208, 243,
-	200, 96, 162, 2, 189, 72, 5, 240, 5, 222, 72, 5, 16, 99, 189, 75,
-	5, 208, 94, 188, 66, 5, 192, 64, 176, 87, 173, 116, 5, 133, 252, 173,
-	117, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177, 252, 133,
-	255, 37, 254, 201, 255, 240, 58, 188, 69, 5, 177, 254, 41, 192, 208, 12,
-	177, 254, 41, 63, 157, 15, 5, 254, 69, 5, 16, 235, 201, 64, 208, 19,
-	177, 254, 41, 63, 141, 111, 5, 189, 15, 5, 141, 112, 5, 32, 188, 6,
-	76, 72, 9, 201, 128, 208, 10, 177, 254, 41, 63, 157, 72, 5, 254, 69,
-	5, 202, 16, 144, 174, 103, 5, 232, 138, 41, 63, 141, 103, 5, 206, 109,
-	5, 208, 14, 173, 108, 5, 141, 109, 5, 173, 103, 5, 208, 3, 238, 104,
-	5, 172, 48, 5, 173, 82, 5, 41, 7, 201, 5, 240, 4, 201, 6, 208,
-	1, 136, 140, 39, 5, 160, 0, 201, 5, 240, 4, 201, 6, 208, 2, 160,
-	2, 201, 7, 208, 2, 160, 40, 140, 44, 5, 162, 2, 189, 82, 5, 41,
-	224, 157, 40, 5, 189, 97, 5, 133, 252, 189, 100, 5, 133, 253, 189, 57,
-	5, 201, 255, 240, 54, 201, 15, 208, 32, 189, 63, 5, 240, 45, 222, 63,
-	5, 189, 63, 5, 208, 37, 188, 9, 5, 240, 1, 136, 152, 157, 9, 5,
-	189, 88, 5, 157, 63, 5, 76, 229, 9, 189, 57, 5, 74, 168, 177, 252,
-	144, 4, 74, 74, 74, 74, 41, 15, 157, 9, 5, 188, 45, 5, 189, 82,
-	5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 48, 5, 8, 169, 1,
-	40, 208, 2, 10, 10, 61, 60, 5, 240, 12, 188, 48, 5, 192, 255, 208,
-	5, 169, 0, 157, 9, 5, 152, 157, 36, 5, 169, 1, 141, 110, 5, 189,
-	57, 5, 201, 15, 240, 56, 41, 7, 168, 185, 205, 12, 133, 254, 189, 57,
-	5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 3, 168, 185, 91, 5, 37,
-	254, 240, 27, 189, 51, 5, 157, 36, 5, 142, 110, 5, 202, 16, 8, 141,
-	39, 5, 169, 0, 141, 44, 5, 232, 189, 54, 5, 157, 40, 5, 189, 57,
-	5, 41, 15, 201, 15, 240, 16, 254, 57, 5, 189, 57, 5, 201, 15, 208,
-	6, 189, 88, 5, 157, 63, 5, 189, 75, 5, 16, 10, 189, 9, 5, 208,
-	5, 169, 64, 157, 75, 5, 254, 60, 5, 160, 0, 189, 82, 5, 74, 74,
-	74, 74, 144, 1, 136, 74, 144, 1, 200, 24, 152, 125, 45, 5, 157, 45,
-	5, 189, 48, 5, 201, 255, 208, 2, 160, 0, 24, 152, 125, 48, 5, 157,
-	48, 5, 202, 48, 3, 76, 150, 9, 173, 40, 5, 141, 43, 5, 173, 82,
-	5, 41, 7, 170, 160, 3, 173, 110, 5, 240, 3, 188, 213, 12, 152, 72,
-	185, 185, 12, 8, 41, 127, 170, 152, 41, 3, 10, 168, 189, 36, 5, 153,
-	0, 210, 200, 189, 9, 5, 224, 3, 208, 3, 173, 9, 5, 29, 40, 5,
-	40, 16, 2, 169, 0, 153, 0, 210, 104, 168, 136, 41, 3, 208, 207, 160,
-	8, 173, 44, 5, 153, 0, 210, 24, 104, 133, 255, 104, 133, 254, 104, 133,
-	253, 104, 133, 252, 96, 104, 170, 240, 78, 201, 2, 240, 6, 104, 104, 202,
-	208, 251, 96, 165, 20, 197, 20, 240, 252, 173, 36, 2, 201, 134, 208, 7,
-	173, 37, 2, 201, 11, 240, 230, 173, 36, 2, 141, 143, 11, 173, 37, 2,
-	141, 144, 11, 169, 134, 141, 36, 2, 169, 11, 141, 37, 2, 104, 104, 240,
-	3, 56, 233, 1, 141, 93, 11, 104, 168, 104, 170, 169, 112, 32, 120, 5,
-	169, 0, 162, 0, 76, 120, 5, 165, 20, 197, 20, 240, 252, 173, 36, 2,
-	201, 134, 208, 174, 173, 37, 2, 201, 11, 208, 167, 173, 143, 11, 141, 36,
-	2, 173, 144, 11, 141, 37, 2, 169, 64, 76, 120, 5, 32, 203, 7, 144,
-	3, 32, 117, 11, 76, 255, 255, 178, 5, 221, 5, 168, 6, 59, 6, 123,
-	6, 148, 6, 159, 6, 82, 6, 147, 8, 153, 8, 157, 8, 165, 8, 173,
-	8, 183, 8, 205, 8, 185, 11, 250, 11, 59, 12, 128, 160, 32, 64, 255,
-	241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120, 114, 107, 101,
-	95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47, 44, 42, 39,
-	37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15,
-	14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0,
-	0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128,
-	122, 113, 107, 101, 95, 92, 86, 80, 77, 71, 68, 65, 62, 56, 53, 136,
-	127, 121, 115, 108, 103, 96, 90, 85, 81, 76, 72, 67, 63, 61, 57, 52,
-	51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 5, 4, 3, 2, 1, 0,
-	0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8, 239, 7, 128,
-	7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5, 246, 4, 176,
-	4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3, 34, 3, 244,
-	2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2, 245, 1, 216,
-	1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1, 56, 1, 39,
-	1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0, 195, 0, 184,
-	0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0, 120, 0, 112,
-	0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0, 10, 0, 0,
-	1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0, 2, 3, 1,
-	2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 3, 3, 3, 3, 7,
-	11, 15, 19 };
-static const unsigned char CiBinaryResource_cms_obx[2753] = { 255, 255, 0, 5, 186, 15, 234, 234, 234, 76, 21, 8, 76, 92, 15, 35,
-	5, 169, 5, 173, 5, 184, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 128, 128, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 255,
-	255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, 0, 0, 6, 6, 0,
-	128, 20, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15,
-	15, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0,
-	1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0, 2, 3, 1,
-	2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 75, 8, 118, 8, 133,
-	9, 19, 9, 80, 9, 110, 9, 124, 9, 26, 9, 128, 160, 32, 64, 255,
-	241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120, 114, 107, 101,
-	95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47, 44, 42, 39,
-	37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15,
-	14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0,
-	0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128,
-	122, 113, 107, 101, 95, 0, 86, 80, 103, 96, 90, 85, 81, 76, 72, 67,
-	63, 61, 57, 52, 51, 57, 45, 42, 40, 37, 36, 33, 31, 30, 0, 0,
-	15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
-	0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8, 239, 7, 128,
-	7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5, 246, 4, 176,
-	4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3, 34, 3, 244,
-	2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2, 245, 1, 216,
-	1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1, 56, 1, 39,
-	1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0, 195, 0, 184,
-	0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0, 120, 0, 112,
-	0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0, 10, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
-	0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 0,
-	0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 0,
-	0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 0,
-	0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0,
-	0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 0,
-	0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 0,
-	1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0,
-	1, 1, 2, 2, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 9, 0,
-	1, 1, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, 9, 9, 10, 0,
-	1, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11, 0,
-	1, 2, 2, 3, 4, 5, 6, 7, 8, 9, 9, 10, 11, 11, 12, 0,
-	1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 0,
-	1, 2, 3, 4, 5, 6, 7, 7, 8, 9, 10, 11, 12, 13, 14, 0,
-	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 6,
-	12, 12, 12, 18, 12, 28, 12, 38, 12, 50, 12, 79, 12, 233, 5, 42,
-	6, 107, 6, 161, 11, 196, 11, 185, 11, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 3, 3, 3, 3, 7, 11, 15, 19, 141, 143, 5, 142, 144,
-	5, 140, 145, 5, 41, 112, 74, 74, 74, 170, 169, 3, 141, 15, 210, 189,
-	213, 5, 141, 73, 8, 189, 214, 5, 141, 74, 8, 169, 3, 141, 31, 210,
-	169, 1, 141, 146, 5, 172, 145, 5, 174, 144, 5, 173, 143, 5, 76, 72,
-	8, 173, 147, 5, 133, 252, 173, 148, 5, 133, 253, 160, 0, 138, 240, 28,
-	177, 252, 201, 143, 240, 4, 201, 239, 208, 12, 202, 208, 9, 200, 192, 84,
-	176, 9, 152, 170, 16, 6, 200, 192, 84, 144, 229, 96, 142, 149, 5, 169,
-	0, 162, 5, 157, 17, 5, 157, 23, 5, 157, 29, 5, 202, 16, 244, 141,
-	150, 5, 141, 157, 5, 160, 255, 140, 159, 5, 173, 153, 5, 133, 252, 173,
-	154, 5, 133, 253, 160, 19, 177, 252, 170, 173, 147, 5, 133, 252, 173, 148,
-	5, 133, 253, 172, 149, 5, 152, 72, 169, 15, 141, 169, 5, 141, 170, 5,
-	177, 252, 201, 135, 208, 35, 152, 72, 24, 105, 85, 168, 177, 252, 16, 2,
-	169, 15, 41, 15, 141, 169, 5, 152, 24, 105, 85, 168, 177, 252, 16, 3,
-	173, 169, 5, 41, 15, 141, 170, 5, 104, 76, 243, 8, 177, 252, 201, 143,
-	240, 7, 201, 239, 240, 3, 136, 16, 199, 104, 168, 177, 252, 201, 207, 208,
-	13, 152, 24, 105, 85, 168, 177, 252, 48, 15, 170, 76, 19, 9, 201, 143,
-	240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 151, 5, 142, 152, 5, 96,
-	142, 153, 5, 134, 252, 140, 154, 5, 132, 253, 24, 138, 105, 20, 141, 155,
-	5, 152, 105, 0, 141, 156, 5, 24, 138, 105, 0, 141, 147, 5, 152, 105,
-	2, 141, 148, 5, 160, 19, 177, 252, 141, 151, 5, 141, 152, 5, 162, 3,
-	142, 31, 210, 142, 15, 210, 169, 0, 141, 146, 5, 160, 8, 169, 0, 153,
-	0, 210, 153, 16, 210, 192, 6, 176, 8, 153, 35, 5, 169, 255, 153, 41,
-	5, 136, 16, 233, 169, 128, 162, 5, 157, 29, 5, 202, 16, 250, 141, 157,
-	5, 96, 169, 0, 240, 240, 141, 157, 5, 240, 11, 173, 143, 5, 41, 7,
-	170, 169, 128, 157, 29, 5, 172, 145, 5, 173, 144, 5, 141, 143, 5, 140,
-	145, 5, 169, 0, 157, 83, 5, 157, 41, 5, 157, 77, 5, 152, 10, 10,
-	10, 133, 254, 24, 173, 153, 5, 105, 48, 72, 173, 154, 5, 105, 1, 168,
-	104, 24, 101, 254, 157, 101, 5, 152, 105, 0, 157, 71, 5, 24, 173, 153,
-	5, 105, 148, 133, 252, 173, 154, 5, 105, 0, 133, 253, 173, 145, 5, 10,
-	109, 145, 5, 10, 168, 140, 145, 5, 200, 200, 200, 200, 200, 177, 252, 157,
-	113, 5, 136, 177, 252, 157, 107, 5, 136, 177, 252, 157, 119, 5, 136, 136,
-	177, 252, 157, 59, 5, 160, 0, 41, 7, 201, 3, 208, 2, 160, 2, 201,
-	7, 208, 2, 160, 4, 185, 247, 7, 133, 254, 185, 248, 7, 133, 255, 172,
-	145, 5, 200, 200, 177, 252, 74, 74, 74, 74, 24, 109, 143, 5, 141, 143,
-	5, 141, 159, 10, 168, 189, 59, 5, 41, 7, 201, 7, 208, 15, 152, 10,
-	168, 177, 254, 157, 125, 5, 200, 140, 143, 5, 76, 92, 10, 177, 254, 157,
-	125, 5, 172, 145, 5, 200, 200, 177, 252, 41, 15, 24, 109, 143, 5, 141,
-	143, 5, 172, 143, 5, 189, 59, 5, 41, 7, 201, 5, 8, 177, 254, 40,
-	240, 8, 221, 125, 5, 208, 3, 56, 233, 1, 157, 89, 5, 172, 145, 5,
-	177, 252, 72, 41, 3, 168, 185, 229, 5, 157, 131, 5, 104, 74, 74, 74,
-	74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10, 160, 48, 201,
-	13, 240, 4, 24, 105, 50, 168, 185, 233, 5, 157, 137, 5, 96, 216, 165,
-	252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 146, 5, 208, 3,
-	76, 47, 15, 173, 157, 5, 240, 3, 76, 225, 12, 173, 152, 5, 205, 151,
-	5, 176, 3, 76, 206, 12, 173, 150, 5, 240, 3, 76, 158, 11, 162, 5,
-	169, 0, 188, 29, 5, 48, 3, 157, 29, 5, 157, 17, 5, 202, 16, 242,
-	173, 147, 5, 133, 252, 173, 148, 5, 133, 253, 172, 149, 5, 140, 161, 5,
-	204, 159, 5, 208, 25, 173, 160, 5, 240, 20, 173, 149, 5, 172, 158, 5,
-	140, 149, 5, 206, 160, 5, 208, 232, 141, 149, 5, 168, 16, 226, 162, 0,
-	177, 252, 201, 254, 240, 28, 157, 53, 5, 230, 253, 177, 252, 198, 253, 201,
-	254, 240, 15, 157, 56, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144, 224,
-	176, 34, 172, 149, 5, 200, 204, 161, 5, 240, 80, 140, 149, 5, 76, 250,
-	10, 104, 41, 14, 170, 189, 253, 7, 141, 135, 11, 189, 254, 7, 141, 136,
-	11, 76, 129, 11, 172, 149, 5, 177, 252, 16, 57, 201, 255, 240, 53, 74,
-	74, 74, 72, 41, 1, 240, 218, 104, 41, 14, 170, 189, 233, 7, 141, 135,
-	11, 189, 234, 7, 141, 136, 11, 173, 54, 5, 133, 254, 32, 134, 11, 140,
-	149, 5, 192, 85, 176, 5, 204, 161, 5, 208, 179, 172, 161, 5, 140, 149,
-	5, 76, 47, 15, 76, 94, 12, 165, 254, 48, 18, 41, 15, 141, 169, 5,
-	173, 55, 5, 16, 3, 173, 169, 5, 41, 15, 141, 170, 5, 200, 96, 165,
-	254, 48, 250, 41, 1, 141, 184, 5, 200, 96, 173, 179, 5, 48, 20, 206,
-	180, 5, 208, 51, 169, 50, 141, 180, 5, 206, 179, 5, 208, 41, 206, 179,
-	5, 200, 96, 165, 254, 48, 214, 141, 180, 5, 238, 180, 5, 165, 254, 48,
-	204, 141, 180, 5, 238, 180, 5, 173, 55, 5, 141, 179, 5, 16, 5, 169,
-	0, 141, 179, 5, 238, 179, 5, 104, 104, 76, 225, 12, 32, 110, 9, 160,
-	255, 96, 165, 254, 48, 249, 168, 96, 165, 254, 48, 243, 56, 152, 229, 254,
-	168, 96, 165, 254, 48, 233, 24, 152, 101, 254, 168, 96, 165, 254, 48, 223,
-	141, 151, 5, 141, 152, 5, 200, 96, 165, 254, 48, 211, 173, 55, 5, 48,
-	206, 200, 140, 158, 5, 24, 152, 101, 254, 141, 159, 5, 173, 55, 5, 141,
-	160, 5, 192, 84, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239,
-	208, 243, 200, 96, 162, 5, 189, 23, 5, 240, 5, 222, 23, 5, 16, 87,
-	189, 29, 5, 208, 82, 188, 53, 5, 201, 64, 176, 75, 173, 155, 5, 133,
-	252, 173, 156, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177,
-	252, 133, 255, 188, 17, 5, 177, 254, 41, 192, 208, 12, 177, 254, 41, 63,
-	157, 47, 5, 254, 17, 5, 16, 235, 201, 64, 208, 13, 177, 254, 41, 63,
-	188, 47, 5, 32, 150, 9, 76, 190, 12, 201, 128, 208, 10, 177, 254, 41,
-	63, 157, 23, 5, 254, 17, 5, 202, 16, 156, 174, 150, 5, 232, 138, 41,
-	63, 141, 150, 5, 206, 152, 5, 208, 14, 173, 151, 5, 141, 152, 5, 173,
-	150, 5, 208, 3, 238, 149, 5, 172, 89, 5, 173, 59, 5, 41, 7, 201,
-	5, 240, 4, 201, 6, 208, 1, 136, 140, 162, 5, 160, 0, 201, 5, 240,
-	4, 201, 6, 208, 2, 160, 2, 201, 7, 208, 2, 160, 40, 140, 164, 5,
-	172, 92, 5, 173, 62, 5, 41, 7, 201, 5, 240, 4, 201, 6, 208, 1,
-	136, 140, 163, 5, 160, 0, 201, 5, 240, 4, 201, 6, 208, 2, 160, 2,
-	201, 7, 208, 2, 160, 40, 140, 165, 5, 162, 5, 189, 59, 5, 41, 224,
-	157, 65, 5, 189, 101, 5, 133, 252, 189, 71, 5, 133, 253, 189, 41, 5,
-	201, 255, 240, 55, 201, 15, 208, 33, 189, 77, 5, 240, 46, 222, 77, 5,
-	189, 77, 5, 208, 38, 188, 35, 5, 240, 1, 136, 152, 157, 35, 5, 189,
-	119, 5, 157, 77, 5, 136, 76, 133, 13, 189, 41, 5, 74, 168, 177, 252,
-	144, 4, 74, 74, 74, 74, 41, 15, 157, 35, 5, 188, 125, 5, 189, 59,
-	5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 89, 5, 8, 169, 1,
-	40, 208, 2, 10, 10, 61, 83, 5, 240, 12, 188, 89, 5, 192, 255, 208,
-	5, 169, 0, 157, 35, 5, 152, 157, 95, 5, 169, 1, 141, 168, 5, 189,
-	41, 5, 201, 15, 240, 76, 41, 7, 168, 185, 205, 5, 133, 254, 189, 41,
-	5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 6, 168, 185, 107, 5, 37,
-	254, 240, 47, 189, 137, 5, 157, 95, 5, 142, 168, 5, 202, 224, 2, 240,
-	15, 224, 255, 208, 22, 141, 162, 5, 169, 0, 141, 164, 5, 76, 5, 14,
-	173, 140, 5, 141, 163, 5, 169, 0, 141, 165, 5, 232, 189, 131, 5, 157,
-	65, 5, 189, 41, 5, 41, 15, 201, 15, 240, 18, 254, 41, 5, 189, 41,
-	5, 41, 15, 201, 15, 208, 6, 189, 119, 5, 157, 77, 5, 189, 29, 5,
-	16, 10, 189, 35, 5, 208, 5, 169, 64, 157, 29, 5, 254, 83, 5, 160,
-	0, 189, 59, 5, 74, 74, 74, 74, 144, 1, 136, 74, 144, 1, 200, 24,
-	152, 125, 125, 5, 157, 125, 5, 189, 89, 5, 201, 255, 208, 2, 160, 0,
-	24, 152, 125, 89, 5, 157, 89, 5, 202, 48, 3, 76, 53, 13, 32, 123,
-	15, 173, 65, 5, 141, 166, 5, 173, 68, 5, 141, 167, 5, 173, 59, 5,
-	41, 7, 32, 181, 15, 152, 72, 185, 185, 5, 8, 41, 127, 170, 152, 41,
-	3, 10, 168, 224, 3, 208, 3, 76, 196, 14, 189, 173, 5, 208, 39, 189,
-	95, 5, 153, 0, 210, 189, 35, 5, 29, 65, 5, 40, 16, 2, 169, 0,
-	153, 1, 210, 104, 168, 136, 41, 3, 240, 3, 76, 127, 14, 173, 164, 5,
-	141, 8, 210, 76, 228, 14, 40, 76, 173, 14, 173, 173, 5, 208, 23, 173,
-	162, 5, 153, 0, 210, 173, 35, 5, 13, 166, 5, 40, 16, 2, 169, 0,
-	153, 1, 210, 76, 173, 14, 40, 76, 173, 14, 173, 62, 5, 41, 7, 32,
-	181, 15, 152, 72, 185, 185, 5, 8, 41, 127, 170, 152, 41, 3, 10, 168,
-	224, 3, 208, 3, 76, 60, 15, 189, 176, 5, 208, 30, 189, 98, 5, 153,
-	16, 210, 189, 38, 5, 29, 68, 5, 40, 16, 2, 169, 0, 153, 17, 210,
-	104, 168, 136, 41, 3, 240, 7, 76, 236, 14, 40, 76, 26, 15, 173, 165,
-	5, 141, 24, 210, 24, 104, 133, 255, 104, 133, 254, 104, 133, 253, 104, 133,
-	252, 96, 173, 176, 5, 208, 23, 173, 163, 5, 153, 16, 210, 173, 38, 5,
-	13, 167, 5, 40, 16, 2, 169, 0, 153, 17, 210, 76, 26, 15, 40, 76,
-	26, 15, 32, 168, 10, 176, 25, 173, 184, 5, 240, 20, 173, 157, 5, 141,
-	183, 5, 169, 1, 141, 157, 5, 32, 168, 10, 173, 183, 5, 141, 157, 5,
-	96, 173, 169, 5, 10, 10, 10, 10, 141, 171, 5, 173, 170, 5, 10, 10,
-	10, 10, 141, 172, 5, 162, 2, 134, 200, 173, 171, 5, 29, 35, 5, 170,
-	189, 233, 6, 166, 200, 157, 35, 5, 173, 172, 5, 29, 38, 5, 170, 189,
-	233, 6, 166, 200, 157, 38, 5, 202, 16, 221, 96, 168, 185, 13, 8, 168,
-	96 };
-static const unsigned char CiBinaryResource_dlt_obx[2125] = { 255, 255, 0, 4, 70, 12, 255, 241, 228, 215, 203, 192, 181, 170, 161, 152,
-	143, 135, 127, 121, 114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60,
-	56, 53, 50, 47, 44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23,
-	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 255, 241, 228, 215, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143,
-	137, 128, 122, 113, 107, 101, 95, 92, 86, 80, 103, 96, 90, 85, 81, 76,
-	72, 67, 63, 61, 57, 52, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30,
-	28, 27, 25, 0, 22, 21, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2,
-	1, 0, 242, 233, 218, 206, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143,
-	137, 128, 122, 113, 107, 101, 95, 92, 86, 80, 103, 96, 90, 85, 81, 76,
-	72, 67, 63, 61, 57, 52, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30,
-	28, 27, 25, 0, 22, 21, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2,
-	1, 0, 242, 233, 218, 206, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153,
-	142, 135, 127, 120, 115, 108, 102, 97, 90, 85, 81, 75, 72, 67, 63, 60,
-	57, 52, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23,
-	22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 3, 2, 1, 255, 76, 9, 5, 76, 200, 5, 76, 183, 5, 136,
-	140, 54, 3, 169, 126, 141, 53, 3, 162, 6, 142, 51, 3, 162, 1, 142,
-	52, 3, 32, 51, 5, 32, 95, 5, 32, 163, 5, 32, 139, 5, 169, 1,
-	141, 50, 3, 169, 3, 141, 15, 210, 96, 162, 0, 160, 32, 142, 48, 3,
-	140, 49, 3, 160, 0, 173, 48, 3, 153, 0, 2, 173, 49, 3, 153, 64,
-	2, 173, 48, 3, 24, 105, 128, 141, 48, 3, 144, 3, 238, 49, 3, 200,
-	192, 64, 208, 225, 96, 162, 0, 160, 68, 142, 48, 3, 140, 49, 3, 160,
-	0, 173, 48, 3, 153, 128, 2, 173, 49, 3, 153, 160, 2, 173, 48, 3,
-	24, 105, 64, 141, 48, 3, 144, 3, 238, 49, 3, 200, 192, 32, 208, 225,
-	96, 173, 0, 76, 41, 1, 74, 106, 106, 168, 162, 0, 185, 128, 4, 157,
-	64, 4, 200, 232, 224, 64, 208, 244, 96, 160, 3, 169, 0, 153, 40, 3,
-	153, 32, 3, 153, 36, 3, 153, 44, 3, 136, 16, 241, 96, 169, 0, 141,
-	50, 3, 160, 7, 169, 0, 153, 0, 210, 136, 16, 250, 96, 96, 173, 50,
-	3, 240, 250, 173, 40, 3, 13, 41, 3, 13, 42, 3, 13, 43, 3, 141,
-	8, 210, 174, 36, 3, 172, 32, 3, 142, 0, 210, 140, 1, 210, 174, 37,
-	3, 172, 33, 3, 142, 2, 210, 140, 3, 210, 174, 38, 3, 172, 34, 3,
-	142, 4, 210, 140, 5, 210, 174, 39, 3, 172, 35, 3, 142, 6, 210, 140,
-	7, 210, 206, 52, 3, 208, 74, 173, 51, 3, 141, 52, 3, 238, 53, 3,
-	238, 53, 3, 16, 28, 238, 54, 3, 169, 0, 141, 53, 3, 32, 199, 6,
-	173, 4, 3, 13, 5, 3, 13, 6, 3, 13, 7, 3, 208, 3, 76, 183,
-	5, 173, 4, 3, 240, 3, 32, 97, 7, 173, 5, 3, 240, 3, 32, 192,
-	7, 173, 6, 3, 240, 3, 32, 31, 8, 173, 7, 3, 240, 3, 32, 126,
-	8, 173, 4, 3, 240, 8, 173, 44, 3, 240, 3, 32, 221, 8, 173, 5,
-	3, 240, 8, 173, 45, 3, 240, 3, 32, 206, 9, 173, 6, 3, 240, 8,
-	173, 46, 3, 240, 3, 32, 191, 10, 173, 7, 3, 240, 8, 173, 47, 3,
-	240, 3, 32, 131, 11, 96, 192, 67, 144, 14, 169, 0, 141, 4, 3, 141,
-	32, 3, 141, 40, 3, 76, 230, 6, 192, 66, 208, 15, 189, 128, 64, 141,
-	51, 3, 141, 52, 3, 238, 54, 3, 76, 199, 6, 192, 65, 208, 9, 189,
-	128, 64, 141, 54, 3, 76, 199, 6, 104, 104, 76, 183, 5, 174, 54, 3,
-	188, 0, 64, 192, 64, 176, 191, 189, 128, 64, 141, 24, 3, 185, 0, 2,
-	133, 224, 185, 64, 2, 133, 225, 169, 1, 141, 4, 3, 188, 0, 65, 192,
-	64, 176, 78, 189, 128, 65, 141, 25, 3, 185, 0, 2, 133, 226, 185, 64,
-	2, 133, 227, 169, 1, 141, 5, 3, 188, 0, 66, 192, 64, 176, 63, 189,
-	128, 66, 141, 26, 3, 185, 0, 2, 133, 228, 185, 64, 2, 133, 229, 169,
-	1, 141, 6, 3, 188, 0, 67, 192, 64, 176, 48, 189, 128, 67, 141, 27,
-	3, 185, 0, 2, 133, 230, 185, 64, 2, 133, 231, 169, 1, 141, 7, 3,
-	96, 169, 0, 141, 5, 3, 141, 33, 3, 141, 41, 3, 240, 186, 169, 0,
-	141, 6, 3, 141, 34, 3, 141, 42, 3, 240, 201, 169, 0, 141, 7, 3,
-	141, 35, 3, 141, 43, 3, 96, 172, 53, 3, 177, 224, 48, 11, 200, 177,
-	224, 48, 1, 96, 104, 104, 76, 31, 6, 24, 109, 24, 3, 41, 127, 141,
-	8, 3, 169, 15, 141, 0, 3, 141, 44, 3, 200, 177, 224, 170, 189, 160,
-	2, 133, 233, 133, 241, 133, 249, 189, 128, 2, 133, 232, 73, 16, 133, 240,
-	73, 48, 133, 248, 160, 49, 177, 232, 141, 12, 3, 160, 51, 177, 232, 41,
-	127, 141, 16, 3, 169, 0, 141, 20, 3, 141, 28, 3, 160, 48, 177, 232,
-	41, 213, 141, 40, 3, 96, 172, 53, 3, 177, 226, 48, 11, 200, 177, 226,
-	48, 1, 96, 104, 104, 76, 31, 6, 24, 109, 25, 3, 41, 127, 141, 9,
-	3, 169, 15, 141, 1, 3, 141, 45, 3, 200, 177, 226, 170, 189, 160, 2,
-	133, 235, 133, 243, 133, 251, 189, 128, 2, 133, 234, 73, 16, 133, 242, 73,
-	48, 133, 250, 160, 49, 177, 234, 141, 13, 3, 160, 51, 177, 234, 41, 127,
-	141, 17, 3, 169, 0, 141, 21, 3, 141, 29, 3, 160, 48, 177, 234, 41,
-	131, 141, 41, 3, 96, 172, 53, 3, 177, 228, 48, 11, 200, 177, 228, 48,
-	1, 96, 104, 104, 76, 31, 6, 24, 109, 26, 3, 41, 127, 141, 10, 3,
-	169, 15, 141, 2, 3, 141, 46, 3, 200, 177, 228, 170, 189, 160, 2, 133,
-	237, 133, 245, 133, 253, 189, 128, 2, 133, 236, 73, 16, 133, 244, 73, 48,
-	133, 252, 160, 49, 177, 236, 141, 14, 3, 160, 51, 177, 236, 41, 127, 141,
-	18, 3, 169, 0, 141, 22, 3, 141, 30, 3, 160, 48, 177, 236, 41, 169,
-	141, 42, 3, 96, 172, 53, 3, 177, 230, 48, 11, 200, 177, 230, 48, 1,
-	96, 104, 104, 76, 31, 6, 24, 109, 27, 3, 41, 127, 141, 11, 3, 169,
-	15, 141, 3, 3, 141, 47, 3, 200, 177, 230, 170, 189, 160, 2, 133, 239,
-	133, 247, 133, 255, 189, 128, 2, 133, 238, 73, 16, 133, 246, 73, 48, 133,
-	254, 160, 49, 177, 238, 141, 15, 3, 160, 51, 177, 238, 41, 127, 141, 19,
-	3, 169, 0, 141, 23, 3, 141, 31, 3, 160, 48, 177, 238, 41, 129, 141,
-	43, 3, 96, 172, 0, 3, 48, 70, 177, 232, 141, 32, 3, 177, 240, 208,
-	9, 32, 108, 9, 206, 0, 3, 76, 79, 9, 201, 1, 240, 39, 201, 3,
-	208, 16, 173, 8, 3, 24, 113, 248, 170, 173, 28, 3, 141, 55, 3, 76,
-	24, 9, 173, 28, 3, 24, 113, 248, 141, 55, 3, 174, 8, 3, 32, 150,
-	9, 206, 0, 3, 96, 177, 248, 141, 36, 3, 206, 0, 3, 96, 32, 108,
-	9, 160, 49, 177, 232, 240, 30, 206, 12, 3, 240, 3, 76, 79, 9, 173,
-	32, 3, 41, 15, 240, 11, 206, 32, 3, 177, 232, 141, 12, 3, 76, 79,
-	9, 141, 44, 3, 96, 173, 28, 3, 24, 160, 50, 113, 232, 141, 28, 3,
-	206, 16, 3, 208, 12, 238, 20, 3, 160, 51, 177, 232, 41, 127, 141, 16,
-	3, 96, 173, 20, 3, 41, 3, 24, 105, 52, 168, 177, 232, 170, 160, 51,
-	177, 232, 48, 14, 138, 109, 8, 3, 170, 173, 28, 3, 141, 55, 3, 76,
-	150, 9, 138, 109, 28, 3, 141, 55, 3, 174, 8, 3, 189, 0, 4, 24,
-	109, 55, 3, 141, 36, 3, 173, 40, 3, 41, 4, 208, 1, 96, 172, 0,
-	3, 177, 240, 208, 21, 138, 24, 160, 0, 113, 248, 170, 189, 0, 4, 24,
-	109, 55, 3, 24, 105, 255, 141, 38, 3, 96, 173, 36, 3, 24, 105, 255,
-	141, 38, 3, 96, 172, 1, 3, 48, 70, 177, 234, 141, 33, 3, 177, 242,
-	208, 9, 32, 93, 10, 206, 1, 3, 76, 64, 10, 201, 1, 240, 39, 201,
-	3, 208, 16, 173, 9, 3, 24, 113, 250, 170, 173, 29, 3, 141, 55, 3,
-	76, 9, 10, 173, 29, 3, 24, 113, 250, 141, 55, 3, 174, 9, 3, 32,
-	135, 10, 206, 1, 3, 96, 177, 250, 141, 37, 3, 206, 1, 3, 96, 32,
-	93, 10, 160, 49, 177, 234, 240, 30, 206, 13, 3, 240, 3, 76, 64, 10,
-	173, 33, 3, 41, 15, 240, 11, 206, 33, 3, 177, 234, 141, 13, 3, 76,
-	64, 10, 141, 45, 3, 96, 173, 29, 3, 24, 160, 50, 113, 234, 141, 29,
-	3, 206, 17, 3, 208, 12, 238, 21, 3, 160, 51, 177, 234, 41, 127, 141,
-	17, 3, 96, 173, 21, 3, 41, 3, 24, 105, 52, 168, 177, 234, 170, 160,
-	51, 177, 234, 48, 14, 138, 109, 9, 3, 170, 173, 29, 3, 141, 55, 3,
-	76, 135, 10, 138, 109, 29, 3, 141, 55, 3, 174, 9, 3, 189, 0, 4,
-	24, 109, 55, 3, 141, 37, 3, 173, 41, 3, 41, 2, 208, 1, 96, 172,
-	1, 3, 177, 242, 208, 21, 138, 24, 160, 0, 113, 250, 170, 189, 0, 4,
-	24, 109, 55, 3, 24, 105, 255, 141, 39, 3, 96, 173, 37, 3, 24, 105,
-	255, 141, 39, 3, 96, 172, 2, 3, 48, 70, 177, 236, 141, 34, 3, 177,
-	244, 208, 9, 32, 78, 11, 206, 2, 3, 76, 49, 11, 201, 1, 240, 39,
-	201, 3, 208, 16, 173, 10, 3, 24, 113, 252, 170, 173, 30, 3, 141, 55,
-	3, 76, 250, 10, 173, 30, 3, 24, 113, 252, 141, 55, 3, 174, 10, 3,
-	32, 120, 11, 206, 2, 3, 96, 177, 252, 141, 38, 3, 206, 2, 3, 96,
-	32, 78, 11, 160, 49, 177, 236, 240, 30, 206, 14, 3, 240, 3, 76, 49,
-	11, 173, 34, 3, 41, 15, 240, 11, 206, 34, 3, 177, 236, 141, 14, 3,
-	76, 49, 11, 141, 46, 3, 96, 173, 30, 3, 24, 160, 50, 113, 236, 141,
-	30, 3, 206, 18, 3, 208, 12, 238, 22, 3, 160, 51, 177, 236, 41, 127,
-	141, 18, 3, 96, 173, 22, 3, 41, 3, 24, 105, 52, 168, 177, 236, 170,
-	160, 51, 177, 236, 48, 14, 138, 109, 10, 3, 170, 173, 30, 3, 141, 55,
-	3, 76, 120, 11, 138, 109, 30, 3, 141, 55, 3, 174, 10, 3, 189, 0,
-	4, 24, 109, 55, 3, 141, 38, 3, 96, 172, 3, 3, 48, 70, 177, 238,
-	141, 35, 3, 177, 246, 208, 9, 32, 18, 12, 206, 3, 3, 76, 245, 11,
-	201, 1, 240, 39, 201, 3, 208, 16, 173, 11, 3, 24, 113, 254, 170, 173,
-	31, 3, 141, 55, 3, 76, 190, 11, 173, 31, 3, 24, 113, 254, 141, 55,
-	3, 174, 11, 3, 32, 60, 12, 206, 3, 3, 96, 177, 254, 141, 39, 3,
-	206, 3, 3, 96, 32, 18, 12, 160, 49, 177, 238, 240, 30, 206, 15, 3,
-	240, 3, 76, 245, 11, 173, 35, 3, 41, 15, 240, 11, 206, 35, 3, 177,
-	238, 141, 15, 3, 76, 245, 11, 141, 47, 3, 96, 173, 31, 3, 24, 160,
-	50, 113, 238, 141, 31, 3, 206, 19, 3, 208, 12, 238, 23, 3, 160, 51,
-	177, 238, 41, 127, 141, 19, 3, 96, 173, 23, 3, 41, 3, 24, 105, 52,
-	168, 177, 238, 170, 160, 51, 177, 238, 48, 14, 138, 109, 11, 3, 170, 173,
-	31, 3, 141, 55, 3, 76, 60, 12, 138, 109, 31, 3, 141, 55, 3, 174,
-	11, 3, 189, 0, 4, 24, 109, 55, 3, 141, 39, 3, 96 };
-static const unsigned char CiBinaryResource_fc_obx[1220] = { 255, 255, 0, 4, 189, 8, 76, 9, 4, 32, 16, 4, 76, 173, 5, 162,
-	0, 160, 10, 32, 25, 5, 162, 8, 189, 172, 8, 157, 0, 210, 157, 16,
-	210, 202, 16, 244, 96, 133, 244, 162, 0, 134, 230, 134, 232, 134, 234, 169,
-	0, 133, 231, 133, 233, 133, 235, 133, 236, 133, 238, 133, 240, 133, 237, 133,
-	239, 133, 241, 138, 160, 2, 162, 4, 32, 9, 5, 136, 202, 202, 16, 248,
-	162, 4, 32, 160, 4, 202, 202, 16, 249, 169, 255, 197, 230, 240, 34, 197,
-	232, 240, 30, 197, 234, 240, 26, 169, 254, 160, 0, 209, 224, 240, 18, 209,
-	226, 240, 14, 209, 228, 240, 10, 177, 224, 49, 226, 49, 228, 201, 255, 208,
-	207, 162, 4, 32, 153, 4, 202, 202, 16, 249, 166, 230, 228, 232, 176, 2,
-	166, 232, 228, 234, 176, 2, 166, 234, 232, 198, 244, 208, 140, 138, 96, 181,
-	231, 240, 2, 246, 230, 96, 161, 224, 201, 254, 176, 29, 181, 230, 201, 255,
-	240, 23, 181, 237, 208, 17, 161, 224, 201, 64, 144, 28, 208, 3, 32, 196,
-	4, 32, 196, 4, 76, 160, 4, 214, 237, 96, 246, 224, 208, 2, 246, 225,
-	180, 230, 200, 240, 2, 246, 230, 96, 168, 185, 191, 8, 133, 242, 185, 31,
-	9, 133, 243, 180, 231, 246, 231, 177, 242, 201, 64, 144, 22, 201, 96, 144,
-	23, 201, 255, 144, 238, 169, 0, 149, 237, 149, 236, 149, 231, 32, 196, 4,
-	76, 160, 4, 181, 236, 149, 237, 96, 41, 31, 149, 236, 76, 221, 4, 72,
-	24, 121, 159, 9, 149, 224, 169, 0, 121, 162, 9, 149, 225, 104, 96, 134,
-	252, 132, 253, 72, 160, 2, 177, 252, 162, 0, 157, 127, 9, 24, 113, 252,
-	232, 224, 32, 144, 245, 165, 252, 166, 253, 24, 105, 3, 144, 1, 232, 141,
-	159, 9, 142, 162, 9, 232, 141, 160, 9, 142, 163, 9, 232, 141, 161, 9,
-	142, 164, 9, 232, 133, 254, 134, 255, 24, 105, 128, 144, 1, 232, 133, 252,
-	134, 253, 162, 0, 160, 0, 165, 252, 153, 191, 8, 165, 253, 153, 31, 9,
-	161, 252, 230, 252, 208, 2, 230, 253, 201, 255, 208, 244, 200, 192, 64, 144,
-	229, 162, 0, 165, 252, 157, 255, 8, 165, 253, 157, 95, 9, 160, 0, 177,
-	252, 200, 201, 255, 208, 249, 152, 24, 101, 252, 133, 252, 144, 2, 230, 253,
-	232, 224, 32, 144, 222, 104, 240, 3, 32, 31, 4, 141, 190, 8, 169, 64,
-	141, 170, 8, 44, 170, 8, 48, 39, 80, 53, 169, 0, 162, 11, 157, 125,
-	8, 202, 16, 250, 141, 170, 8, 162, 2, 169, 8, 157, 167, 8, 173, 190,
-	8, 157, 122, 8, 202, 16, 242, 169, 80, 141, 180, 8, 76, 233, 5, 169,
-	0, 162, 7, 157, 172, 8, 202, 16, 250, 169, 128, 141, 170, 8, 96, 238,
-	171, 8, 162, 2, 134, 30, 232, 138, 10, 168, 132, 31, 202, 189, 159, 9,
-	133, 28, 189, 162, 9, 133, 29, 189, 128, 8, 240, 3, 76, 240, 6, 188,
-	122, 8, 177, 28, 201, 64, 240, 14, 201, 255, 240, 24, 201, 254, 208, 45,
-	141, 170, 8, 76, 203, 7, 200, 177, 28, 141, 180, 8, 200, 152, 157, 122,
-	8, 76, 9, 6, 173, 190, 8, 157, 122, 8, 169, 80, 141, 180, 8, 169,
-	0, 157, 128, 8, 157, 131, 8, 157, 125, 8, 76, 9, 6, 72, 41, 128,
-	240, 11, 254, 122, 8, 104, 41, 15, 157, 167, 8, 16, 178, 104, 168, 185,
-	191, 8, 133, 28, 185, 31, 9, 133, 29, 189, 131, 8, 157, 128, 8, 169,
-	0, 157, 158, 8, 188, 125, 8, 177, 28, 48, 7, 10, 48, 36, 74, 76,
-	177, 6, 10, 10, 168, 177, 254, 157, 137, 8, 200, 177, 254, 157, 143, 8,
-	200, 177, 254, 157, 146, 8, 200, 177, 254, 157, 149, 8, 254, 125, 8, 76,
-	110, 6, 74, 41, 31, 170, 189, 127, 9, 166, 30, 157, 128, 8, 157, 131,
-	8, 254, 125, 8, 76, 110, 6, 157, 155, 8, 24, 125, 167, 8, 168, 224,
-	0, 208, 15, 185, 242, 7, 141, 172, 8, 185, 50, 8, 141, 174, 8, 76,
-	215, 6, 185, 196, 7, 157, 134, 8, 164, 31, 153, 172, 8, 169, 0, 157,
-	140, 8, 254, 125, 8, 188, 125, 8, 177, 28, 201, 255, 208, 8, 169, 0,
-	157, 125, 8, 254, 122, 8, 189, 137, 8, 168, 185, 255, 8, 141, 6, 7,
-	185, 95, 9, 141, 7, 7, 166, 30, 188, 140, 8, 185, 255, 255, 201, 255,
-	240, 39, 16, 16, 164, 31, 153, 173, 8, 169, 0, 153, 172, 8, 254, 140,
-	8, 76, 148, 7, 164, 31, 254, 140, 8, 29, 143, 8, 153, 173, 8, 224,
-	0, 240, 6, 189, 134, 8, 153, 172, 8, 189, 146, 8, 240, 35, 173, 171,
-	8, 41, 1, 208, 5, 189, 146, 8, 208, 2, 169, 0, 141, 78, 7, 24,
-	189, 155, 8, 105, 2, 125, 167, 8, 168, 185, 196, 7, 164, 31, 153, 172,
-	8, 189, 149, 8, 240, 52, 48, 32, 188, 152, 8, 254, 152, 8, 185, 181,
-	8, 201, 31, 208, 7, 169, 0, 157, 152, 8, 240, 236, 24, 125, 134, 8,
-	164, 31, 153, 172, 8, 76, 148, 7, 189, 134, 8, 201, 255, 240, 11, 254,
-	134, 8, 254, 134, 8, 164, 31, 153, 172, 8, 189, 158, 8, 240, 41, 189,
-	161, 8, 240, 6, 222, 161, 8, 76, 194, 7, 189, 158, 8, 16, 10, 24,
-	189, 134, 8, 125, 164, 8, 76, 186, 7, 56, 189, 134, 8, 253, 164, 8,
-	157, 134, 8, 164, 31, 153, 172, 8, 222, 128, 8, 202, 48, 3, 76, 238,
-	5, 96, 255, 241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120,
-	114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47,
-	44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 23, 22, 19, 15, 7, 0,
-	56, 140, 0, 106, 232, 106, 239, 128, 8, 174, 70, 230, 149, 65, 246, 176,
-	110, 48, 246, 187, 132, 82, 34, 244, 200, 160, 122, 85, 52, 20, 245, 216,
-	189, 164, 141, 119, 96, 78, 56, 39, 21, 6, 247, 232, 219, 207, 195, 184,
-	172, 162, 154, 144, 136, 127, 120, 112, 106, 100, 94, 87, 82, 50, 10, 0,
-	11, 10, 10, 9, 8, 8, 7, 7, 7, 6, 6, 5, 5, 5, 4, 4,
-	4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 0, 0, 1, 1, 0,
-	0, 255, 255, 31 };
-static const unsigned char CiBinaryResource_mpt_obx[2233] = { 255, 255, 0, 5, 178, 13, 76, 205, 11, 173, 46, 7, 208, 1, 96, 169,
-	0, 141, 28, 14, 238, 29, 14, 173, 23, 14, 205, 187, 13, 144, 80, 206,
-	21, 14, 240, 3, 76, 197, 5, 162, 0, 142, 23, 14, 169, 0, 157, 237,
-	13, 157, 245, 13, 189, 179, 13, 133, 236, 189, 183, 13, 133, 237, 172, 22,
-	14, 177, 236, 200, 201, 255, 240, 7, 201, 254, 208, 15, 76, 42, 12, 177,
-	236, 48, 249, 10, 168, 140, 22, 14, 76, 59, 5, 157, 233, 13, 177, 236,
-	157, 213, 13, 232, 224, 4, 208, 196, 200, 140, 22, 14, 76, 197, 5, 206,
-	21, 14, 16, 87, 173, 188, 13, 141, 21, 14, 162, 3, 222, 245, 13, 16,
-	68, 189, 233, 13, 10, 168, 185, 255, 255, 133, 236, 200, 185, 255, 255, 133,
-	237, 5, 236, 240, 48, 189, 237, 13, 141, 31, 14, 32, 62, 7, 172, 31,
-	14, 200, 152, 157, 237, 13, 189, 241, 13, 157, 245, 13, 224, 2, 208, 21,
-	189, 197, 13, 73, 15, 10, 10, 10, 10, 105, 69, 141, 161, 13, 169, 10,
-	105, 0, 141, 162, 13, 202, 16, 180, 238, 23, 14, 162, 1, 173, 27, 14,
-	201, 2, 240, 2, 162, 3, 173, 27, 14, 201, 2, 208, 5, 236, 25, 14,
-	240, 3, 76, 118, 6, 181, 240, 61, 114, 6, 240, 18, 160, 40, 177, 236,
-	24, 125, 225, 13, 32, 117, 9, 56, 125, 1, 14, 157, 203, 13, 202, 16,
-	213, 169, 3, 141, 15, 210, 165, 241, 41, 16, 240, 15, 172, 226, 13, 185,
-	198, 9, 141, 201, 13, 185, 5, 10, 141, 202, 13, 173, 201, 13, 141, 0,
-	210, 173, 202, 13, 141, 2, 210, 173, 203, 13, 141, 4, 210, 173, 204, 13,
-	141, 6, 210, 173, 193, 13, 162, 255, 172, 27, 14, 192, 1, 208, 5, 174,
-	25, 14, 240, 3, 141, 1, 210, 173, 194, 13, 224, 1, 240, 3, 141, 3,
-	210, 192, 2, 240, 20, 173, 195, 13, 224, 2, 240, 3, 141, 5, 210, 173,
-	196, 13, 224, 3, 240, 3, 141, 7, 210, 165, 240, 5, 241, 5, 242, 5,
-	243, 13, 28, 14, 141, 8, 210, 96, 4, 2, 0, 0, 189, 217, 13, 133,
-	236, 189, 221, 13, 133, 237, 5, 236, 208, 8, 157, 193, 13, 149, 240, 76,
-	248, 5, 180, 244, 192, 32, 240, 66, 177, 236, 56, 253, 197, 13, 44, 58,
-	7, 240, 2, 41, 240, 157, 193, 13, 200, 177, 236, 141, 30, 14, 200, 148,
-	244, 41, 7, 240, 60, 168, 185, 126, 9, 141, 203, 6, 185, 133, 9, 141,
-	204, 6, 173, 30, 14, 74, 74, 74, 74, 74, 9, 40, 168, 177, 236, 24,
-	32, 255, 255, 169, 0, 149, 240, 76, 248, 5, 189, 9, 14, 240, 18, 222,
-	13, 14, 208, 13, 157, 13, 14, 189, 193, 13, 41, 15, 240, 3, 222, 193,
-	13, 160, 35, 177, 236, 149, 240, 189, 17, 14, 24, 105, 37, 168, 41, 3,
-	157, 17, 14, 136, 177, 236, 125, 209, 13, 157, 225, 13, 32, 119, 9, 157,
-	201, 13, 189, 5, 14, 240, 6, 222, 5, 14, 76, 223, 5, 189, 189, 13,
-	141, 30, 7, 16, 254, 76, 194, 8, 0, 76, 229, 8, 0, 76, 251, 8,
-	0, 76, 21, 9, 0, 76, 37, 9, 0, 76, 56, 9, 0, 76, 66, 9,
-	16, 76, 72, 9, 169, 0, 157, 197, 13, 172, 31, 14, 136, 200, 177, 236,
-	201, 254, 208, 4, 140, 31, 14, 96, 201, 224, 144, 8, 173, 187, 13, 141,
-	23, 14, 208, 233, 201, 208, 144, 10, 41, 15, 141, 188, 13, 141, 21, 14,
-	16, 219, 201, 192, 144, 9, 41, 15, 73, 15, 157, 197, 13, 16, 206, 201,
-	128, 144, 7, 41, 63, 157, 241, 13, 16, 195, 201, 64, 144, 27, 200, 140,
-	31, 14, 41, 31, 157, 229, 13, 10, 168, 185, 255, 255, 157, 217, 13, 200,
-	185, 255, 255, 157, 221, 13, 76, 62, 7, 140, 31, 14, 141, 30, 14, 24,
-	125, 213, 13, 157, 209, 13, 173, 27, 14, 240, 66, 201, 2, 240, 58, 189,
-	229, 13, 201, 31, 208, 55, 173, 30, 14, 56, 233, 1, 41, 15, 168, 177,
-	254, 133, 253, 152, 9, 16, 168, 177, 254, 133, 248, 160, 1, 5, 253, 208,
-	2, 160, 0, 140, 26, 14, 169, 0, 133, 252, 157, 217, 13, 157, 221, 13,
-	138, 10, 141, 24, 14, 142, 25, 14, 96, 224, 2, 176, 99, 189, 217, 13,
-	133, 238, 189, 221, 13, 133, 239, 5, 238, 240, 74, 160, 32, 177, 238, 41,
-	15, 157, 249, 13, 177, 238, 41, 112, 74, 74, 157, 189, 13, 200, 177, 238,
-	10, 10, 72, 41, 63, 157, 5, 14, 104, 41, 192, 157, 205, 13, 200, 177,
-	238, 157, 9, 14, 157, 13, 14, 169, 0, 149, 244, 157, 17, 14, 157, 253,
-	13, 157, 1, 14, 189, 209, 13, 157, 225, 13, 32, 117, 9, 157, 201, 13,
-	236, 25, 14, 240, 1, 96, 160, 255, 140, 25, 14, 200, 140, 26, 14, 96,
-	224, 2, 208, 51, 172, 211, 13, 185, 69, 11, 141, 121, 13, 185, 129, 11,
-	141, 127, 13, 169, 0, 133, 249, 133, 250, 173, 231, 13, 41, 15, 168, 177,
-	254, 133, 251, 152, 9, 16, 168, 177, 254, 141, 137, 13, 5, 251, 208, 6,
-	141, 121, 13, 141, 127, 13, 96, 173, 232, 13, 41, 15, 168, 177, 254, 133,
-	253, 152, 9, 16, 168, 177, 254, 5, 253, 240, 15, 177, 254, 56, 229, 253,
-	133, 248, 169, 0, 133, 252, 169, 141, 208, 2, 169, 173, 141, 97, 13, 141,
-	56, 13, 169, 24, 141, 7, 210, 96, 173, 29, 14, 41, 7, 74, 74, 144,
-	18, 208, 24, 189, 249, 13, 24, 157, 1, 14, 125, 201, 13, 157, 201, 13,
-	76, 223, 5, 169, 0, 157, 1, 14, 76, 223, 5, 189, 201, 13, 56, 253,
-	249, 13, 157, 201, 13, 56, 169, 0, 253, 249, 13, 157, 1, 14, 76, 223,
-	5, 189, 253, 13, 24, 157, 1, 14, 125, 201, 13, 157, 201, 13, 24, 189,
-	253, 13, 125, 249, 13, 157, 253, 13, 76, 223, 5, 189, 225, 13, 56, 253,
-	253, 13, 157, 225, 13, 32, 117, 9, 76, 5, 9, 169, 0, 56, 253, 253,
-	13, 157, 1, 14, 189, 201, 13, 56, 253, 253, 13, 76, 5, 9, 189, 225,
-	13, 24, 125, 253, 13, 76, 28, 9, 32, 85, 9, 76, 208, 8, 32, 85,
-	9, 24, 125, 225, 13, 32, 155, 9, 76, 223, 5, 188, 253, 13, 189, 249,
-	13, 48, 2, 200, 200, 136, 152, 157, 253, 13, 221, 249, 13, 208, 8, 189,
-	249, 13, 73, 255, 157, 249, 13, 189, 253, 13, 96, 41, 63, 29, 205, 13,
-	168, 185, 255, 255, 96, 148, 145, 152, 165, 173, 180, 192, 9, 9, 9, 9,
-	9, 9, 9, 64, 0, 32, 0, 125, 201, 13, 157, 201, 13, 96, 125, 209,
-	13, 157, 225, 13, 32, 117, 9, 157, 201, 13, 96, 157, 201, 13, 189, 141,
-	9, 16, 12, 157, 201, 13, 169, 128, 208, 5, 157, 201, 13, 169, 1, 13,
-	28, 14, 141, 28, 14, 96, 45, 10, 210, 157, 201, 13, 96, 242, 51, 150,
-	226, 56, 140, 0, 106, 232, 106, 239, 128, 8, 174, 70, 230, 149, 65, 246,
-	176, 110, 48, 246, 187, 132, 82, 34, 244, 200, 160, 122, 85, 52, 20, 245,
-	216, 189, 164, 141, 119, 96, 78, 56, 39, 21, 6, 247, 232, 219, 207, 195,
-	184, 172, 162, 154, 144, 136, 127, 120, 112, 106, 100, 94, 13, 13, 12, 11,
-	11, 10, 10, 9, 8, 8, 7, 7, 7, 6, 6, 5, 5, 5, 4, 4,
-	4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 24, 24, 24, 24,
-	24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 22, 22, 23, 23, 23,
-	23, 24, 24, 24, 24, 24, 25, 25, 25, 25, 26, 21, 21, 22, 22, 22,
-	23, 23, 24, 24, 24, 25, 25, 26, 26, 26, 27, 20, 21, 21, 22, 22,
-	23, 23, 24, 24, 24, 25, 25, 26, 26, 27, 27, 20, 20, 21, 21, 22,
-	22, 23, 23, 24, 25, 25, 26, 26, 27, 27, 28, 19, 20, 20, 21, 22,
-	22, 23, 23, 24, 25, 25, 26, 26, 27, 28, 28, 19, 19, 20, 21, 21,
-	22, 23, 23, 24, 25, 25, 26, 27, 27, 28, 29, 18, 19, 20, 20, 21,
-	22, 23, 23, 24, 25, 25, 26, 27, 28, 28, 29, 18, 19, 19, 20, 21,
-	22, 22, 23, 24, 25, 26, 26, 27, 28, 29, 29, 18, 18, 19, 20, 21,
-	22, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, 17, 18, 19, 20, 21,
-	22, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, 17, 18, 19, 20, 21,
-	21, 22, 23, 24, 25, 26, 27, 27, 28, 29, 30, 17, 18, 19, 20, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 28, 29, 30, 17, 18, 19, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 29, 29, 30, 17, 18, 18, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 30, 16, 17, 18, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 34, 36, 38, 41,
-	43, 46, 48, 51, 55, 58, 61, 65, 69, 73, 77, 82, 87, 92, 97, 103,
-	110, 116, 123, 130, 138, 146, 155, 164, 174, 184, 195, 207, 220, 233, 246, 5,
-	21, 37, 55, 73, 93, 113, 135, 159, 184, 210, 237, 11, 42, 75, 110, 147,
-	186, 227, 15, 62, 112, 164, 219, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3,
-	3, 3, 3, 229, 42, 64, 89, 100, 238, 8, 166, 11, 12, 12, 12, 12,
-	12, 13, 13, 142, 50, 7, 140, 54, 7, 41, 7, 168, 185, 189, 11, 141,
-	227, 11, 185, 197, 11, 141, 228, 11, 76, 255, 255, 173, 54, 7, 174, 50,
-	7, 141, 148, 7, 141, 155, 7, 142, 149, 7, 142, 156, 7, 24, 105, 64,
-	141, 129, 5, 141, 135, 5, 144, 1, 232, 142, 130, 5, 142, 136, 5, 24,
-	105, 128, 141, 124, 9, 144, 1, 232, 142, 125, 9, 232, 141, 31, 12, 142,
-	32, 12, 162, 9, 189, 255, 255, 157, 179, 13, 202, 16, 247, 206, 188, 13,
-	169, 0, 141, 46, 7, 162, 98, 157, 189, 13, 202, 16, 250, 162, 8, 157,
-	0, 210, 202, 16, 250, 96, 32, 42, 12, 173, 50, 7, 10, 141, 22, 14,
-	173, 187, 13, 141, 23, 14, 169, 1, 141, 21, 14, 141, 46, 7, 96, 173,
-	54, 7, 133, 254, 173, 50, 7, 133, 255, 96, 173, 54, 7, 41, 3, 170,
-	173, 50, 7, 32, 198, 7, 173, 26, 14, 240, 238, 14, 54, 7, 32, 190,
-	12, 169, 1, 141, 27, 14, 173, 26, 14, 240, 222, 201, 1, 208, 5, 160,
-	0, 238, 26, 14, 177, 252, 174, 24, 14, 74, 74, 74, 74, 9, 16, 141,
-	10, 212, 141, 10, 212, 157, 1, 210, 177, 252, 9, 16, 141, 10, 212, 141,
-	10, 212, 157, 1, 210, 200, 208, 206, 230, 253, 165, 253, 197, 248, 208, 198,
-	140, 26, 14, 96, 144, 21, 169, 234, 141, 153, 12, 141, 154, 12, 141, 155,
-	12, 141, 166, 12, 141, 167, 12, 141, 168, 12, 96, 169, 141, 141, 153, 12,
-	141, 166, 12, 169, 10, 141, 154, 12, 141, 167, 12, 169, 212, 141, 155, 12,
-	141, 168, 12, 96, 169, 0, 141, 26, 14, 173, 50, 7, 74, 32, 190, 12,
-	169, 1, 141, 27, 14, 32, 128, 12, 173, 27, 14, 208, 248, 96, 169, 2,
-	141, 27, 14, 141, 25, 14, 169, 24, 141, 7, 210, 169, 17, 133, 250, 169,
-	13, 133, 251, 169, 173, 141, 97, 13, 141, 56, 13, 160, 0, 140, 121, 13,
-	140, 127, 13, 174, 11, 212, 177, 252, 74, 74, 74, 74, 9, 16, 141, 7,
-	210, 32, 117, 13, 236, 11, 212, 240, 251, 141, 5, 210, 174, 11, 212, 177,
-	252, 230, 252, 208, 16, 230, 253, 198, 248, 208, 10, 169, 173, 141, 97, 13,
-	141, 56, 13, 169, 8, 9, 16, 141, 7, 210, 32, 117, 13, 236, 11, 212,
-	240, 251, 141, 5, 210, 173, 27, 14, 208, 185, 96, 24, 165, 249, 105, 0,
-	133, 249, 165, 250, 105, 0, 133, 250, 144, 15, 230, 251, 165, 251, 201, 0,
-	208, 7, 140, 121, 13, 140, 127, 13, 96, 177, 250, 36, 249, 48, 4, 74,
-	74, 74, 74, 41, 15, 168, 185, 69, 10, 160, 0, 96, 160, 0, 140, 27,
-	14, 140, 26, 14, 136, 140, 25, 14, 96 };
-static const unsigned char CiBinaryResource_rmt4_obx[2007] = { 255, 255, 144, 3, 96, 11, 128, 0, 128, 32, 128, 64, 0, 192, 128, 128,
-	128, 160, 0, 192, 64, 192, 0, 1, 5, 11, 21, 0, 1, 255, 255, 1,
-	1, 0, 255, 255, 0, 1, 1, 1, 0, 255, 255, 255, 255, 0, 1, 1,
-	0, 0, 0, 0, 0, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232, 106,
-	239, 128, 8, 174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82,
-	34, 244, 200, 160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78,
-	56, 39, 21, 6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127,
-	120, 112, 106, 100, 94, 0, 191, 182, 170, 161, 152, 143, 137, 128, 242, 230,
-	218, 206, 191, 182, 170, 161, 152, 143, 137, 128, 122, 113, 107, 101, 95, 92,
-	86, 80, 77, 71, 68, 62, 60, 56, 53, 50, 47, 45, 42, 40, 37, 35,
-	33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15, 14, 13,
-	12, 11, 10, 9, 8, 7, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153,
-	142, 135, 127, 121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63, 60,
-	57, 55, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23,
-	22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 3, 2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153, 144,
-	136, 128, 121, 114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60, 57,
-	53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22,
-	20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5,
-	4, 3, 2, 1, 0, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8, 8,
-	7, 7, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3,
-	3, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
-	1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-	1, 1, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2,
-	2, 2, 2, 3, 3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-	3, 3, 3, 3, 4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
-	3, 4, 4, 4, 5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4,
-	4, 4, 5, 5, 6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4,
-	5, 5, 6, 6, 7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
-	5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5,
-	6, 7, 7, 8, 8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6,
-	7, 7, 8, 9, 9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7,
-	7, 8, 9, 10, 10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7,
-	8, 9, 10, 10, 11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8,
-	9, 10, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8,
-	9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-	10, 11, 12, 13, 14, 15, 76, 15, 6, 76, 252, 7, 76, 33, 8, 76,
-	88, 6, 76, 43, 11, 134, 211, 132, 212, 72, 160, 168, 169, 0, 153, 127,
-	2, 136, 208, 250, 160, 4, 177, 211, 141, 21, 8, 200, 177, 211, 141, 36,
-	3, 200, 177, 211, 141, 5, 8, 141, 38, 3, 160, 8, 177, 211, 153, 195,
-	0, 200, 192, 16, 208, 246, 104, 72, 10, 10, 24, 101, 209, 133, 209, 104,
-	8, 41, 192, 10, 42, 42, 40, 101, 210, 133, 210, 32, 110, 6, 169, 0,
-	141, 8, 210, 160, 3, 140, 15, 210, 160, 8, 153, 0, 210, 136, 16, 250,
-	173, 5, 8, 96, 162, 0, 142, 39, 3, 138, 168, 177, 209, 201, 254, 176,
-	45, 168, 177, 205, 157, 128, 2, 177, 207, 157, 132, 2, 169, 0, 157, 136,
-	2, 169, 1, 157, 140, 2, 169, 128, 157, 180, 2, 232, 224, 4, 208, 217,
-	165, 209, 24, 105, 4, 133, 209, 144, 27, 230, 210, 76, 190, 6, 240, 4,
-	169, 0, 240, 223, 160, 2, 177, 209, 170, 200, 177, 209, 133, 210, 134, 209,
-	162, 0, 240, 181, 173, 36, 3, 141, 22, 7, 162, 255, 232, 222, 140, 2,
-	208, 69, 189, 128, 2, 133, 211, 189, 132, 2, 133, 212, 188, 136, 2, 254,
-	136, 2, 177, 211, 133, 217, 41, 63, 201, 61, 240, 17, 176, 56, 157, 144,
-	2, 157, 16, 3, 200, 177, 211, 74, 41, 126, 157, 180, 2, 169, 1, 157,
-	140, 2, 188, 136, 2, 254, 136, 2, 177, 211, 74, 102, 217, 74, 102, 217,
-	165, 217, 41, 240, 157, 148, 2, 224, 3, 208, 177, 169, 255, 141, 36, 3,
-	141, 37, 3, 76, 101, 7, 201, 63, 240, 27, 165, 217, 41, 192, 240, 9,
-	10, 42, 42, 157, 140, 2, 76, 17, 7, 200, 177, 211, 157, 140, 2, 254,
-	136, 2, 76, 17, 7, 165, 217, 48, 12, 200, 177, 211, 141, 22, 7, 254,
-	136, 2, 76, 214, 6, 201, 255, 240, 9, 200, 177, 211, 157, 136, 2, 76,
-	214, 6, 76, 110, 6, 76, 33, 8, 202, 48, 250, 188, 180, 2, 48, 248,
-	177, 203, 157, 184, 2, 133, 215, 200, 177, 203, 157, 188, 2, 133, 216, 169,
-	1, 157, 20, 3, 168, 177, 215, 157, 4, 3, 200, 177, 215, 157, 196, 2,
-	200, 177, 215, 157, 200, 2, 200, 177, 215, 157, 240, 2, 41, 63, 157, 8,
-	3, 177, 215, 41, 64, 157, 244, 2, 200, 177, 215, 157, 32, 3, 200, 177,
-	215, 157, 208, 2, 200, 177, 215, 157, 216, 2, 200, 177, 215, 157, 220, 2,
-	200, 177, 215, 168, 185, 160, 3, 157, 224, 2, 157, 228, 2, 185, 161, 3,
-	157, 232, 2, 160, 10, 177, 215, 157, 236, 2, 169, 128, 157, 212, 2, 157,
-	180, 2, 10, 157, 204, 2, 157, 156, 2, 168, 177, 215, 157, 0, 3, 105,
-	0, 157, 192, 2, 169, 12, 157, 252, 2, 168, 177, 215, 157, 248, 2, 76,
-	98, 7, 32, 43, 11, 206, 38, 3, 208, 29, 169, 255, 141, 38, 3, 206,
-	37, 3, 208, 19, 238, 39, 3, 173, 39, 3, 201, 255, 240, 3, 76, 190,
-	6, 76, 110, 6, 76, 95, 10, 169, 4, 133, 214, 162, 3, 189, 188, 2,
-	240, 242, 133, 212, 189, 184, 2, 133, 211, 188, 192, 2, 177, 211, 133, 217,
-	200, 177, 211, 133, 218, 200, 177, 211, 133, 219, 200, 152, 221, 196, 2, 144,
-	10, 240, 8, 169, 128, 157, 204, 2, 189, 200, 2, 157, 192, 2, 165, 217,
-	41, 15, 29, 148, 2, 168, 185, 0, 5, 133, 220, 165, 218, 41, 14, 168,
-	185, 144, 3, 133, 213, 165, 220, 25, 145, 3, 157, 28, 3, 189, 220, 2,
-	240, 40, 201, 1, 208, 33, 189, 156, 2, 24, 125, 236, 2, 24, 188, 224,
-	2, 121, 165, 3, 157, 156, 2, 200, 152, 221, 232, 2, 208, 3, 189, 228,
-	2, 157, 224, 2, 76, 164, 8, 222, 220, 2, 188, 0, 3, 192, 13, 144,
-	60, 189, 8, 3, 16, 49, 152, 221, 252, 2, 208, 8, 189, 4, 3, 157,
-	252, 2, 208, 3, 254, 252, 2, 189, 184, 2, 133, 215, 189, 188, 2, 133,
-	216, 188, 252, 2, 177, 215, 188, 244, 2, 240, 4, 24, 125, 248, 2, 157,
-	248, 2, 189, 240, 2, 41, 63, 56, 233, 1, 157, 8, 3, 189, 204, 2,
-	16, 31, 189, 148, 2, 240, 26, 221, 216, 2, 240, 21, 144, 19, 168, 189,
-	212, 2, 24, 125, 208, 2, 157, 212, 2, 144, 6, 152, 233, 16, 157, 148,
-	2, 169, 0, 133, 221, 165, 218, 157, 12, 3, 41, 112, 74, 74, 141, 28,
-	9, 144, 254, 76, 210, 9, 234, 76, 60, 9, 234, 76, 65, 9, 234, 76,
-	75, 9, 234, 76, 87, 9, 234, 76, 102, 9, 234, 76, 169, 9, 234, 76,
-	184, 9, 165, 219, 76, 21, 10, 165, 219, 133, 221, 189, 144, 2, 76, 216,
-	9, 189, 144, 2, 24, 101, 219, 157, 144, 2, 76, 216, 9, 189, 156, 2,
-	24, 101, 219, 157, 156, 2, 189, 144, 2, 76, 216, 9, 189, 240, 2, 16,
-	12, 188, 144, 2, 177, 213, 24, 125, 248, 2, 76, 135, 9, 189, 144, 2,
-	24, 125, 248, 2, 201, 61, 144, 2, 169, 63, 168, 177, 213, 157, 160, 2,
-	164, 219, 208, 3, 157, 164, 2, 152, 74, 74, 74, 74, 157, 168, 2, 157,
-	172, 2, 165, 219, 41, 15, 157, 176, 2, 189, 144, 2, 76, 216, 9, 165,
-	219, 24, 125, 20, 3, 157, 20, 3, 189, 144, 2, 76, 216, 9, 165, 219,
-	201, 128, 240, 6, 157, 144, 2, 76, 216, 9, 189, 28, 3, 9, 240, 157,
-	28, 3, 189, 144, 2, 76, 216, 9, 189, 144, 2, 24, 101, 219, 188, 240,
-	2, 48, 31, 24, 125, 248, 2, 201, 61, 144, 7, 169, 0, 157, 28, 3,
-	169, 63, 157, 16, 3, 168, 177, 213, 24, 125, 156, 2, 24, 101, 221, 76,
-	21, 10, 201, 61, 144, 7, 169, 0, 157, 28, 3, 169, 63, 168, 189, 156,
-	2, 24, 125, 248, 2, 24, 113, 213, 24, 101, 221, 157, 24, 3, 189, 172,
-	2, 240, 50, 222, 172, 2, 208, 45, 189, 168, 2, 157, 172, 2, 189, 164,
-	2, 221, 160, 2, 240, 31, 176, 13, 125, 176, 2, 176, 18, 221, 160, 2,
-	176, 13, 76, 76, 10, 253, 176, 2, 144, 5, 221, 160, 2, 176, 3, 189,
-	160, 2, 157, 164, 2, 165, 218, 41, 1, 240, 10, 189, 164, 2, 24, 125,
-	156, 2, 157, 24, 3, 202, 48, 3, 76, 39, 8, 173, 32, 3, 13, 33,
-	3, 13, 34, 3, 13, 35, 3, 170, 142, 44, 11, 173, 12, 3, 16, 33,
-	173, 28, 3, 41, 15, 240, 26, 173, 24, 3, 24, 109, 20, 3, 141, 26,
-	3, 173, 30, 3, 41, 16, 208, 5, 169, 0, 141, 30, 3, 138, 9, 4,
-	170, 173, 13, 3, 16, 33, 173, 29, 3, 41, 15, 240, 26, 173, 25, 3,
-	24, 109, 21, 3, 141, 27, 3, 173, 31, 3, 41, 16, 208, 5, 169, 0,
-	141, 31, 3, 138, 9, 2, 170, 236, 44, 11, 208, 94, 173, 13, 3, 41,
-	14, 201, 6, 208, 38, 173, 29, 3, 41, 15, 240, 31, 172, 17, 3, 185,
-	192, 3, 141, 24, 3, 185, 192, 4, 141, 25, 3, 173, 28, 3, 41, 16,
-	208, 5, 169, 0, 141, 28, 3, 138, 9, 80, 170, 173, 15, 3, 41, 14,
-	201, 6, 208, 38, 173, 31, 3, 41, 15, 240, 31, 172, 19, 3, 185, 192,
-	3, 141, 26, 3, 185, 192, 4, 141, 27, 3, 173, 30, 3, 41, 16, 208,
-	5, 169, 0, 141, 30, 3, 138, 9, 40, 170, 142, 44, 11, 173, 38, 3,
-	96, 160, 255, 173, 24, 3, 174, 28, 3, 141, 0, 210, 142, 1, 210, 173,
-	25, 3, 174, 29, 3, 141, 2, 210, 142, 3, 210, 173, 26, 3, 174, 30,
-	3, 141, 4, 210, 142, 5, 210, 173, 27, 3, 174, 31, 3, 141, 6, 210,
-	142, 7, 210, 140, 8, 210, 96 };
-static const unsigned char CiBinaryResource_rmt8_obx[2275] = { 255, 255, 144, 3, 108, 12, 128, 0, 128, 32, 128, 64, 0, 192, 128, 128,
-	128, 160, 0, 192, 64, 192, 0, 1, 5, 11, 21, 0, 1, 255, 255, 1,
-	1, 0, 255, 255, 0, 1, 1, 1, 0, 255, 255, 255, 255, 0, 1, 1,
-	0, 0, 0, 0, 0, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232, 106,
-	239, 128, 8, 174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82,
-	34, 244, 200, 160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78,
-	56, 39, 21, 6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127,
-	120, 112, 106, 100, 94, 0, 191, 182, 170, 161, 152, 143, 137, 128, 242, 230,
-	218, 206, 191, 182, 170, 161, 152, 143, 137, 128, 122, 113, 107, 101, 95, 92,
-	86, 80, 77, 71, 68, 62, 60, 56, 53, 50, 47, 45, 42, 40, 37, 35,
-	33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15, 14, 13,
-	12, 11, 10, 9, 8, 7, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153,
-	142, 135, 127, 121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63, 60,
-	57, 55, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23,
-	22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 3, 2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153, 144,
-	136, 128, 121, 114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60, 57,
-	53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22,
-	20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5,
-	4, 3, 2, 1, 0, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8, 8,
-	7, 7, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3,
-	3, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
-	1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-	1, 1, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2,
-	2, 2, 2, 3, 3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-	3, 3, 3, 3, 4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
-	3, 4, 4, 4, 5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4,
-	4, 4, 5, 5, 6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4,
-	5, 5, 6, 6, 7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
-	5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5,
-	6, 7, 7, 8, 8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6,
-	7, 7, 8, 9, 9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7,
-	7, 8, 9, 10, 10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7,
-	8, 9, 10, 10, 11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8,
-	9, 10, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8,
-	9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-	10, 11, 12, 13, 14, 15, 76, 15, 6, 76, 9, 8, 76, 46, 8, 76,
-	92, 6, 76, 2, 12, 134, 211, 132, 212, 72, 160, 0, 152, 153, 0, 2,
-	153, 76, 2, 200, 208, 247, 160, 4, 177, 211, 141, 34, 8, 200, 177, 211,
-	141, 72, 3, 200, 177, 211, 141, 18, 8, 141, 74, 3, 160, 8, 177, 211,
-	153, 195, 0, 200, 192, 16, 208, 246, 104, 72, 10, 10, 10, 24, 101, 209,
-	133, 209, 104, 8, 41, 224, 10, 42, 42, 42, 40, 101, 210, 133, 210, 32,
-	123, 6, 169, 0, 141, 8, 210, 141, 24, 210, 160, 3, 140, 15, 210, 140,
-	31, 210, 160, 8, 153, 0, 210, 153, 16, 210, 136, 16, 247, 173, 18, 8,
-	96, 162, 0, 142, 75, 3, 138, 168, 177, 209, 201, 254, 176, 45, 168, 177,
-	205, 157, 0, 2, 177, 207, 157, 8, 2, 169, 0, 157, 16, 2, 169, 1,
-	157, 24, 2, 169, 128, 157, 104, 2, 232, 224, 8, 208, 217, 165, 209, 24,
-	105, 8, 133, 209, 144, 27, 230, 210, 76, 203, 6, 240, 4, 169, 0, 240,
-	223, 160, 2, 177, 209, 170, 200, 177, 209, 133, 210, 134, 209, 162, 0, 240,
-	181, 173, 72, 3, 141, 35, 7, 162, 255, 232, 222, 24, 2, 208, 69, 189,
-	0, 2, 133, 211, 189, 8, 2, 133, 212, 188, 16, 2, 254, 16, 2, 177,
-	211, 133, 217, 41, 63, 201, 61, 240, 17, 176, 56, 157, 32, 2, 157, 32,
-	3, 200, 177, 211, 74, 41, 126, 157, 104, 2, 169, 1, 157, 24, 2, 188,
-	16, 2, 254, 16, 2, 177, 211, 74, 102, 217, 74, 102, 217, 165, 217, 41,
-	240, 157, 40, 2, 224, 7, 208, 177, 169, 255, 141, 72, 3, 141, 73, 3,
-	76, 114, 7, 201, 63, 240, 27, 165, 217, 41, 192, 240, 9, 10, 42, 42,
-	157, 24, 2, 76, 30, 7, 200, 177, 211, 157, 24, 2, 254, 16, 2, 76,
-	30, 7, 165, 217, 48, 12, 200, 177, 211, 141, 35, 7, 254, 16, 2, 76,
-	227, 6, 201, 255, 240, 9, 200, 177, 211, 157, 16, 2, 76, 227, 6, 76,
-	123, 6, 76, 46, 8, 202, 48, 250, 188, 104, 2, 48, 248, 177, 203, 157,
-	112, 2, 133, 215, 200, 177, 203, 157, 120, 2, 133, 216, 169, 1, 157, 40,
-	3, 168, 177, 215, 157, 8, 3, 200, 177, 215, 157, 136, 2, 200, 177, 215,
-	157, 144, 2, 200, 177, 215, 157, 224, 2, 41, 63, 157, 16, 3, 177, 215,
-	41, 64, 157, 232, 2, 200, 177, 215, 157, 64, 3, 200, 177, 215, 157, 160,
-	2, 200, 177, 215, 157, 176, 2, 200, 177, 215, 157, 184, 2, 200, 177, 215,
-	168, 185, 160, 3, 157, 192, 2, 157, 200, 2, 185, 161, 3, 157, 208, 2,
-	160, 10, 177, 215, 157, 216, 2, 169, 128, 157, 168, 2, 157, 104, 2, 10,
-	157, 152, 2, 157, 56, 2, 168, 177, 215, 157, 0, 3, 105, 0, 157, 128,
-	2, 169, 12, 157, 248, 2, 168, 177, 215, 157, 240, 2, 76, 111, 7, 32,
-	2, 12, 206, 74, 3, 208, 29, 169, 255, 141, 74, 3, 206, 73, 3, 208,
-	19, 238, 75, 3, 173, 75, 3, 201, 255, 240, 3, 76, 203, 6, 76, 123,
-	6, 76, 116, 10, 169, 4, 133, 214, 162, 7, 189, 120, 2, 240, 242, 133,
-	212, 189, 112, 2, 133, 211, 188, 128, 2, 177, 211, 133, 217, 200, 177, 211,
-	133, 218, 200, 177, 211, 133, 219, 200, 152, 221, 136, 2, 144, 10, 240, 8,
-	169, 128, 157, 152, 2, 189, 144, 2, 157, 128, 2, 165, 217, 224, 4, 144,
-	4, 74, 74, 74, 74, 41, 15, 29, 40, 2, 168, 185, 0, 5, 133, 220,
-	165, 218, 41, 14, 168, 185, 144, 3, 133, 213, 165, 220, 25, 145, 3, 157,
-	56, 3, 189, 184, 2, 240, 40, 201, 1, 208, 33, 189, 56, 2, 24, 125,
-	216, 2, 24, 188, 192, 2, 121, 165, 3, 157, 56, 2, 200, 152, 221, 208,
-	2, 208, 3, 189, 200, 2, 157, 192, 2, 76, 185, 8, 222, 184, 2, 188,
-	0, 3, 192, 13, 144, 60, 189, 16, 3, 16, 49, 152, 221, 248, 2, 208,
-	8, 189, 8, 3, 157, 248, 2, 208, 3, 254, 248, 2, 189, 112, 2, 133,
-	215, 189, 120, 2, 133, 216, 188, 248, 2, 177, 215, 188, 232, 2, 240, 4,
-	24, 125, 240, 2, 157, 240, 2, 189, 224, 2, 41, 63, 56, 233, 1, 157,
-	16, 3, 189, 152, 2, 16, 31, 189, 40, 2, 240, 26, 221, 176, 2, 240,
-	21, 144, 19, 168, 189, 168, 2, 24, 125, 160, 2, 157, 168, 2, 144, 6,
-	152, 233, 16, 157, 40, 2, 169, 0, 133, 221, 165, 218, 157, 24, 3, 41,
-	112, 74, 74, 141, 49, 9, 144, 254, 76, 231, 9, 234, 76, 81, 9, 234,
-	76, 86, 9, 234, 76, 96, 9, 234, 76, 108, 9, 234, 76, 123, 9, 234,
-	76, 190, 9, 234, 76, 205, 9, 165, 219, 76, 42, 10, 165, 219, 133, 221,
-	189, 32, 2, 76, 237, 9, 189, 32, 2, 24, 101, 219, 157, 32, 2, 76,
-	237, 9, 189, 56, 2, 24, 101, 219, 157, 56, 2, 189, 32, 2, 76, 237,
-	9, 189, 224, 2, 16, 12, 188, 32, 2, 177, 213, 24, 125, 240, 2, 76,
-	156, 9, 189, 32, 2, 24, 125, 240, 2, 201, 61, 144, 2, 169, 63, 168,
-	177, 213, 157, 64, 2, 164, 219, 208, 3, 157, 72, 2, 152, 74, 74, 74,
-	74, 157, 80, 2, 157, 88, 2, 165, 219, 41, 15, 157, 96, 2, 189, 32,
-	2, 76, 237, 9, 165, 219, 24, 125, 40, 3, 157, 40, 3, 189, 32, 2,
-	76, 237, 9, 165, 219, 201, 128, 240, 6, 157, 32, 2, 76, 237, 9, 189,
-	56, 3, 9, 240, 157, 56, 3, 189, 32, 2, 76, 237, 9, 189, 32, 2,
-	24, 101, 219, 188, 224, 2, 48, 31, 24, 125, 240, 2, 201, 61, 144, 7,
-	169, 0, 157, 56, 3, 169, 63, 157, 32, 3, 168, 177, 213, 24, 125, 56,
-	2, 24, 101, 221, 76, 42, 10, 201, 61, 144, 7, 169, 0, 157, 56, 3,
-	169, 63, 168, 189, 56, 2, 24, 125, 240, 2, 24, 113, 213, 24, 101, 221,
-	157, 48, 3, 189, 88, 2, 240, 50, 222, 88, 2, 208, 45, 189, 80, 2,
-	157, 88, 2, 189, 72, 2, 221, 64, 2, 240, 31, 176, 13, 125, 96, 2,
-	176, 18, 221, 64, 2, 176, 13, 76, 97, 10, 253, 96, 2, 144, 5, 221,
-	64, 2, 176, 3, 189, 64, 2, 157, 72, 2, 165, 218, 41, 1, 240, 10,
-	189, 72, 2, 24, 125, 56, 2, 157, 48, 3, 202, 48, 3, 76, 52, 8,
-	173, 64, 3, 13, 65, 3, 13, 66, 3, 13, 67, 3, 170, 142, 101, 12,
-	173, 24, 3, 16, 33, 173, 56, 3, 41, 15, 240, 26, 173, 48, 3, 24,
-	109, 40, 3, 141, 50, 3, 173, 58, 3, 41, 16, 208, 5, 169, 0, 141,
-	58, 3, 138, 9, 4, 170, 173, 25, 3, 16, 33, 173, 57, 3, 41, 15,
-	240, 26, 173, 49, 3, 24, 109, 41, 3, 141, 51, 3, 173, 59, 3, 41,
-	16, 208, 5, 169, 0, 141, 59, 3, 138, 9, 2, 170, 236, 101, 12, 208,
-	94, 173, 25, 3, 41, 14, 201, 6, 208, 38, 173, 57, 3, 41, 15, 240,
-	31, 172, 33, 3, 185, 192, 3, 141, 48, 3, 185, 192, 4, 141, 49, 3,
-	173, 56, 3, 41, 16, 208, 5, 169, 0, 141, 56, 3, 138, 9, 80, 170,
-	173, 27, 3, 41, 14, 201, 6, 208, 38, 173, 59, 3, 41, 15, 240, 31,
-	172, 35, 3, 185, 192, 3, 141, 50, 3, 185, 192, 4, 141, 51, 3, 173,
-	58, 3, 41, 16, 208, 5, 169, 0, 141, 58, 3, 138, 9, 40, 170, 142,
-	101, 12, 173, 68, 3, 13, 69, 3, 13, 70, 3, 13, 71, 3, 170, 142,
-	3, 12, 173, 28, 3, 16, 33, 173, 60, 3, 41, 15, 240, 26, 173, 52,
-	3, 24, 109, 44, 3, 141, 54, 3, 173, 62, 3, 41, 16, 208, 5, 169,
-	0, 141, 62, 3, 138, 9, 4, 170, 173, 29, 3, 16, 33, 173, 61, 3,
-	41, 15, 240, 26, 173, 53, 3, 24, 109, 45, 3, 141, 55, 3, 173, 63,
-	3, 41, 16, 208, 5, 169, 0, 141, 63, 3, 138, 9, 2, 170, 236, 3,
-	12, 208, 94, 173, 29, 3, 41, 14, 201, 6, 208, 38, 173, 61, 3, 41,
-	15, 240, 31, 172, 37, 3, 185, 192, 3, 141, 52, 3, 185, 192, 4, 141,
-	53, 3, 173, 60, 3, 41, 16, 208, 5, 169, 0, 141, 60, 3, 138, 9,
-	80, 170, 173, 31, 3, 41, 14, 201, 6, 208, 38, 173, 63, 3, 41, 15,
-	240, 31, 172, 39, 3, 185, 192, 3, 141, 54, 3, 185, 192, 4, 141, 55,
-	3, 173, 62, 3, 41, 16, 208, 5, 169, 0, 141, 62, 3, 138, 9, 40,
-	170, 142, 3, 12, 173, 74, 3, 96, 160, 255, 173, 52, 3, 174, 48, 3,
-	141, 16, 210, 142, 0, 210, 173, 60, 3, 174, 56, 3, 141, 17, 210, 142,
-	1, 210, 173, 53, 3, 174, 49, 3, 141, 18, 210, 142, 2, 210, 173, 61,
-	3, 174, 57, 3, 141, 19, 210, 142, 3, 210, 173, 54, 3, 174, 50, 3,
-	141, 20, 210, 142, 4, 210, 173, 62, 3, 174, 58, 3, 141, 21, 210, 142,
-	5, 210, 173, 55, 3, 174, 51, 3, 141, 22, 210, 142, 6, 210, 173, 63,
-	3, 174, 59, 3, 141, 23, 210, 142, 7, 210, 169, 255, 140, 24, 210, 141,
-	8, 210, 96 };
-static const unsigned char CiBinaryResource_tm2_obx[3698] = { 255, 255, 0, 5, 107, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
-	1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-	1, 1, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2,
-	2, 2, 2, 3, 3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-	3, 3, 3, 3, 4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
-	3, 4, 4, 4, 5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4,
-	4, 4, 5, 5, 6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4,
-	5, 5, 6, 6, 7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
-	5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5,
-	6, 7, 7, 8, 8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6,
-	7, 7, 8, 9, 9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7,
-	7, 8, 9, 10, 10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7,
-	8, 9, 10, 10, 11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8,
-	9, 10, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8,
-	9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-	10, 11, 12, 13, 14, 15, 0, 241, 228, 215, 203, 192, 181, 170, 161, 152,
-	143, 135, 127, 120, 114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60,
-	56, 53, 50, 47, 44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23,
-	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 3, 2, 1, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152,
-	143, 137, 128, 122, 113, 107, 101, 95, 92, 86, 80, 77, 71, 68, 62, 60,
-	56, 53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23,
-	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 3, 2, 1, 0, 0, 255, 241, 228, 216, 202, 192, 181, 171, 162,
-	153, 142, 135, 127, 121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63,
-	60, 57, 55, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25,
-	23, 22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7,
-	6, 5, 4, 3, 2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153,
-	144, 136, 128, 121, 114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60,
-	57, 53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23,
-	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
-	5, 4, 3, 2, 1, 0, 226, 56, 140, 0, 106, 232, 106, 239, 128, 8,
-	174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82, 34, 244, 200,
-	160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78, 56, 39, 21,
-	6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127, 120, 112, 106,
-	100, 94, 87, 82, 50, 10, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232,
-	106, 239, 128, 8, 174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132,
-	82, 34, 244, 200, 160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96,
-	78, 56, 39, 21, 6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136,
-	127, 120, 112, 106, 100, 94, 11, 11, 10, 10, 9, 8, 8, 7, 7, 7,
-	6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 2, 2,
-	2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8,
-	8, 7, 7, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3,
-	3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 76, 228, 16, 76, 227, 9, 76, 159, 11, 1,
-	16, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
-	6, 7, 0, 1, 2, 3, 4, 2, 0, 0, 4, 2, 0, 0, 0, 16,
-	0, 8, 0, 16, 0, 8, 133, 211, 129, 169, 133, 211, 129, 169, 136, 177,
-	250, 141, 23, 8, 162, 0, 134, 252, 10, 38, 252, 10, 38, 252, 10, 38,
-	252, 10, 38, 252, 109, 23, 8, 144, 2, 230, 252, 24, 105, 0, 133, 250,
-	165, 252, 105, 0, 133, 251, 76, 7, 10, 32, 181, 12, 173, 22, 8, 240,
-	5, 206, 28, 8, 48, 3, 76, 162, 11, 206, 29, 8, 208, 82, 162, 0,
-	238, 23, 8, 173, 25, 8, 133, 250, 173, 26, 8, 133, 251, 160, 16, 177,
-	250, 48, 171, 208, 3, 76, 44, 18, 141, 29, 8, 136, 177, 250, 136, 132,
-	252, 168, 185, 255, 255, 157, 80, 8, 185, 255, 255, 157, 88, 8, 169, 0,
-	157, 112, 8, 157, 96, 8, 164, 252, 177, 250, 157, 104, 8, 232, 136, 16,
-	219, 169, 17, 24, 101, 250, 141, 25, 8, 169, 0, 101, 251, 141, 26, 8,
-	173, 27, 8, 141, 28, 8, 162, 7, 222, 112, 8, 48, 6, 202, 16, 248,
-	76, 162, 11, 189, 80, 8, 133, 250, 189, 88, 8, 133, 251, 188, 96, 8,
-	177, 250, 208, 28, 200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177,
-	250, 10, 10, 10, 10, 157, 224, 8, 200, 152, 157, 96, 8, 76, 87, 10,
-	201, 64, 176, 79, 125, 104, 8, 157, 152, 8, 200, 177, 250, 16, 37, 41,
-	127, 133, 252, 200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177, 250,
-	10, 10, 10, 10, 157, 224, 8, 200, 152, 157, 96, 8, 164, 252, 32, 156,
-	18, 76, 87, 10, 168, 254, 96, 8, 254, 96, 8, 189, 208, 8, 41, 240,
-	157, 216, 8, 189, 208, 8, 10, 10, 10, 10, 157, 224, 8, 32, 156, 18,
-	76, 87, 10, 201, 128, 176, 37, 41, 63, 24, 125, 104, 8, 157, 152, 8,
-	200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177, 250, 10, 10, 10,
-	10, 157, 224, 8, 200, 152, 157, 96, 8, 76, 87, 10, 208, 14, 200, 177,
-	250, 157, 112, 8, 200, 152, 157, 96, 8, 76, 87, 10, 201, 192, 176, 15,
-	41, 63, 24, 125, 104, 8, 157, 152, 8, 254, 96, 8, 76, 87, 10, 201,
-	208, 176, 15, 200, 254, 96, 8, 41, 15, 141, 27, 8, 141, 28, 8, 76,
-	106, 10, 201, 224, 176, 22, 177, 250, 133, 252, 200, 177, 250, 133, 253, 200,
-	152, 157, 96, 8, 165, 252, 32, 14, 17, 76, 87, 10, 201, 240, 176, 46,
-	177, 250, 133, 252, 200, 177, 250, 133, 253, 165, 252, 32, 14, 17, 188, 96,
-	8, 200, 200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177, 250, 10,
-	10, 10, 10, 157, 224, 8, 200, 152, 157, 96, 8, 76, 87, 10, 201, 255,
-	176, 11, 233, 239, 157, 112, 8, 254, 96, 8, 76, 87, 10, 169, 64, 157,
-	112, 8, 76, 87, 10, 32, 181, 12, 162, 7, 189, 120, 8, 240, 115, 76,
-	217, 13, 189, 14, 8, 240, 14, 169, 0, 157, 32, 8, 157, 40, 8, 202,
-	16, 232, 76, 31, 12, 164, 253, 185, 0, 6, 24, 101, 252, 157, 56, 8,
-	152, 157, 160, 8, 189, 176, 8, 61, 168, 9, 240, 40, 165, 253, 41, 127,
-	168, 185, 0, 7, 24, 101, 252, 157, 55, 8, 185, 128, 7, 105, 0, 157,
-	56, 8, 169, 0, 157, 31, 8, 188, 152, 9, 153, 39, 8, 202, 202, 16,
-	169, 76, 31, 12, 189, 176, 8, 61, 160, 9, 240, 22, 189, 104, 9, 24,
-	101, 253, 157, 162, 8, 168, 185, 0, 6, 24, 101, 252, 56, 101, 254, 157,
-	58, 8, 202, 16, 133, 232, 134, 252, 162, 3, 173, 9, 8, 240, 6, 41,
-	64, 208, 60, 162, 7, 138, 168, 185, 32, 8, 208, 12, 188, 152, 9, 185,
-	40, 8, 208, 4, 138, 168, 169, 0, 25, 168, 8, 157, 48, 8, 185, 56,
-	8, 157, 72, 8, 185, 160, 8, 157, 64, 8, 185, 176, 8, 5, 252, 133,
-	252, 224, 4, 208, 3, 141, 31, 8, 202, 16, 202, 141, 30, 8, 96, 189,
-	32, 8, 29, 168, 8, 157, 48, 8, 189, 44, 8, 29, 172, 8, 157, 52,
-	8, 189, 56, 8, 157, 72, 8, 189, 60, 8, 157, 76, 8, 189, 160, 8,
-	157, 64, 8, 189, 164, 8, 157, 68, 8, 202, 16, 211, 173, 176, 8, 13,
-	177, 8, 13, 178, 8, 13, 179, 8, 141, 30, 8, 173, 180, 8, 13, 181,
-	8, 13, 182, 8, 13, 183, 8, 141, 31, 8, 96, 173, 9, 8, 208, 3,
-	76, 144, 13, 48, 3, 76, 72, 13, 173, 13, 8, 170, 74, 74, 41, 1,
-	168, 185, 30, 8, 141, 56, 210, 138, 41, 4, 168, 185, 56, 8, 141, 48,
-	210, 189, 32, 8, 141, 49, 210, 185, 57, 8, 141, 50, 210, 189, 33, 8,
-	141, 51, 210, 185, 58, 8, 141, 52, 210, 189, 34, 8, 141, 53, 210, 185,
-	59, 8, 141, 54, 210, 189, 35, 8, 141, 55, 210, 173, 12, 8, 170, 74,
-	74, 41, 1, 168, 185, 30, 8, 141, 40, 210, 138, 41, 4, 168, 185, 56,
-	8, 141, 32, 210, 189, 32, 8, 141, 33, 210, 185, 57, 8, 141, 34, 210,
-	189, 33, 8, 141, 35, 210, 185, 58, 8, 141, 36, 210, 189, 34, 8, 141,
-	37, 210, 185, 59, 8, 141, 38, 210, 189, 35, 8, 141, 39, 210, 173, 11,
-	8, 170, 74, 74, 41, 1, 168, 185, 30, 8, 141, 24, 210, 138, 172, 9,
-	8, 16, 2, 41, 4, 168, 185, 56, 8, 141, 16, 210, 189, 32, 8, 141,
-	17, 210, 185, 57, 8, 141, 18, 210, 189, 33, 8, 141, 19, 210, 185, 58,
-	8, 141, 20, 210, 189, 34, 8, 141, 21, 210, 185, 59, 8, 141, 22, 210,
-	189, 35, 8, 141, 23, 210, 173, 10, 8, 170, 74, 74, 41, 1, 168, 185,
-	30, 8, 141, 8, 210, 138, 172, 9, 8, 16, 2, 41, 4, 168, 185, 56,
-	8, 141, 0, 210, 189, 32, 8, 141, 1, 210, 185, 57, 8, 141, 2, 210,
-	189, 33, 8, 141, 3, 210, 185, 58, 8, 141, 4, 210, 189, 34, 8, 141,
-	5, 210, 185, 59, 8, 141, 6, 210, 189, 35, 8, 141, 7, 210, 96, 189,
-	128, 8, 133, 250, 189, 136, 8, 133, 251, 189, 128, 9, 133, 252, 189, 136,
-	9, 133, 253, 189, 144, 9, 133, 254, 189, 184, 8, 221, 192, 8, 144, 12,
-	157, 8, 9, 189, 200, 8, 157, 184, 8, 76, 11, 14, 189, 8, 9, 240,
-	48, 189, 232, 8, 240, 19, 222, 248, 8, 208, 14, 157, 248, 8, 189, 216,
-	8, 240, 6, 56, 233, 16, 157, 216, 8, 189, 240, 8, 240, 19, 222, 0,
-	9, 208, 14, 157, 0, 9, 189, 224, 8, 240, 6, 56, 233, 16, 157, 224,
-	8, 188, 72, 9, 177, 250, 24, 125, 152, 8, 24, 101, 253, 133, 253, 222,
-	88, 9, 16, 57, 189, 80, 9, 157, 88, 9, 189, 96, 9, 240, 30, 24,
-	125, 72, 9, 157, 72, 9, 240, 13, 221, 64, 9, 144, 32, 169, 255, 157,
-	96, 9, 76, 135, 14, 169, 1, 157, 96, 9, 76, 135, 14, 254, 72, 9,
-	189, 64, 9, 221, 72, 9, 176, 5, 169, 0, 157, 72, 9, 169, 19, 24,
-	101, 250, 133, 250, 144, 2, 230, 251, 188, 184, 8, 177, 250, 41, 240, 157,
-	168, 8, 177, 250, 41, 15, 29, 216, 8, 168, 185, 0, 5, 5, 255, 168,
-	185, 0, 5, 157, 32, 8, 188, 184, 8, 200, 177, 250, 41, 15, 29, 224,
-	8, 168, 185, 0, 5, 5, 255, 168, 185, 0, 5, 157, 40, 8, 189, 40,
-	9, 208, 39, 189, 16, 9, 141, 212, 14, 16, 254, 76, 209, 15, 234, 76,
-	108, 15, 234, 76, 167, 15, 234, 76, 212, 15, 234, 76, 1, 16, 234, 76,
-	33, 16, 234, 76, 65, 16, 234, 76, 73, 16, 222, 40, 9, 188, 184, 8,
-	200, 177, 250, 41, 112, 74, 74, 74, 141, 34, 15, 177, 250, 48, 6, 189,
-	112, 9, 76, 18, 15, 189, 120, 9, 61, 176, 9, 157, 176, 8, 200, 200,
-	152, 157, 184, 8, 136, 177, 250, 144, 254, 144, 22, 144, 12, 144, 34, 144,
-	24, 144, 46, 144, 36, 144, 50, 144, 52, 125, 128, 9, 157, 128, 9, 177,
-	250, 24, 101, 252, 133, 252, 76, 172, 11, 125, 136, 9, 157, 136, 9, 177,
-	250, 24, 101, 253, 133, 253, 76, 172, 11, 125, 144, 9, 157, 144, 9, 177,
-	250, 24, 101, 254, 133, 254, 76, 172, 11, 133, 252, 169, 0, 133, 253, 76,
-	172, 11, 189, 32, 9, 41, 3, 74, 144, 10, 208, 25, 189, 24, 9, 24,
-	101, 252, 133, 252, 222, 56, 9, 16, 78, 254, 32, 9, 189, 48, 9, 157,
-	56, 9, 76, 247, 14, 165, 252, 253, 24, 9, 133, 252, 222, 56, 9, 16,
-	54, 254, 32, 9, 189, 48, 9, 157, 56, 9, 76, 247, 14, 188, 32, 9,
-	189, 24, 9, 48, 2, 200, 200, 136, 152, 24, 101, 252, 133, 252, 222, 56,
-	9, 16, 20, 152, 157, 32, 9, 221, 24, 9, 208, 5, 73, 255, 157, 24,
-	9, 189, 48, 9, 157, 56, 9, 76, 247, 14, 188, 32, 9, 189, 24, 9,
-	48, 2, 200, 200, 136, 152, 24, 101, 253, 133, 253, 222, 56, 9, 16, 231,
-	152, 157, 32, 9, 221, 24, 9, 208, 216, 73, 255, 157, 24, 9, 189, 48,
-	9, 157, 56, 9, 76, 247, 14, 189, 32, 9, 24, 101, 252, 133, 252, 222,
-	56, 9, 16, 195, 189, 24, 9, 24, 125, 32, 9, 157, 32, 9, 189, 48,
-	9, 157, 56, 9, 76, 247, 14, 165, 253, 56, 253, 32, 9, 133, 253, 222,
-	56, 9, 16, 163, 189, 24, 9, 24, 125, 32, 9, 157, 32, 9, 189, 48,
-	9, 157, 56, 9, 76, 247, 14, 189, 24, 9, 24, 101, 252, 133, 252, 76,
-	247, 14, 160, 16, 169, 0, 133, 250, 169, 0, 133, 251, 169, 0, 141, 23,
-	8, 138, 240, 63, 177, 250, 240, 2, 16, 1, 202, 169, 17, 24, 101, 250,
-	133, 250, 144, 2, 230, 251, 238, 23, 8, 208, 230, 162, 0, 169, 0, 133,
-	252, 138, 141, 23, 8, 10, 38, 252, 10, 38, 252, 10, 38, 252, 10, 38,
-	252, 109, 23, 8, 144, 2, 230, 252, 24, 105, 0, 133, 250, 165, 252, 105,
-	0, 133, 251, 32, 44, 18, 165, 250, 141, 25, 8, 165, 251, 141, 26, 8,
-	162, 7, 169, 255, 157, 208, 8, 169, 240, 157, 216, 8, 157, 224, 8, 202,
-	16, 240, 169, 3, 141, 15, 210, 141, 31, 210, 141, 47, 210, 141, 63, 210,
-	206, 23, 8, 232, 142, 28, 8, 232, 142, 29, 8, 142, 22, 8, 96, 138,
-	41, 15, 141, 27, 8, 96, 142, 22, 8, 96, 201, 16, 176, 3, 76, 76,
-	16, 201, 32, 144, 136, 201, 48, 176, 3, 76, 133, 18, 201, 64, 144, 223,
-	201, 80, 176, 3, 76, 44, 18, 201, 96, 144, 219, 201, 112, 144, 3, 76,
-	180, 17, 132, 253, 41, 15, 10, 141, 23, 17, 165, 253, 144, 254, 144, 30,
-	144, 56, 144, 89, 144, 96, 144, 26, 144, 28, 144, 30, 144, 32, 144, 34,
-	144, 36, 144, 13, 144, 11, 144, 9, 144, 7, 144, 5, 144, 3, 141, 24,
-	8, 96, 157, 104, 9, 96, 157, 112, 9, 96, 157, 120, 9, 96, 157, 144,
-	9, 96, 157, 128, 9, 96, 157, 136, 9, 96, 41, 112, 74, 74, 157, 16,
-	9, 41, 48, 208, 3, 157, 32, 9, 165, 253, 48, 6, 41, 15, 157, 24,
-	9, 96, 41, 15, 73, 255, 24, 105, 1, 157, 24, 9, 96, 41, 63, 157,
-	48, 9, 157, 56, 9, 96, 41, 128, 10, 42, 157, 96, 9, 165, 253, 41,
-	112, 74, 74, 74, 74, 157, 64, 9, 208, 3, 157, 96, 9, 165, 253, 41,
-	15, 157, 80, 9, 157, 88, 9, 189, 72, 9, 221, 64, 9, 144, 143, 189,
-	64, 9, 240, 2, 233, 1, 157, 72, 9, 96, 132, 250, 134, 251, 160, 25,
-	177, 250, 200, 141, 9, 8, 177, 250, 200, 141, 10, 8, 177, 250, 200, 141,
-	11, 8, 177, 250, 200, 141, 12, 8, 177, 250, 200, 141, 13, 8, 177, 250,
-	141, 27, 8, 165, 250, 73, 128, 48, 1, 232, 141, 172, 18, 142, 173, 18,
-	73, 128, 48, 1, 232, 141, 29, 10, 142, 30, 10, 232, 141, 35, 10, 142,
-	36, 10, 232, 141, 162, 18, 142, 163, 18, 73, 128, 48, 1, 232, 141, 25,
-	8, 141, 215, 9, 141, 79, 16, 141, 148, 16, 142, 26, 8, 142, 221, 9,
-	142, 83, 16, 142, 154, 16, 169, 240, 133, 255, 169, 0, 141, 22, 8, 141,
-	24, 8, 162, 7, 169, 0, 141, 22, 8, 157, 120, 8, 157, 176, 8, 157,
-	32, 8, 157, 40, 8, 157, 48, 8, 157, 48, 210, 157, 32, 210, 157, 16,
-	210, 157, 0, 210, 202, 16, 226, 141, 24, 210, 141, 8, 210, 141, 56, 210,
-	141, 40, 210, 141, 30, 8, 141, 31, 8, 96, 157, 32, 8, 157, 40, 8,
-	157, 48, 8, 157, 176, 8, 96, 152, 157, 208, 8, 41, 240, 157, 216, 8,
-	189, 208, 8, 10, 10, 10, 10, 157, 224, 8, 96, 41, 7, 133, 250, 138,
-	166, 250, 41, 63, 240, 225, 157, 152, 8, 152, 48, 238, 189, 208, 8, 32,
-	117, 18, 169, 0, 157, 120, 8, 185, 255, 255, 240, 190, 157, 136, 8, 133,
-	251, 185, 255, 255, 157, 128, 8, 133, 250, 152, 157, 144, 8, 160, 8, 177,
-	250, 200, 157, 192, 8, 177, 250, 200, 157, 200, 8, 177, 250, 200, 157, 104,
-	9, 177, 250, 200, 157, 112, 9, 177, 250, 200, 157, 120, 9, 177, 250, 200,
-	157, 232, 8, 157, 248, 8, 177, 250, 200, 157, 240, 8, 157, 0, 9, 177,
-	250, 41, 112, 74, 74, 157, 16, 9, 177, 250, 200, 48, 8, 41, 15, 157,
-	24, 9, 76, 9, 19, 41, 15, 73, 255, 24, 105, 1, 157, 24, 9, 177,
-	250, 200, 157, 40, 9, 177, 250, 200, 41, 63, 157, 48, 9, 157, 56, 9,
-	177, 250, 41, 128, 10, 42, 157, 96, 9, 177, 250, 41, 112, 74, 74, 74,
-	74, 157, 64, 9, 208, 3, 157, 96, 9, 177, 250, 136, 41, 15, 157, 80,
-	9, 157, 88, 9, 177, 250, 41, 192, 29, 152, 8, 157, 152, 8, 168, 185,
-	0, 6, 157, 56, 8, 169, 0, 157, 184, 8, 157, 32, 9, 157, 8, 9,
-	157, 72, 9, 157, 128, 9, 157, 136, 9, 157, 144, 9, 169, 1, 157, 120,
-	8, 96 };
-static const unsigned char CiBinaryResource_tmc_obx[2671] = { 255, 255, 0, 5, 104, 15, 76, 206, 13, 76, 208, 8, 76, 239, 9, 15,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-	1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
-	2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3,
-	3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
-	4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4,
-	5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5,
-	6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-	7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7,
-	7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5, 6, 7, 7, 8,
-	8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, 9,
-	9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10,
-	10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7, 8, 9, 10, 10,
-	11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8, 9, 10, 10, 11,
-	12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9, 10, 11, 12,
-	13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-	14, 15, 0, 241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120,
-	114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47,
-	44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
-	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
-	1, 0, 0, 242, 230, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128, 122,
-	113, 107, 101, 95, 92, 86, 80, 77, 71, 68, 62, 60, 56, 53, 50, 47,
-	45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
-	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
-	1, 0, 0, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153, 142, 135, 127,
-	121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63, 60, 57, 55, 51,
-	48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23, 22, 21, 19,
-	18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3,
-	2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153, 144, 136, 128, 121,
-	114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60, 57, 53, 50, 47,
-	45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
-	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
-	1, 0, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232, 106, 239, 128, 8,
-	174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82, 34, 244, 200,
-	160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78, 56, 39, 21,
-	6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127, 120, 112, 106,
-	100, 94, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8, 8, 7, 7, 7,
-	6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 2, 2,
-	2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
-	6, 7, 0, 1, 2, 3, 4, 2, 0, 0, 4, 2, 0, 0, 0, 16,
-	0, 8, 0, 16, 0, 8, 173, 183, 8, 240, 94, 173, 182, 8, 201, 64,
-	144, 90, 206, 181, 8, 240, 3, 76, 239, 9, 162, 7, 169, 0, 157, 196,
-	7, 157, 204, 7, 202, 16, 247, 141, 182, 8, 170, 160, 15, 177, 254, 16,
-	32, 136, 177, 254, 16, 3, 76, 95, 14, 134, 252, 10, 10, 38, 252, 10,
-	38, 252, 10, 38, 252, 105, 0, 133, 254, 165, 252, 105, 0, 133, 255, 144,
-	218, 157, 212, 7, 136, 177, 254, 157, 220, 7, 232, 136, 16, 207, 24, 165,
-	254, 105, 16, 133, 254, 144, 2, 230, 255, 76, 239, 9, 206, 181, 8, 16,
-	248, 238, 182, 8, 173, 180, 8, 141, 181, 8, 162, 7, 222, 204, 7, 48,
-	3, 76, 233, 9, 188, 212, 7, 185, 255, 255, 133, 252, 185, 255, 255, 133,
-	253, 188, 196, 7, 177, 252, 208, 6, 32, 109, 13, 76, 230, 9, 201, 64,
-	176, 18, 125, 220, 7, 157, 228, 7, 32, 109, 13, 188, 42, 5, 32, 188,
-	14, 76, 230, 9, 208, 34, 200, 254, 196, 7, 177, 252, 16, 7, 133, 251,
-	32, 109, 13, 165, 251, 41, 127, 208, 7, 169, 64, 141, 182, 8, 208, 76,
-	141, 180, 8, 141, 181, 8, 208, 68, 201, 128, 176, 43, 41, 63, 125, 220,
-	7, 157, 228, 7, 200, 254, 196, 7, 177, 252, 41, 127, 208, 7, 169, 64,
-	141, 182, 8, 208, 6, 141, 180, 8, 141, 181, 8, 32, 109, 13, 188, 42,
-	5, 32, 188, 14, 76, 230, 9, 201, 192, 176, 12, 41, 63, 157, 42, 5,
-	200, 254, 196, 7, 76, 94, 9, 41, 63, 157, 204, 7, 254, 196, 7, 202,
-	48, 3, 76, 70, 9, 162, 7, 189, 188, 7, 240, 33, 32, 46, 11, 189,
-	50, 5, 61, 192, 8, 240, 22, 160, 71, 177, 252, 24, 125, 34, 5, 157,
-	36, 5, 168, 185, 60, 6, 56, 125, 100, 8, 157, 246, 7, 202, 16, 215,
-	14, 9, 5, 14, 9, 5, 14, 9, 5, 14, 9, 5, 232, 134, 252, 134,
-	253, 162, 7, 138, 168, 185, 252, 7, 208, 12, 188, 184, 8, 185, 4, 8,
-	208, 4, 138, 168, 169, 0, 133, 250, 152, 157, 26, 5, 185, 244, 7, 157,
-	18, 5, 185, 50, 5, 133, 251, 5, 253, 133, 253, 165, 251, 61, 192, 8,
-	240, 6, 185, 246, 7, 157, 20, 5, 165, 251, 61, 200, 8, 240, 18, 185,
-	34, 5, 41, 63, 168, 200, 132, 252, 185, 123, 7, 157, 18, 5, 76, 137,
-	10, 164, 252, 240, 10, 185, 59, 7, 157, 18, 5, 169, 0, 133, 252, 165,
-	250, 13, 9, 5, 168, 185, 60, 5, 188, 26, 5, 25, 236, 7, 157, 10,
-	5, 224, 4, 208, 9, 165, 253, 141, 59, 5, 169, 0, 133, 253, 202, 16,
-	130, 78, 9, 5, 78, 9, 5, 78, 9, 5, 78, 9, 5, 165, 253, 162,
-	3, 142, 31, 210, 142, 15, 210, 174, 22, 5, 172, 18, 5, 142, 16, 210,
-	140, 0, 210, 174, 14, 5, 172, 10, 5, 142, 17, 210, 140, 1, 210, 174,
-	23, 5, 172, 19, 5, 142, 18, 210, 140, 2, 210, 174, 15, 5, 172, 11,
-	5, 142, 19, 210, 140, 3, 210, 174, 24, 5, 172, 20, 5, 142, 20, 210,
-	140, 4, 210, 174, 16, 5, 172, 12, 5, 142, 21, 210, 140, 5, 210, 174,
-	25, 5, 172, 21, 5, 142, 22, 210, 140, 6, 210, 174, 17, 5, 172, 13,
-	5, 142, 23, 210, 140, 7, 210, 141, 58, 5, 174, 59, 5, 142, 24, 210,
-	141, 8, 210, 96, 189, 28, 8, 133, 252, 189, 36, 8, 133, 253, 188, 44,
-	8, 192, 63, 240, 123, 254, 44, 8, 254, 44, 8, 254, 44, 8, 177, 252,
-	41, 240, 157, 236, 7, 177, 252, 41, 15, 56, 253, 12, 8, 16, 2, 169,
-	0, 157, 252, 7, 200, 177, 252, 41, 15, 56, 253, 20, 8, 16, 2, 169,
-	0, 157, 4, 8, 177, 252, 41, 240, 240, 116, 16, 11, 160, 73, 177, 252,
-	188, 44, 8, 136, 136, 16, 2, 169, 0, 157, 50, 5, 177, 252, 41, 112,
-	240, 99, 74, 74, 141, 154, 11, 169, 0, 157, 100, 8, 200, 177, 252, 144,
-	254, 234, 234, 234, 234, 76, 56, 13, 234, 76, 53, 13, 234, 76, 60, 13,
-	234, 76, 74, 13, 234, 76, 84, 13, 234, 76, 95, 13, 234, 76, 81, 13,
-	189, 52, 8, 240, 18, 222, 68, 8, 208, 13, 157, 68, 8, 189, 252, 7,
-	41, 15, 240, 3, 222, 252, 7, 189, 60, 8, 240, 18, 222, 76, 8, 208,
-	13, 157, 76, 8, 189, 4, 8, 41, 15, 240, 3, 222, 4, 8, 160, 72,
-	177, 252, 157, 50, 5, 189, 148, 8, 24, 105, 63, 168, 177, 252, 125, 228,
-	7, 157, 34, 5, 168, 185, 60, 6, 157, 244, 7, 222, 164, 8, 16, 51,
-	189, 156, 8, 157, 164, 8, 189, 172, 8, 240, 24, 24, 125, 148, 8, 157,
-	148, 8, 240, 7, 221, 140, 8, 208, 26, 169, 254, 24, 105, 1, 157, 172,
-	8, 208, 16, 254, 148, 8, 189, 140, 8, 221, 148, 8, 176, 5, 169, 0,
-	157, 148, 8, 189, 116, 8, 240, 4, 222, 116, 8, 96, 189, 108, 8, 133,
-	250, 189, 92, 8, 133, 251, 32, 105, 12, 222, 132, 8, 16, 16, 165, 250,
-	157, 108, 8, 165, 251, 157, 92, 8, 189, 124, 8, 157, 132, 8, 96, 189,
-	84, 8, 141, 112, 12, 16, 254, 76, 167, 12, 234, 76, 144, 12, 234, 76,
-	174, 12, 234, 76, 180, 12, 234, 76, 190, 12, 234, 76, 210, 12, 234, 76,
-	226, 12, 234, 76, 244, 12, 165, 250, 230, 250, 41, 3, 74, 144, 15, 208,
-	71, 165, 251, 157, 100, 8, 24, 125, 244, 7, 157, 244, 7, 96, 169, 0,
-	157, 100, 8, 96, 32, 29, 13, 76, 157, 12, 32, 29, 13, 24, 125, 34,
-	5, 76, 84, 13, 165, 250, 157, 100, 8, 24, 125, 244, 7, 157, 244, 7,
-	165, 250, 24, 101, 251, 133, 250, 96, 189, 34, 5, 56, 229, 250, 157, 34,
-	5, 168, 185, 60, 6, 76, 199, 12, 189, 244, 7, 56, 229, 251, 157, 244,
-	7, 56, 169, 0, 229, 251, 157, 100, 8, 96, 189, 132, 8, 208, 174, 165,
-	251, 16, 16, 189, 4, 8, 240, 165, 189, 252, 7, 201, 15, 240, 158, 254,
-	252, 7, 96, 189, 252, 7, 240, 149, 189, 4, 8, 201, 15, 240, 142, 254,
-	4, 8, 96, 164, 250, 165, 251, 48, 2, 200, 200, 136, 152, 133, 250, 197,
-	251, 208, 6, 165, 251, 73, 255, 133, 251, 152, 96, 125, 244, 7, 157, 244,
-	7, 96, 188, 228, 7, 121, 60, 6, 157, 244, 7, 152, 157, 34, 5, 96,
-	45, 10, 210, 157, 244, 7, 96, 125, 228, 7, 157, 34, 5, 168, 185, 60,
-	6, 157, 244, 7, 96, 157, 34, 5, 168, 189, 244, 7, 121, 60, 6, 157,
-	244, 7, 96, 200, 254, 196, 7, 177, 252, 74, 74, 74, 74, 157, 12, 8,
-	177, 252, 41, 15, 157, 20, 8, 96, 32, 95, 14, 160, 15, 169, 0, 133,
-	254, 169, 0, 133, 255, 138, 240, 46, 177, 254, 16, 1, 202, 24, 165, 254,
-	105, 16, 133, 254, 144, 239, 230, 255, 176, 235, 32, 95, 14, 169, 0, 133,
-	252, 138, 10, 10, 38, 252, 10, 38, 252, 10, 38, 252, 105, 0, 133, 254,
-	165, 252, 105, 0, 133, 255, 169, 64, 141, 182, 8, 169, 1, 141, 181, 8,
-	141, 183, 8, 96, 201, 16, 144, 176, 201, 32, 144, 206, 201, 48, 176, 3,
-	76, 174, 14, 201, 64, 176, 9, 138, 41, 15, 240, 3, 141, 180, 8, 96,
-	201, 80, 144, 113, 201, 96, 176, 6, 169, 0, 141, 183, 8, 96, 201, 112,
-	144, 248, 169, 1, 141, 181, 8, 169, 64, 141, 182, 8, 132, 252, 134, 253,
-	160, 30, 177, 252, 141, 180, 8, 165, 252, 24, 105, 32, 141, 194, 14, 144,
-	1, 232, 142, 195, 14, 24, 105, 64, 141, 202, 14, 144, 1, 232, 142, 203,
-	14, 24, 105, 64, 141, 82, 9, 144, 1, 232, 142, 83, 9, 24, 105, 128,
-	141, 87, 9, 144, 1, 232, 142, 88, 9, 24, 105, 128, 133, 254, 141, 16,
-	9, 141, 136, 13, 141, 183, 13, 144, 1, 232, 134, 255, 142, 22, 9, 142,
-	140, 13, 142, 189, 13, 160, 7, 169, 0, 141, 183, 8, 153, 0, 210, 153,
-	16, 210, 153, 10, 5, 153, 252, 7, 153, 4, 8, 153, 50, 5, 153, 188,
-	7, 136, 16, 232, 141, 8, 210, 141, 24, 210, 141, 58, 5, 141, 59, 5,
-	96, 157, 252, 7, 157, 4, 8, 157, 50, 5, 189, 228, 7, 157, 34, 5,
-	96, 152, 73, 240, 74, 74, 74, 74, 157, 12, 8, 152, 41, 15, 73, 15,
-	157, 20, 8, 96, 41, 7, 133, 252, 138, 166, 252, 41, 63, 240, 226, 157,
-	228, 7, 169, 0, 157, 188, 7, 185, 255, 255, 157, 28, 8, 133, 252, 185,
-	255, 255, 157, 36, 8, 133, 253, 5, 252, 240, 182, 160, 74, 177, 252, 157,
-	52, 8, 157, 68, 8, 200, 177, 252, 157, 60, 8, 157, 76, 8, 200, 177,
-	252, 41, 112, 74, 74, 157, 84, 8, 177, 252, 41, 15, 157, 92, 8, 177,
-	252, 16, 11, 189, 92, 8, 73, 255, 24, 105, 1, 157, 92, 8, 200, 177,
-	252, 157, 116, 8, 200, 177, 252, 41, 63, 157, 124, 8, 157, 132, 8, 200,
-	177, 252, 41, 128, 240, 2, 169, 1, 157, 172, 8, 177, 252, 41, 112, 74,
-	74, 74, 74, 157, 140, 8, 208, 3, 157, 172, 8, 177, 252, 41, 15, 157,
-	156, 8, 157, 164, 8, 136, 177, 252, 41, 192, 24, 125, 228, 7, 157, 228,
-	7, 157, 34, 5, 168, 185, 60, 6, 157, 244, 7, 169, 0, 157, 44, 8,
-	157, 100, 8, 157, 108, 8, 157, 148, 8, 169, 1, 157, 188, 7, 96 };
-
-static int ASAPWriter_FormatXexInfoText(unsigned char *dest, int destLen, int endColumn, const char *src, cibool author);
-static int ASAPWriter_PadXexInfo(unsigned char *dest, int offset, int endColumn);
-static cibool ASAPWriter_SecondsToString(unsigned char *result, int offset, int value);
-static void ASAPWriter_TwoDigitsToString(unsigned char *result, int offset, int value);
-static void ASAPWriter_WriteBytes(ByteWriter w, unsigned char const *array, int startIndex, int endIndex);
-static void ASAPWriter_WriteCmcInit(ByteWriter w, int *initAndPlayer, ASAPInfo const *info);
-static void ASAPWriter_WriteDec(ByteWriter w, int value);
-static void ASAPWriter_WriteDecSapTag(ByteWriter w, const char *tag, int value);
-static cibool ASAPWriter_WriteExecutable(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, unsigned char const *module, int moduleLen);
-static void ASAPWriter_WriteExecutableFromSap(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, int type, unsigned char const *module, int moduleLen);
-static void ASAPWriter_WriteExecutableHeader(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, int type, int init, int player);
-static int ASAPWriter_WriteExecutableHeaderForSongPos(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, int player, int codeForOneSong, int codeForManySongs, int playerOffset);
-static void ASAPWriter_WriteHexSapTag(ByteWriter w, const char *tag, int value);
-static cibool ASAPWriter_WriteNative(ByteWriter w, ASAPInfo const *info, unsigned char const *module, int moduleLen);
-static int ASAPWriter_WriteNativeHeader(ByteWriter w, ASAPInfo const *info, unsigned char const *module);
-static void ASAPWriter_WritePlaTaxLda0(ByteWriter w);
-static void ASAPWriter_WriteRelocatedBytes(ByteWriter w, int diff, unsigned char const *module, int lowOffset, int highOffset, int len, int shift);
-static void ASAPWriter_WriteRelocatedLowHigh(ByteWriter w, int diff, unsigned char const *module, int lowOffset, int len);
-static void ASAPWriter_WriteRelocatedWords(ByteWriter w, int diff, unsigned char const *module, int offset, int len);
-static void ASAPWriter_WriteSapHeader(ByteWriter w, ASAPInfo const *info, int type, int init, int player);
-static void ASAPWriter_WriteString(ByteWriter w, const char *s);
-static void ASAPWriter_WriteTextSapTag(ByteWriter w, const char *tag, const char *value);
-static void ASAPWriter_WriteWord(ByteWriter w, int value);
-static void ASAPWriter_WriteXexInfo(ByteWriter w, ASAPInfo const *info);
-static void ASAPWriter_WriteXexInfoTextDl(ByteWriter w, int address, int len, int verticalScrollAt);
-static const unsigned char CiBinaryResource_xexb_obx[183] = { 255, 255, 36, 1, 223, 1, 120, 160, 0, 140, 14, 212, 173, 11, 212, 208,
-	251, 141, 0, 212, 162, 29, 157, 0, 208, 202, 16, 250, 162, 8, 157, 16,
-	210, 157, 0, 210, 202, 16, 247, 169, 3, 141, 31, 210, 141, 0, 210, 169,
-	130, 205, 11, 212, 208, 251, 141, 10, 212, 141, 10, 212, 141, 10, 212, 173,
-	11, 212, 208, 3, 238, 145, 1, 173, 218, 1, 32, 212, 1, 169, 254, 141,
-	1, 211, 169, 206, 174, 53, 1, 240, 2, 169, 194, 141, 250, 255, 169, 1,
-	141, 251, 255, 169, 64, 141, 14, 212, 169, 125, 205, 11, 212, 208, 251, 32,
-	215, 1, 162, 0, 173, 219, 1, 74, 144, 6, 169, 0, 238, 153, 1, 74,
-	189, 220, 1, 105, 125, 176, 5, 221, 210, 1, 144, 4, 253, 210, 1, 56,
-	141, 162, 1, 189, 222, 1, 105, 0, 141, 181, 1, 201, 0, 208, 252, 173,
-	162, 1, 176, 198, 72, 138, 72, 174, 145, 1, 32, 152, 252, 104, 170, 104,
-	238, 186, 1, 64, 156, 131, 76 };
-static const unsigned char CiBinaryResource_xexd_obx[117] = { 255, 255, 36, 1, 152, 1, 120, 160, 0, 140, 14, 212, 173, 11, 212, 208,
-	251, 141, 0, 212, 162, 29, 157, 0, 208, 202, 16, 250, 141, 14, 210, 162,
-	8, 157, 16, 210, 157, 0, 210, 202, 16, 247, 169, 3, 141, 31, 210, 141,
-	0, 210, 169, 254, 141, 1, 211, 173, 149, 1, 201, 96, 240, 15, 169, 114,
-	141, 250, 255, 169, 1, 141, 251, 255, 169, 64, 141, 14, 212, 173, 152, 1,
-	88, 76, 146, 1, 40, 8, 72, 138, 72, 152, 72, 32, 149, 1, 174, 53,
-	1, 240, 11, 174, 20, 208, 202, 240, 2, 162, 1, 32, 152, 252, 104, 168,
-	104, 170, 104, 64, 76 };
-static const unsigned char CiBinaryResource_xexinfo_obx[178] = { 255, 255, 112, 252, 221, 252, 65, 80, 252, 173, 11, 212, 208, 251, 141, 5,
-	212, 162, 38, 142, 22, 208, 162, 10, 142, 23, 208, 162, 33, 142, 0, 212,
-	162, 80, 142, 2, 212, 162, 252, 142, 3, 212, 142, 9, 212, 96, 216, 189,
-	218, 252, 24, 105, 0, 141, 158, 252, 189, 220, 252, 105, 0, 141, 166, 252,
-	144, 18, 173, 75, 252, 13, 76, 252, 13, 78, 252, 13, 79, 252, 201, 49,
-	162, 4, 176, 13, 96, 169, 57, 224, 3, 208, 2, 169, 53, 157, 75, 252,
-	202, 189, 75, 252, 201, 49, 144, 237, 201, 58, 240, 244, 222, 75, 252, 96,
-	34, 69, 5, 4, 0, 1, 57, 1, 120, 160, 0, 140, 14, 212, 173, 11,
-	212, 208, 251, 141, 0, 212, 162, 29, 157, 0, 208, 202, 16, 250, 142, 1,
-	211, 185, 0, 224, 72, 185, 0, 225, 72, 185, 0, 227, 202, 142, 1, 211,
-	232, 153, 0, 255, 104, 153, 0, 254, 104, 153, 0, 253, 200, 208, 223, 32,
-	115, 252 };
-
-struct FlashPackItem {
-	FlashPackItemType type;
-	int value;
-};
-static int FlashPackItem_WriteValueTo(FlashPackItem const *self, unsigned char *buffer, int index);
-
-struct FlashPack {
-	int compressedLength;
-	int itemsCount;
-	int loadAddress;
-	int loadEndAddress;
-	FlashPackLoadState loadState;
-	FlashPackItem items[64];
-	unsigned char compressed[65536];
-	int memory[65536];
-};
-static void FlashPack_Construct(FlashPack *self);
-static cibool FlashPack_Compress(FlashPack *self, ByteWriter w);
-static void FlashPack_CompressMemoryArea(FlashPack *self, int startAddress, int endAddress);
-static int FlashPack_FindHole(FlashPack const *self);
-static int FlashPack_GetInnerFlags(FlashPack const *self, int index);
-static cibool FlashPack_IsLiteralPreferred(FlashPack const *self);
-static void FlashPack_LoadByte(FlashPack *self, int data);
-static void FlashPack_PutItem(FlashPack *self, FlashPackItemType type, int value);
-static void FlashPack_PutItems(FlashPack *self);
-static void FlashPack_PutPoke(FlashPack *self, int address, int value);
-
-static void ASAP_Construct(ASAP *self)
-{
-	PokeyPair_Construct(&self->pokeys);
-	self->silenceCycles = 0;
-}
-
-ASAP *ASAP_New(void)
-{
-	ASAP *self = (ASAP *) malloc(sizeof(ASAP));
-	if (self != NULL)
-		ASAP_Construct(self);
-	return self;
-}
-
-void ASAP_Delete(ASAP *self)
-{
-	free(self);
-}
-
-static void ASAP_Call6502(ASAP *self, int addr)
-{
-	self->memory[53760] = 32;
-	self->memory[53761] = (unsigned char) addr;
-	self->memory[53762] = addr >> 8;
-	self->memory[53763] = 210;
-	self->cpu.pc = 53760;
-}
-
-static void ASAP_Call6502Player(ASAP *self)
-{
-	int player = self->moduleInfo.player;
-	switch (self->moduleInfo.type) {
-		int i;
-	case ASAPModuleType_SAP_B:
-		ASAP_Call6502(self, player);
-		break;
-	case ASAPModuleType_SAP_C:
-	case ASAPModuleType_CMC:
-	case ASAPModuleType_CM3:
-	case ASAPModuleType_CMR:
-	case ASAPModuleType_CMS:
-		ASAP_Call6502(self, player + 6);
-		break;
-	case ASAPModuleType_SAP_D:
-		if (player >= 0) {
-			int s = self->cpu.s;
-			self->memory[256 + s] = self->cpu.pc >> 8;
-			s = (s - 1) & 255;
-			self->memory[256 + s] = (unsigned char) self->cpu.pc;
-			self->cpu.s = (s - 1) & 255;
-			self->memory[53760] = 8;
-			self->memory[53761] = 72;
-			self->memory[53762] = 138;
-			self->memory[53763] = 72;
-			self->memory[53764] = 152;
-			self->memory[53765] = 72;
-			self->memory[53766] = 32;
-			self->memory[53767] = (unsigned char) player;
-			self->memory[53768] = player >> 8;
-			self->memory[53769] = 104;
-			self->memory[53770] = 168;
-			self->memory[53771] = 104;
-			self->memory[53772] = 170;
-			self->memory[53773] = 104;
-			self->memory[53774] = 64;
-			self->cpu.pc = 53760;
-		}
-		break;
-	case ASAPModuleType_SAP_S:
-		i = self->memory[69] - 1;
-		self->memory[69] = (unsigned char) i;
-		if (i == 0)
-			self->memory[45179] = (unsigned char) (self->memory[45179] + 1);
-		break;
-	case ASAPModuleType_DLT:
-		ASAP_Call6502(self, player + 259);
-		break;
-	case ASAPModuleType_MPT:
-	case ASAPModuleType_RMT:
-	case ASAPModuleType_TM2:
-	case ASAPModuleType_FC:
-		ASAP_Call6502(self, player + 3);
-		break;
-	case ASAPModuleType_TMC:
-		if (--self->tmcPerFrameCounter <= 0) {
-			self->tmcPerFrameCounter = self->memory[self->moduleInfo.music + 31];
-			ASAP_Call6502(self, player + 3);
-		}
-		else
-			ASAP_Call6502(self, player + 6);
-		break;
-	}
-}
-
-void ASAP_DetectSilence(ASAP *self, int seconds)
-{
-	self->silenceCyclesCounter = self->silenceCycles = seconds * 1773447;
-}
-
-static int ASAP_Do6502Frame(ASAP *self)
-{
-	int cycles;
-	self->nextEventCycle = 0;
-	self->nextScanlineCycle = 0;
-	self->nmist = self->nmist == NmiStatus_RESET ? NmiStatus_ON_V_BLANK : NmiStatus_WAS_V_BLANK;
-	cycles = self->moduleInfo.ntsc ? 29868 : 35568;
-	Cpu6502_DoFrame(&self->cpu, self, cycles);
-	self->cycle -= cycles;
-	if (self->nextPlayerCycle != 8388608)
-		self->nextPlayerCycle -= cycles;
-	if (self->pokeys.timer1Cycle != 8388608)
-		self->pokeys.timer1Cycle -= cycles;
-	if (self->pokeys.timer2Cycle != 8388608)
-		self->pokeys.timer2Cycle -= cycles;
-	if (self->pokeys.timer4Cycle != 8388608)
-		self->pokeys.timer4Cycle -= cycles;
-	return cycles;
-}
-
-static cibool ASAP_Do6502Init(ASAP *self, int pc, int a, int x, int y)
-{
-	self->cpu.pc = pc;
-	self->cpu.a = a & 255;
-	self->cpu.x = x & 255;
-	self->cpu.y = y & 255;
-	self->memory[53760] = 210;
-	self->memory[510] = 255;
-	self->memory[511] = 209;
-	self->cpu.s = 253;
-	{
-		int frame;
-		for (frame = 0; frame < 50; frame++) {
-			ASAP_Do6502Frame(self);
-			if (self->cpu.pc == 53760)
-				return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static int ASAP_DoFrame(ASAP *self)
-{
-	int cycles;
-	PokeyPair_StartFrame(&self->pokeys);
-	cycles = ASAP_Do6502Frame(self);
-	PokeyPair_EndFrame(&self->pokeys, cycles);
-	return cycles;
-}
-
-int ASAP_Generate(ASAP *self, unsigned char *buffer, int bufferLen, ASAPSampleFormat format)
-{
-	return ASAP_GenerateAt(self, buffer, 0, bufferLen, format);
-}
-
-static int ASAP_GenerateAt(ASAP *self, unsigned char *buffer, int bufferOffset, int bufferLen, ASAPSampleFormat format)
-{
-	int blockShift;
-	int bufferBlocks;
-	int block;
-	if (self->silenceCycles > 0 && self->silenceCyclesCounter <= 0)
-		return 0;
-	blockShift = self->moduleInfo.channels - 1 + (format != ASAPSampleFormat_U8 ? 1 : 0);
-	bufferBlocks = bufferLen >> blockShift;
-	if (self->currentDuration > 0) {
-		int totalBlocks = ASAP_MillisecondsToBlocks(self->currentDuration);
-		if (bufferBlocks > totalBlocks - self->blocksPlayed)
-			bufferBlocks = totalBlocks - self->blocksPlayed;
-	}
-	block = 0;
-	for (;;) {
-		int blocks = PokeyPair_Generate(&self->pokeys, buffer, bufferOffset + (block << blockShift), bufferBlocks - block, format);
-		int cycles;
-		self->blocksPlayed += blocks;
-		block += blocks;
-		if (block >= bufferBlocks)
-			break;
-		cycles = ASAP_DoFrame(self);
-		if (self->silenceCycles > 0) {
-			if (PokeyPair_IsSilent(&self->pokeys)) {
-				self->silenceCyclesCounter -= cycles;
-				if (self->silenceCyclesCounter <= 0)
-					break;
-			}
-			else
-				self->silenceCyclesCounter = self->silenceCycles;
-		}
-	}
-	return block << blockShift;
-}
-
-int ASAP_GetBlocksPlayed(ASAP const *self)
-{
-	return self->blocksPlayed;
-}
-
-ASAPInfo const *ASAP_GetInfo(ASAP const *self)
-{
-	return &self->moduleInfo;
-}
-
-int ASAP_GetPokeyChannelVolume(ASAP const *self, int channel)
-{
-	switch (channel) {
-	case 0:
-		return self->pokeys.basePokey.audc1 & 15;
-	case 1:
-		return self->pokeys.basePokey.audc2 & 15;
-	case 2:
-		return self->pokeys.basePokey.audc3 & 15;
-	case 3:
-		return self->pokeys.basePokey.audc4 & 15;
-	case 4:
-		return self->pokeys.extraPokey.audc1 & 15;
-	case 5:
-		return self->pokeys.extraPokey.audc2 & 15;
-	case 6:
-		return self->pokeys.extraPokey.audc3 & 15;
-	case 7:
-		return self->pokeys.extraPokey.audc4 & 15;
-	default:
-		return 0;
-	}
-}
-
-int ASAP_GetPosition(ASAP const *self)
-{
-	return self->blocksPlayed * 10 / 441;
-}
-
-int ASAP_GetWavHeader(ASAP const *self, unsigned char *buffer, ASAPSampleFormat format, cibool metadata)
-{
-	int use16bit = format != ASAPSampleFormat_U8 ? 1 : 0;
-	int blockSize = self->moduleInfo.channels << use16bit;
-	int bytesPerSecond = 44100 * blockSize;
-	int totalBlocks = ASAP_MillisecondsToBlocks(self->currentDuration);
-	int nBytes = (totalBlocks - self->blocksPlayed) * blockSize;
-	int i;
-	ASAP_PutLittleEndian(buffer, 8, 1163280727);
-	ASAP_PutLittleEndians(buffer, 12, 544501094, 16);
-	buffer[20] = 1;
-	buffer[21] = 0;
-	buffer[22] = self->moduleInfo.channels;
-	buffer[23] = 0;
-	ASAP_PutLittleEndians(buffer, 24, 44100, bytesPerSecond);
-	buffer[32] = blockSize;
-	buffer[33] = 0;
-	buffer[34] = 8 << use16bit;
-	buffer[35] = 0;
-	i = 36;
-	if (metadata) {
-		int year = ASAPInfo_GetYear(&self->moduleInfo);
-		if (self->moduleInfo.title[0] != '\0' || self->moduleInfo.author[0] != '\0' || year > 0) {
-			ASAP_PutLittleEndian(buffer, 44, 1330007625);
-			i = ASAP_PutWavMetadata(buffer, 48, 1296125513, self->moduleInfo.title);
-			i = ASAP_PutWavMetadata(buffer, i, 1414676809, self->moduleInfo.author);
-			if (year > 0) {
-				ASAP_PutLittleEndians(buffer, i, 1146241865, 6);
-				{
-					int j;
-					for (j = 3; j >= 0; j--) {
-						buffer[i + 8 + j] = 48 + year % 10;
-						year /= 10;
-					}
-				}
-				buffer[i + 12] = 0;
-				buffer[i + 13] = 0;
-				i += 14;
-			}
-			ASAP_PutLittleEndians(buffer, 36, 1414744396, i - 44);
-		}
-	}
-	ASAP_PutLittleEndians(buffer, 0, 1179011410, i + nBytes);
-	ASAP_PutLittleEndians(buffer, i, 1635017060, nBytes);
-	return i + 8;
-}
-
-static void ASAP_HandleEvent(ASAP *self)
-{
-	int cycle = self->cycle;
-	int nextEventCycle;
-	if (cycle >= self->nextScanlineCycle) {
-		if (cycle - self->nextScanlineCycle < 50)
-			self->cycle = cycle += 9;
-		self->nextScanlineCycle += 114;
-		if (cycle >= self->nextPlayerCycle) {
-			ASAP_Call6502Player(self);
-			self->nextPlayerCycle += 114 * self->moduleInfo.fastplay;
-		}
-	}
-	nextEventCycle = self->nextScanlineCycle;
-	if (cycle >= self->pokeys.timer1Cycle) {
-		self->pokeys.irqst &= ~1;
-		self->pokeys.timer1Cycle = 8388608;
-	}
-	else if (nextEventCycle > self->pokeys.timer1Cycle)
-		nextEventCycle = self->pokeys.timer1Cycle;
-	if (cycle >= self->pokeys.timer2Cycle) {
-		self->pokeys.irqst &= ~2;
-		self->pokeys.timer2Cycle = 8388608;
-	}
-	else if (nextEventCycle > self->pokeys.timer2Cycle)
-		nextEventCycle = self->pokeys.timer2Cycle;
-	if (cycle >= self->pokeys.timer4Cycle) {
-		self->pokeys.irqst &= ~4;
-		self->pokeys.timer4Cycle = 8388608;
-	}
-	else if (nextEventCycle > self->pokeys.timer4Cycle)
-		nextEventCycle = self->pokeys.timer4Cycle;
-	self->nextEventCycle = nextEventCycle;
-}
-
-cibool ASAP_Load(ASAP *self, const char *filename, unsigned char const *module, int moduleLen)
-{
-	unsigned char const *playerRoutine;
-	int moduleIndex;
-	if (!ASAPInfo_Load(&self->moduleInfo, filename, module, moduleLen))
-		return FALSE;
-	playerRoutine = ASAP6502_GetPlayerRoutine(&self->moduleInfo);
-	if (playerRoutine != NULL) {
-		int player = ASAPInfo_GetWord(playerRoutine, 2);
-		int playerLastByte = ASAPInfo_GetWord(playerRoutine, 4);
-		if (self->moduleInfo.music <= playerLastByte)
-			return FALSE;
-		self->memory[19456] = 0;
-		if (self->moduleInfo.type == ASAPModuleType_FC)
-			memcpy(self->memory + self->moduleInfo.music, module + 0, moduleLen);
-		else
-			memcpy(self->memory + self->moduleInfo.music, module + 6, moduleLen - 6);
-		memcpy(self->memory + player, playerRoutine + 6, playerLastByte + 1 - player);
-		if (self->moduleInfo.player < 0)
-			self->moduleInfo.player = player;
-		return TRUE;
-	}
-	memset(self->memory, 0, sizeof(self->memory));
-	moduleIndex = self->moduleInfo.headerLen + 2;
-	while (moduleIndex + 5 <= moduleLen) {
-		int startAddr = ASAPInfo_GetWord(module, moduleIndex);
-		int blockLen = ASAPInfo_GetWord(module, moduleIndex + 2) + 1 - startAddr;
-		if (blockLen <= 0 || moduleIndex + blockLen > moduleLen)
-			return FALSE;
-		moduleIndex += 4;
-		memcpy(self->memory + startAddr, module + moduleIndex, blockLen);
-		moduleIndex += blockLen;
-		if (moduleIndex == moduleLen)
-			return TRUE;
-		if (moduleIndex + 7 <= moduleLen && module[moduleIndex] == 255 && module[moduleIndex + 1] == 255)
-			moduleIndex += 2;
-	}
-	return FALSE;
-}
-
-static int ASAP_MillisecondsToBlocks(int milliseconds)
-{
-	return milliseconds * 441 / 10;
-}
-
-void ASAP_MutePokeyChannels(ASAP *self, int mask)
-{
-	Pokey_Mute(&self->pokeys.basePokey, mask);
-	Pokey_Mute(&self->pokeys.extraPokey, mask >> 4);
-}
-
-static int ASAP_PeekHardware(ASAP const *self, int addr)
-{
-	switch (addr & 65311) {
-	case 53268:
-		return self->moduleInfo.ntsc ? 15 : 1;
-	case 53279:
-		return ~self->consol & 15;
-	case 53770:
-	case 53786:
-		return PokeyPair_GetRandom(&self->pokeys, addr, self->cycle);
-	case 53774:
-		return self->pokeys.irqst;
-	case 53790:
-		if (self->pokeys.extraPokeyMask != 0) {
-			return 255;
-		}
-		return self->pokeys.irqst;
-	case 53772:
-	case 53788:
-	case 53775:
-	case 53791:
-		return 255;
-	case 54283:
-	case 54299:
-		if (self->cycle > (self->moduleInfo.ntsc ? 29868 : 35568))
-			return 0;
-		return self->cycle / 228;
-	case 54287:
-	case 54303:
-		switch (self->nmist) {
-		case NmiStatus_RESET:
-			return 31;
-		case NmiStatus_WAS_V_BLANK:
-			return 95;
-		default:
-			return self->cycle < 28291 ? 31 : 95;
-		}
-	default:
-		return self->memory[addr];
-	}
-}
-
-cibool ASAP_PlaySong(ASAP *self, int song, int duration)
-{
-	if (song < 0 || song >= self->moduleInfo.songs)
-		return FALSE;
-	self->currentSong = song;
-	self->currentDuration = duration;
-	self->nextPlayerCycle = 8388608;
-	self->blocksPlayed = 0;
-	self->silenceCyclesCounter = self->silenceCycles;
-	self->cycle = 0;
-	self->cpu.nz = 0;
-	self->cpu.c = 0;
-	self->cpu.vdi = 0;
-	self->nmist = NmiStatus_ON_V_BLANK;
-	self->consol = 8;
-	self->covox[0] = 128;
-	self->covox[1] = 128;
-	self->covox[2] = 128;
-	self->covox[3] = 128;
-	PokeyPair_Initialize(&self->pokeys, self->moduleInfo.ntsc, self->moduleInfo.channels > 1);
-	ASAP_MutePokeyChannels(self, 255);
-	switch (self->moduleInfo.type) {
-	case ASAPModuleType_SAP_B:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.init, song, 0, 0))
-			return FALSE;
-		break;
-	case ASAPModuleType_SAP_C:
-	case ASAPModuleType_CMC:
-	case ASAPModuleType_CM3:
-	case ASAPModuleType_CMR:
-	case ASAPModuleType_CMS:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player + 3, 112, self->moduleInfo.music, self->moduleInfo.music >> 8))
-			return FALSE;
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player + 3, 0, song, 0))
-			return FALSE;
-		break;
-	case ASAPModuleType_SAP_D:
-	case ASAPModuleType_SAP_S:
-		self->cpu.pc = self->moduleInfo.init;
-		self->cpu.a = song;
-		self->cpu.x = 0;
-		self->cpu.y = 0;
-		self->cpu.s = 255;
-		break;
-	case ASAPModuleType_DLT:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player + 256, 0, 0, self->moduleInfo.songPos[song]))
-			return FALSE;
-		break;
-	case ASAPModuleType_MPT:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player, 0, self->moduleInfo.music >> 8, self->moduleInfo.music))
-			return FALSE;
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player, 2, self->moduleInfo.songPos[song], 0))
-			return FALSE;
-		break;
-	case ASAPModuleType_RMT:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player, self->moduleInfo.songPos[song], self->moduleInfo.music, self->moduleInfo.music >> 8))
-			return FALSE;
-		break;
-	case ASAPModuleType_TMC:
-	case ASAPModuleType_TM2:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player, 112, self->moduleInfo.music >> 8, self->moduleInfo.music))
-			return FALSE;
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player, 0, song, 0))
-			return FALSE;
-		self->tmcPerFrameCounter = 1;
-		break;
-	case ASAPModuleType_FC:
-		if (!ASAP_Do6502Init(self, self->moduleInfo.player, song, 0, 0))
-			return FALSE;
-		break;
-	}
-	ASAP_MutePokeyChannels(self, 0);
-	self->nextPlayerCycle = 0;
-	return TRUE;
-}
-
-static void ASAP_PokeHardware(ASAP *self, int addr, int data)
-{
-	if (addr >> 8 == 210) {
-		if ((addr & (self->pokeys.extraPokeyMask + 15)) == 14) {
-			self->pokeys.irqst |= data ^ 255;
-			if ((data & self->pokeys.irqst & 1) != 0) {
-				if (self->pokeys.timer1Cycle == 8388608) {
-					int t = self->pokeys.basePokey.tickCycle1;
-					while (t < self->cycle)
-						t += self->pokeys.basePokey.periodCycles1;
-					self->pokeys.timer1Cycle = t;
-					if (self->nextEventCycle > t)
-						self->nextEventCycle = t;
-				}
-			}
-			else
-				self->pokeys.timer1Cycle = 8388608;
-			if ((data & self->pokeys.irqst & 2) != 0) {
-				if (self->pokeys.timer2Cycle == 8388608) {
-					int t = self->pokeys.basePokey.tickCycle2;
-					while (t < self->cycle)
-						t += self->pokeys.basePokey.periodCycles2;
-					self->pokeys.timer2Cycle = t;
-					if (self->nextEventCycle > t)
-						self->nextEventCycle = t;
-				}
-			}
-			else
-				self->pokeys.timer2Cycle = 8388608;
-			if ((data & self->pokeys.irqst & 4) != 0) {
-				if (self->pokeys.timer4Cycle == 8388608) {
-					int t = self->pokeys.basePokey.tickCycle4;
-					while (t < self->cycle)
-						t += self->pokeys.basePokey.periodCycles4;
-					self->pokeys.timer4Cycle = t;
-					if (self->nextEventCycle > t)
-						self->nextEventCycle = t;
-				}
-			}
-			else
-				self->pokeys.timer4Cycle = 8388608;
-		}
-		else
-			PokeyPair_Poke(&self->pokeys, addr, data, self->cycle);
-	}
-	else if ((addr & 65295) == 54282) {
-		int x = self->cycle % 114;
-		self->cycle += (x <= 106 ? 106 : 220) - x;
-	}
-	else if ((addr & 65295) == 54287) {
-		self->nmist = self->cycle < 28292 ? NmiStatus_ON_V_BLANK : NmiStatus_RESET;
-	}
-	else if ((addr & 65280) == self->moduleInfo.covoxAddr) {
-		Pokey *pokey;
-		addr &= 3;
-		if (addr == 0 || addr == 3)
-			pokey = &self->pokeys.basePokey;
-		else
-			pokey = &self->pokeys.extraPokey;
-		Pokey_AddDelta(pokey, &self->pokeys, self->cycle, (data - self->covox[addr]) << 17);
-		self->covox[addr] = data;
-	}
-	else if ((addr & 65311) == 53279) {
-		int delta = ((self->consol & 8) - (data & 8)) << 20;
-		Pokey_AddDelta(&self->pokeys.basePokey, &self->pokeys, self->cycle, delta);
-		Pokey_AddDelta(&self->pokeys.extraPokey, &self->pokeys, self->cycle, delta);
-		self->consol = data;
-	}
-	else
-		self->memory[addr] = data;
-}
-
-static void ASAP_PutLittleEndian(unsigned char *buffer, int offset, int value)
-{
-	buffer[offset] = (unsigned char) value;
-	buffer[offset + 1] = (unsigned char) (value >> 8);
-	buffer[offset + 2] = (unsigned char) (value >> 16);
-	buffer[offset + 3] = (unsigned char) (value >> 24);
-}
-
-static void ASAP_PutLittleEndians(unsigned char *buffer, int offset, int value1, int value2)
-{
-	ASAP_PutLittleEndian(buffer, offset, value1);
-	ASAP_PutLittleEndian(buffer, offset + 4, value2);
-}
-
-static int ASAP_PutWavMetadata(unsigned char *buffer, int offset, int fourCC, const char *value)
-{
-	int len = (int) strlen(value);
-	if (len > 0) {
-		ASAP_PutLittleEndians(buffer, offset, fourCC, (len | 1) + 1);
-		offset += 8;
-		{
-			int i;
-			for (i = 0; i < len; i++)
-				buffer[offset++] = value[i];
-		}
-		buffer[offset++] = 0;
-		if ((len & 1) == 0)
-			buffer[offset++] = 0;
-	}
-	return offset;
-}
-
-cibool ASAP_Seek(ASAP *self, int position)
-{
-	return ASAP_SeekSample(self, ASAP_MillisecondsToBlocks(position));
-}
-
-cibool ASAP_SeekSample(ASAP *self, int block)
-{
-	if (block < self->blocksPlayed)
-		if (!ASAP_PlaySong(self, self->currentSong, self->currentDuration))
-			return FALSE;
-	while (self->blocksPlayed + self->pokeys.readySamplesEnd < block) {
-		self->blocksPlayed += self->pokeys.readySamplesEnd;
-		ASAP_DoFrame(self);
-	}
-	self->pokeys.readySamplesStart = block - self->blocksPlayed;
-	self->blocksPlayed = block;
-	return TRUE;
-}
-
-static unsigned char const *ASAP6502_GetPlayerRoutine(ASAPInfo const *info)
-{
-	switch (info->type) {
-	case ASAPModuleType_CMC:
-		return CiBinaryResource_cmc_obx;
-	case ASAPModuleType_CM3:
-		return CiBinaryResource_cm3_obx;
-	case ASAPModuleType_CMR:
-		return CiBinaryResource_cmr_obx;
-	case ASAPModuleType_CMS:
-		return CiBinaryResource_cms_obx;
-	case ASAPModuleType_DLT:
-		return CiBinaryResource_dlt_obx;
-	case ASAPModuleType_MPT:
-		return CiBinaryResource_mpt_obx;
-	case ASAPModuleType_RMT:
-		return info->channels == 1 ? CiBinaryResource_rmt4_obx : CiBinaryResource_rmt8_obx;
-	case ASAPModuleType_TMC:
-		return CiBinaryResource_tmc_obx;
-	case ASAPModuleType_TM2:
-		return CiBinaryResource_tm2_obx;
-	case ASAPModuleType_FC:
-		return CiBinaryResource_fc_obx;
-	default:
-		return NULL;
-	}
-}
-
-ASAPInfo *ASAPInfo_New(void)
-{
-	ASAPInfo *self = (ASAPInfo *) malloc(sizeof(ASAPInfo));
-	return self;
-}
-
-void ASAPInfo_Delete(ASAPInfo *self)
-{
-	free(self);
-}
-
-static void ASAPInfo_AddSong(ASAPInfo *self, int playerCalls)
-{
-	self->durations[self->songs++] = (int) ((double) (playerCalls * self->fastplay) * 38000 / 591149);
-}
-
-static int ASAPInfo_AfterFF(unsigned char const *module, int moduleLen, int currentOffset)
-{
-	while (currentOffset < moduleLen) {
-		if (module[currentOffset++] == 255)
-			return currentOffset;
-	}
-	return -1;
-}
-
-static int ASAPInfo_CheckDate(ASAPInfo const *self)
-{
-	int n = (int) strlen(self->date);
-	switch (n) {
-	case 10:
-		if (!ASAPInfo_CheckTwoDateDigits(self, 0) || self->date[2] != 47)
-			return -1;
-	case 7:
-		if (!ASAPInfo_CheckTwoDateDigits(self, n - 7) || self->date[n - 5] != 47)
-			return -1;
-	case 4:
-		if (!ASAPInfo_CheckTwoDateDigits(self, n - 4) || !ASAPInfo_CheckTwoDateDigits(self, n - 2))
-			return -1;
-		return n;
-	default:
-		return -1;
-	}
-}
-
-static cibool ASAPInfo_CheckTwoDateDigits(ASAPInfo const *self, int i)
-{
-	int d1 = self->date[i];
-	int d2 = self->date[i + 1];
-	return d1 >= 48 && d1 <= 57 && d2 >= 48 && d2 <= 57;
-}
-
-static cibool ASAPInfo_CheckValidChar(int c)
-{
-	if (!ASAPInfo_IsValidChar(c))
-		return FALSE;
-	return TRUE;
-}
-
-static cibool ASAPInfo_CheckValidText(const char *s)
-{
-	int n = (int) strlen(s);
-	if (n > 127)
-		return FALSE;
-	{
-		int i;
-		for (i = 0; i < n; i++)
-			if (!ASAPInfo_CheckValidChar(s[i]))
-				return FALSE;
-	}
-	return TRUE;
-}
-
-const char *ASAPInfo_GetAuthor(ASAPInfo const *self)
-{
-	return self->author;
-}
-
-int ASAPInfo_GetChannels(ASAPInfo const *self)
-{
-	return self->channels;
-}
-
-int ASAPInfo_GetCovoxAddress(ASAPInfo const *self)
-{
-	return self->covoxAddr;
-}
-
-const char *ASAPInfo_GetDate(ASAPInfo const *self)
-{
-	return self->date;
-}
-
-int ASAPInfo_GetDayOfMonth(ASAPInfo const *self)
-{
-	int n = ASAPInfo_CheckDate(self);
-	if (n != 10)
-		return -1;
-	return ASAPInfo_GetTwoDateDigits(self, 0);
-}
-
-int ASAPInfo_GetDefaultSong(ASAPInfo const *self)
-{
-	return self->defaultSong;
-}
-
-int ASAPInfo_GetDuration(ASAPInfo const *self, int song)
-{
-	return self->durations[song];
-}
-
-const char *ASAPInfo_GetExtDescription(const char *ext)
-{
-	switch ((int) strlen(ext) >> 1 == 1 ? (ext[0] + (ext[1] << 8) + ((int) strlen(ext) == 3 ? ext[2] << 16 : 0)) | 2105376 : 0) {
-	case 7364979:
-		return "Slight Atari Player";
-	case 6516067:
-		return "Chaos Music Composer";
-	case 3370339:
-		return "CMC \"3/4\"";
-	case 7499107:
-		return "CMC \"Rzog\"";
-	case 7564643:
-		return "Stereo Double CMC";
-	case 6516068:
-		return "DoublePlay CMC";
-	case 7629924:
-		return "Delta Music Composer";
-	case 7630957:
-		return "Music ProTracker";
-	case 6582381:
-		return "MPT DoublePlay";
-	case 7630194:
-		return "Raster Music Tracker";
-	case 6516084:
-	case 3698036:
-		return "Theta Music Composer 1.x";
-	case 3304820:
-		return "Theta Music Composer 2.x";
-	case 2122598:
-		return "Future Composer";
-	case 7890296:
-		return "Atari 8-bit executable";
-	default:
-		return NULL;
-	}
-}
-
-int ASAPInfo_GetInitAddress(ASAPInfo const *self)
-{
-	return self->init;
-}
-
-const char *ASAPInfo_GetInstrumentName(ASAPInfo const *self, unsigned char const *module, int moduleLen, int i)
-{
-	if (self->type != ASAPModuleType_RMT)
-		return NULL;
-	{
-		int offset;
-		for (offset = ASAPInfo_GetWord(module, 4) - ASAPInfo_GetWord(module, 2) + 12; offset < moduleLen; offset++) {
-			if (module[offset - 1] == 0 && --i == -1) {
-				
-					return (const char *) module + offset;
-				}
-		}
-	}
-	return NULL;
-}
-
-cibool ASAPInfo_GetLoop(ASAPInfo const *self, int song)
-{
-	return self->loops[song];
-}
-
-int ASAPInfo_GetMonth(ASAPInfo const *self)
-{
-	int n = ASAPInfo_CheckDate(self);
-	if (n < 7)
-		return -1;
-	return ASAPInfo_GetTwoDateDigits(self, n - 7);
-}
-
-int ASAPInfo_GetMusicAddress(ASAPInfo const *self)
-{
-	return self->music;
-}
-
-const char *ASAPInfo_GetOriginalModuleExt(ASAPInfo const *self, unsigned char const *module, int moduleLen)
-{
-	switch (self->type) {
-	case ASAPModuleType_SAP_B:
-		if ((self->init == 1019 || self->init == 1017) && self->player == 1283)
-			return "dlt";
-		if (((self->init == 1267 || self->init == 1263) && self->player == 1283) || (self->init == 62707 && self->player == 62723))
-			return self->fastplay == 156 ? "mpd" : "mpt";
-		if (self->init == 3200 || ASAPInfo_GetRmtSapOffset(self, module, moduleLen) > 0)
-			return "rmt";
-		if (self->init == 1269 || self->init == 62709 || self->init == 1266 || ((self->init == 1255 || self->init == 62695 || self->init == 1252) && self->fastplay == 156) || ((self->init == 1253 || self->init == 62693 || self->init == 1250) && (self->fastplay == 104 || self->fastplay == 78)))
-			return "tmc";
-		if ((self->init == 4224 && self->player == 1283) || (self->init == 4992 && self->player == 2051))
-			return "tm2";
-		if (self->init == 1024 && self->player == 1027)
-			return "fc";
-		return NULL;
-	case ASAPModuleType_SAP_C:
-		if ((self->player == 1280 || self->player == 62720) && moduleLen >= 1024) {
-			if (self->fastplay == 156)
-				return "dmc";
-			if (self->channels > 1)
-				return "cms";
-			if (module[moduleLen - 170] == 30)
-				return "cmr";
-			if (module[moduleLen - 909] == 48)
-				return "cm3";
-			return "cmc";
-		}
-		return NULL;
-	case ASAPModuleType_CMC:
-		return self->fastplay == 156 ? "dmc" : "cmc";
-	case ASAPModuleType_CM3:
-		return "cm3";
-	case ASAPModuleType_CMR:
-		return "cmr";
-	case ASAPModuleType_CMS:
-		return "cms";
-	case ASAPModuleType_DLT:
-		return "dlt";
-	case ASAPModuleType_MPT:
-		return self->fastplay == 156 ? "mpd" : "mpt";
-	case ASAPModuleType_RMT:
-		return "rmt";
-	case ASAPModuleType_TMC:
-		return "tmc";
-	case ASAPModuleType_TM2:
-		return "tm2";
-	case ASAPModuleType_FC:
-		return "fc";
-	default:
-		return NULL;
-	}
-}
-
-static int ASAPInfo_GetPackedExt(const char *filename)
-{
-	int ext = 0;
-	{
-		int i;
-		for (i = (int) strlen(filename); --i > 0;) {
-			int c = filename[i];
-			if (c <= 32 || c > 122)
-				return 0;
-			if (c == 46)
-				return ext | 2105376;
-			ext = (ext << 8) + c;
-		}
-	}
-	return 0;
-}
-
-int ASAPInfo_GetPlayerAddress(ASAPInfo const *self)
-{
-	return self->player;
-}
-
-int ASAPInfo_GetPlayerRateHz(ASAPInfo const *self)
-{
-	int scanlineClock = self->ntsc ? 15699 : 15556;
-	return (scanlineClock + (self->fastplay >> 1)) / self->fastplay;
-}
-
-int ASAPInfo_GetPlayerRateScanlines(ASAPInfo const *self)
-{
-	return self->fastplay;
-}
-
-static int ASAPInfo_GetRmtInstrumentFrames(unsigned char const *module, int instrument, int volume, int volumeFrame, cibool onExtraPokey)
-{
-	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
-	int perFrame;
-	int playerCall;
-	int playerCalls;
-	int index;
-	int indexEnd;
-	int indexLoop;
-	int volumeSlideDepth;
-	int volumeMin;
-	static const unsigned char rmtVolumeSilent[16] = { 16, 8, 4, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1 };
-	int volumeSlide;
-	cibool silentLoop;
-	instrument = ASAPInfo_GetWord(module, 14) - addrToOffset + (instrument << 1);
-	if (module[instrument + 1] == 0)
-		return 0;
-	instrument = ASAPInfo_GetWord(module, instrument) - addrToOffset;
-	perFrame = module[12];
-	playerCall = volumeFrame * perFrame;
-	playerCalls = playerCall;
-	index = module[instrument] + 1 + playerCall * 3;
-	indexEnd = module[instrument + 2] + 3;
-	indexLoop = module[instrument + 3];
-	if (indexLoop >= indexEnd)
-		return 0;
-	volumeSlideDepth = module[instrument + 6];
-	volumeMin = module[instrument + 7];
-	if (index >= indexEnd)
-		index = (index - indexEnd) % (indexEnd - indexLoop) + indexLoop;
-	else {
-		do {
-			int vol = module[instrument + index];
-			if (onExtraPokey)
-				vol >>= 4;
-			if ((vol & 15) >= rmtVolumeSilent[volume])
-				playerCalls = playerCall + 1;
-			playerCall++;
-			index += 3;
-		}
-		while (index < indexEnd);
-	}
-	if (volumeSlideDepth == 0)
-		return playerCalls / perFrame;
-	volumeSlide = 128;
-	silentLoop = FALSE;
-	for (;;) {
-		int vol;
-		if (index >= indexEnd) {
-			if (silentLoop)
-				break;
-			silentLoop = TRUE;
-			index = indexLoop;
-		}
-		vol = module[instrument + index];
-		if (onExtraPokey)
-			vol >>= 4;
-		if ((vol & 15) >= rmtVolumeSilent[volume]) {
-			playerCalls = playerCall + 1;
-			silentLoop = FALSE;
-		}
-		playerCall++;
-		index += 3;
-		volumeSlide -= volumeSlideDepth;
-		if (volumeSlide < 0) {
-			volumeSlide += 256;
-			if (--volume <= volumeMin)
-				break;
-		}
-	}
-	return playerCalls / perFrame;
-}
-
-static int ASAPInfo_GetRmtSapOffset(ASAPInfo const *self, unsigned char const *module, int moduleLen)
-{
-	int offset;
-	if (self->player != 13315)
-		return -1;
-	offset = self->headerLen + ASAPInfo_GetWord(module, self->headerLen + 4) - ASAPInfo_GetWord(module, self->headerLen + 2) + 7;
-	if (offset + 6 >= moduleLen || module[offset + 4] != 82 || module[offset + 5] != 77 || module[offset + 6] != 84)
-		return -1;
-	return offset;
-}
-
-int ASAPInfo_GetSapHeaderLength(ASAPInfo const *self)
-{
-	return self->headerLen;
-}
-
-int ASAPInfo_GetSongs(ASAPInfo const *self)
-{
-	return self->songs;
-}
-
-const char *ASAPInfo_GetTitle(ASAPInfo const *self)
-{
-	return self->title;
-}
-
-const char *ASAPInfo_GetTitleOrFilename(ASAPInfo const *self)
-{
-	return self->title[0] != '\0' ? self->title : self->filename;
-}
-
-static int ASAPInfo_GetTwoDateDigits(ASAPInfo const *self, int i)
-{
-	return (self->date[i] - 48) * 10 + self->date[i + 1] - 48;
-}
-
-int ASAPInfo_GetTypeLetter(ASAPInfo const *self)
-{
-	switch (self->type) {
-	case ASAPModuleType_SAP_B:
-		return 66;
-	case ASAPModuleType_SAP_C:
-		return 67;
-	case ASAPModuleType_SAP_D:
-		return 68;
-	case ASAPModuleType_SAP_S:
-		return 83;
-	default:
-		return 0;
-	}
-}
-
-static int ASAPInfo_GetWord(unsigned char const *array, int i)
-{
-	return array[i] + (array[i + 1] << 8);
-}
-
-int ASAPInfo_GetYear(ASAPInfo const *self)
-{
-	int n = ASAPInfo_CheckDate(self);
-	if (n < 0)
-		return -1;
-	return ASAPInfo_GetTwoDateDigits(self, n - 4) * 100 + ASAPInfo_GetTwoDateDigits(self, n - 2);
-}
-
-static int ASAPInfo_GuessPackedExt(unsigned char const *module, int moduleLen)
-{
-	if (ASAPInfo_ValidateSap(module, moduleLen))
-		return 7364979;
-	if (ASAPInfo_ValidateFc(module, moduleLen))
-		return 2122598;
-	if (ASAPInfo_ValidateRmt(module, moduleLen))
-		return 7630194;
-	return -1;
-}
-
-static cibool ASAPInfo_HasStringAt(unsigned char const *module, int moduleIndex, const char *s)
-{
-	int n = (int) strlen(s);
-	{
-		int i;
-		for (i = 0; i < n; i++)
-			if (module[moduleIndex + i] != s[i])
-				return FALSE;
-	}
-	return TRUE;
-}
-
-static cibool ASAPInfo_IsDltPatternEnd(unsigned char const *module, int pos, int i)
-{
-	{
-		int ch;
-		for (ch = 0; ch < 4; ch++) {
-			int pattern = module[8198 + (ch << 8) + pos];
-			if (pattern < 64) {
-				int offset = 6 + (pattern << 7) + (i << 1);
-				if ((module[offset] & 128) == 0 && (module[offset + 1] & 128) != 0)
-					return TRUE;
-			}
-		}
-	}
-	return FALSE;
-}
-
-static cibool ASAPInfo_IsDltTrackEmpty(unsigned char const *module, int pos)
-{
-	return module[8198 + pos] >= 67 && module[8454 + pos] >= 64 && module[8710 + pos] >= 64 && module[8966 + pos] >= 64;
-}
-
-static cibool ASAPInfo_IsFcSongEnd(unsigned char const *module, int const *trackPos)
-{
-	cibool allLoop = TRUE;
-	{
-		int n;
-		for (n = 0; n < 3; n++) {
-			if (trackPos[n] >= 256)
-				return TRUE;
-			switch (module[3 + (n << 8) + trackPos[n]]) {
-			case 254:
-				return TRUE;
-			case 255:
-				break;
-			default:
-				allLoop = FALSE;
-				break;
-			}
-		}
-	}
-	return allLoop;
-}
-
-cibool ASAPInfo_IsNtsc(ASAPInfo const *self)
-{
-	return self->ntsc;
-}
-
-cibool ASAPInfo_IsOurExt(const char *ext)
-{
-	return ASAPInfo_IsOurPackedExt((int) strlen(ext) >> 1 == 1 ? (ext[0] + (ext[1] << 8) + ((int) strlen(ext) == 3 ? ext[2] << 16 : 0)) | 2105376 : 0);
-}
-
-cibool ASAPInfo_IsOurFile(const char *filename)
-{
-	return ASAPInfo_IsOurPackedExt(ASAPInfo_GetPackedExt(filename));
-}
-
-static cibool ASAPInfo_IsOurPackedExt(int ext)
-{
-	switch (ext) {
-	case 7364979:
-	case 6516067:
-	case 3370339:
-	case 7499107:
-	case 7564643:
-	case 6516068:
-	case 7629924:
-	case 7630957:
-	case 6582381:
-	case 7630194:
-	case 6516084:
-	case 3698036:
-	case 3304820:
-	case 2122598:
-		return TRUE;
-	default:
-		return FALSE;
-	}
-}
-
-static cibool ASAPInfo_IsValidChar(int c)
-{
-	return c >= 32 && c <= 124 && c != 96 && c != 123;
-}
-
-cibool ASAPInfo_Load(ASAPInfo *self, const char *filename, unsigned char const *module, int moduleLen)
-{
-	int ext;
-	if (filename != NULL) {
-		int len = (int) strlen(filename);
-		int basename = 0;
-		ext = -1;
-		{
-			int i;
-			for (i = len; --i >= 0;) {
-				int c = filename[i];
-				if (c == 47 || c == 92) {
-					basename = i + 1;
-					break;
-				}
-				if (c == 46)
-					ext = i;
-			}
-		}
-		if (ext < 0)
-			return FALSE;
-		ext -= basename;
-		if (ext > 127)
-			ext = 127;
-		((char *) memcpy(self->filename, filename + basename, ext))[ext] = '\0';
-		ext = ASAPInfo_GetPackedExt(filename);
-	}
-	else {
-		self->filename[0] = '\0';
-		if ((ext = ASAPInfo_GuessPackedExt(module, moduleLen)) == -1)
-			return FALSE;
-	}
-	self->author[0] = '\0';
-	self->title[0] = '\0';
-	self->date[0] = '\0';
-	self->channels = 1;
-	self->songs = 1;
-	self->defaultSong = 0;
-	{
-		int i;
-		for (i = 0; i < 32; i++) {
-			self->durations[i] = -1;
-			self->loops[i] = FALSE;
-		}
-	}
-	self->ntsc = FALSE;
-	self->fastplay = 312;
-	self->music = -1;
-	self->init = -1;
-	self->player = -1;
-	self->covoxAddr = -1;
-	self->headerLen = 0;
-	switch (ext) {
-	case 7364979:
-		return ASAPInfo_ParseSap(self, module, moduleLen);
-	case 6516067:
-		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMC);
-	case 3370339:
-		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CM3);
-	case 7499107:
-		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMR);
-	case 7564643:
-		self->channels = 2;
-		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMS);
-	case 6516068:
-		self->fastplay = 156;
-		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMC);
-	case 7629924:
-		return ASAPInfo_ParseDlt(self, module, moduleLen);
-	case 7630957:
-		return ASAPInfo_ParseMpt(self, module, moduleLen);
-	case 6582381:
-		self->fastplay = 156;
-		return ASAPInfo_ParseMpt(self, module, moduleLen);
-	case 7630194:
-		return ASAPInfo_ParseRmt(self, module, moduleLen);
-	case 6516084:
-	case 3698036:
-		return ASAPInfo_ParseTmc(self, module, moduleLen);
-	case 3304820:
-		return ASAPInfo_ParseTm2(self, module, moduleLen);
-	case 2122598:
-		return ASAPInfo_ParseFc(self, module, moduleLen);
-	default:
-		return FALSE;
-	}
-}
-
-static cibool ASAPInfo_ParseCmc(ASAPInfo *self, unsigned char const *module, int moduleLen, ASAPModuleType type)
-{
-	int lastPos;
-	if (moduleLen < 774)
-		return FALSE;
-	self->type = type;
-	if (!ASAPInfo_ParseModule(self, module, moduleLen))
-		return FALSE;
-	lastPos = 84;
-	while (--lastPos >= 0) {
-		if (module[518 + lastPos] < 176 || module[603 + lastPos] < 64 || module[688 + lastPos] < 64)
-			break;
-		if (self->channels == 2) {
-			if (module[774 + lastPos] < 176 || module[859 + lastPos] < 64 || module[944 + lastPos] < 64)
-				break;
-		}
-	}
-	self->songs = 0;
-	ASAPInfo_ParseCmcSong(self, module, 0);
-	{
-		int pos;
-		for (pos = 0; pos < lastPos && self->songs < 32; pos++)
-			if (module[518 + pos] == 143 || module[518 + pos] == 239)
-				ASAPInfo_ParseCmcSong(self, module, pos + 1);
-	}
-	return TRUE;
-}
-
-static void ASAPInfo_ParseCmcSong(ASAPInfo *self, unsigned char const *module, int pos)
-{
-	int tempo = module[25];
-	int playerCalls = 0;
-	int repStartPos = 0;
-	int repEndPos = 0;
-	int repTimes = 0;
-	unsigned char seen[85];
-	memset(seen, 0, sizeof(seen));
-	while (pos >= 0 && pos < 85) {
-		int p1;
-		int p2;
-		int p3;
-		if (pos == repEndPos && repTimes > 0) {
-			{
-				int i;
-				for (i = 0; i < 85; i++)
-					if (seen[i] == 1 || seen[i] == 3)
-						seen[i] = 0;
-			}
-			repTimes--;
-			pos = repStartPos;
-		}
-		if (seen[pos] != 0) {
-			if (seen[pos] != 1)
-				self->loops[self->songs] = TRUE;
-			break;
-		}
-		seen[pos] = 1;
-		p1 = module[518 + pos];
-		p2 = module[603 + pos];
-		p3 = module[688 + pos];
-		if (p1 == 254 || p2 == 254 || p3 == 254) {
-			pos++;
-			continue;
-		}
-		p1 |= self->type == ASAPModuleType_CMS ? 7 : 15;
-		switch (p1) {
-		case 135:
-		case 167:
-			pos++;
-			break;
-		case 143:
-			pos = -1;
-			break;
-		case 151:
-			if (p2 < 128) {
-				playerCalls += p2;
-				if (p3 < 128)
-					playerCalls += p3 * 50;
-			}
-			pos++;
-			break;
-		case 159:
-			pos = p2;
-			break;
-		case 175:
-			pos -= p2;
-			break;
-		case 191:
-			pos += p2;
-			break;
-		case 207:
-			if (p2 < 128) {
-				tempo = p2;
-				pos++;
-			}
-			else
-				pos = -1;
-			break;
-		case 223:
-			pos++;
-			repStartPos = pos;
-			repEndPos = pos + p2;
-			repTimes = p3 - 1;
-			break;
-		case 239:
-			self->loops[self->songs] = TRUE;
-			pos = -1;
-			break;
-		default:
-			p2 = repTimes > 0 ? 3 : 2;
-			for (p1 = 0; p1 < 85; p1++)
-				if (seen[p1] == 1)
-					seen[p1] = p2;
-			playerCalls += tempo * (self->type == ASAPModuleType_CM3 ? 48 : 64);
-			pos++;
-			break;
-		}
-	}
-	ASAPInfo_AddSong(self, playerCalls);
-}
-
-static int ASAPInfo_ParseDec(unsigned char const *module, int moduleIndex, int maxVal)
-{
-	if (module[moduleIndex] == 13)
-		return -1;
-	{
-		int r;
-		for (r = 0;;) {
-			int c = module[moduleIndex++];
-			if (c == 13)
-				return r;
-			if (c < 48 || c > 57)
-				return -1;
-			r = 10 * r + c - 48;
-			if (r > maxVal)
-				return -1;
-		}
-	}
-}
-
-static cibool ASAPInfo_ParseDlt(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	cibool seen[128];
-	if (moduleLen != 11270 && moduleLen != 11271)
-		return FALSE;
-	self->type = ASAPModuleType_DLT;
-	if (!ASAPInfo_ParseModule(self, module, moduleLen))
-		return FALSE;
-	if (self->music != 8192)
-		return FALSE;
-	memset(seen, 0, sizeof(seen));
-	self->songs = 0;
-	{
-		int pos;
-		for (pos = 0; pos < 128 && self->songs < 32; pos++) {
-			if (!seen[pos])
-				ASAPInfo_ParseDltSong(self, module, seen, pos);
-		}
-	}
-	if (self->songs == 0)
-		return FALSE;
-	return TRUE;
-}
-
-static void ASAPInfo_ParseDltSong(ASAPInfo *self, unsigned char const *module, cibool *seen, int pos)
-{
-	int playerCalls;
-	cibool loop;
-	int tempo;
-	while (pos < 128 && !seen[pos] && ASAPInfo_IsDltTrackEmpty(module, pos))
-		seen[pos++] = TRUE;
-	self->songPos[self->songs] = pos;
-	playerCalls = 0;
-	loop = FALSE;
-	tempo = 6;
-	while (pos < 128) {
-		int p1;
-		if (seen[pos]) {
-			loop = TRUE;
-			break;
-		}
-		seen[pos] = TRUE;
-		p1 = module[8198 + pos];
-		if (p1 == 64 || ASAPInfo_IsDltTrackEmpty(module, pos))
-			break;
-		if (p1 == 65)
-			pos = module[8326 + pos];
-		else if (p1 == 66)
-			tempo = module[8326 + pos++];
-		else {
-			{
-				int i;
-				for (i = 0; i < 64 && !ASAPInfo_IsDltPatternEnd(module, pos, i); i++)
-					playerCalls += tempo;
-			}
-			pos++;
-		}
-	}
-	if (playerCalls > 0) {
-		self->loops[self->songs] = loop;
-		ASAPInfo_AddSong(self, playerCalls);
-	}
-}
-
-int ASAPInfo_ParseDuration(const char *s)
-{
-	int i = 0;
-	int n = (int) strlen(s);
-	int d;
-	int r;
-	if (i >= n)
-		return -1;
-	d = s[i] - 48;
-	if (d < 0 || d > 9)
-		return -1;
-	i++;
-	r = d;
-	if (i < n) {
-		d = s[i] - 48;
-		if (d >= 0 && d <= 9) {
-			i++;
-			r = 10 * r + d;
-		}
-		if (i < n && s[i] == 58) {
-			i++;
-			if (i >= n)
-				return -1;
-			d = s[i] - 48;
-			if (d < 0 || d > 5)
-				return -1;
-			i++;
-			r = (6 * r + d) * 10;
-			if (i >= n)
-				return -1;
-			d = s[i] - 48;
-			if (d < 0 || d > 9)
-				return -1;
-			i++;
-			r += d;
-		}
-	}
-	r *= 1000;
-	if (i >= n)
-		return r;
-	if (s[i] != 46)
-		return -1;
-	i++;
-	if (i >= n)
-		return -1;
-	d = s[i] - 48;
-	if (d < 0 || d > 9)
-		return -1;
-	i++;
-	r += 100 * d;
-	if (i >= n)
-		return r;
-	d = s[i] - 48;
-	if (d < 0 || d > 9)
-		return -1;
-	i++;
-	r += 10 * d;
-	if (i >= n)
-		return r;
-	d = s[i] - 48;
-	if (d < 0 || d > 9)
-		return -1;
-	i++;
-	r += d;
-	return r;
-}
-
-static cibool ASAPInfo_ParseFc(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int patternOffsets[64];
-	int currentOffset;
-	if (!ASAPInfo_ValidateFc(module, moduleLen))
-		return FALSE;
-	self->type = ASAPModuleType_FC;
-	self->player = 1024;
-	self->music = 2560;
-	self->songs = 0;
-	self->headerLen = -1;
-	currentOffset = 899;
-	{
-		int i;
-		for (i = 0; i < 64; i++) {
-			patternOffsets[i] = currentOffset;
-			if ((currentOffset = ASAPInfo_AfterFF(module, moduleLen, currentOffset)) == -1)
-				return FALSE;
-		}
-	}
-	{
-		int i;
-		for (i = 0; i < 32; i++)
-			if ((currentOffset = ASAPInfo_AfterFF(module, moduleLen, currentOffset)) == -1)
-				return FALSE;
-	}
-	{
-		int pos;
-		for (pos = 0; pos < 256 && self->songs < 32;) {
-			int trackPos[3];
-			int patternDelay[3];
-			int noteDuration[3];
-			int patternPos[3];
-			int playerCalls;
-			{
-				int n;
-				for (n = 0; n < 3; n++)
-					trackPos[n] = pos;
-			}
-			memset(patternDelay, 0, sizeof(patternDelay));
-			memset(noteDuration, 0, sizeof(noteDuration));
-			memset(patternPos, 0, sizeof(patternPos));
-			playerCalls = 0;
-			self->loops[self->songs] = TRUE;
-			while (!ASAPInfo_IsFcSongEnd(module, trackPos)) {
-				{
-					int n;
-					for (n = 0; n < 3; n++) {
-						int trackCmd = module[3 + (n << 8) + trackPos[n]];
-						if (trackCmd != 255 && patternDelay[n]-- <= 0) {
-							while (trackPos[n] < 256) {
-								trackCmd = module[3 + (n << 8) + trackPos[n]];
-								if (trackCmd < 64) {
-									int patternCmd = module[patternOffsets[trackCmd] + patternPos[n]++];
-									if (patternCmd < 64) {
-										patternDelay[n] = noteDuration[n];
-										break;
-									}
-									else if (patternCmd < 96)
-										noteDuration[n] = patternCmd - 64;
-									else if (patternCmd == 255) {
-										patternDelay[n] = 0;
-										noteDuration[n] = 0;
-										patternPos[n] = 0;
-										trackPos[n]++;
-									}
-								}
-								else if (trackCmd == 64)
-									trackPos[n] += 2;
-								else if (trackCmd == 254) {
-									self->loops[self->songs] = FALSE;
-									break;
-								}
-								else if (trackCmd == 255)
-									break;
-								else
-									trackPos[n]++;
-							}
-						}
-					}
-				}
-				if (ASAPInfo_IsFcSongEnd(module, trackPos))
-					break;
-				playerCalls += module[2];
-			}
-			pos = -1;
-			{
-				int n;
-				for (n = 0; n < 3; n++) {
-					int nxtrkpos = trackPos[n];
-					if (patternPos[n] > 0)
-						nxtrkpos++;
-					if (pos < nxtrkpos)
-						pos = nxtrkpos;
-				}
-			}
-			pos++;
-			if (pos <= 256)
-				ASAPInfo_AddSong(self, playerCalls);
-		}
-	}
-	return TRUE;
-}
-
-static int ASAPInfo_ParseHex(unsigned char const *module, int moduleIndex)
-{
-	if (module[moduleIndex] == 13)
-		return -1;
-	{
-		int r;
-		for (r = 0;;) {
-			int c = module[moduleIndex++];
-			if (c == 13)
-				return r;
-			if (r > 4095)
-				return -1;
-			r <<= 4;
-			if (c >= 48 && c <= 57)
-				r += c - 48;
-			else if (c >= 65 && c <= 70)
-				r += c - 65 + 10;
-			else if (c >= 97 && c <= 102)
-				r += c - 97 + 10;
-			else
-				return -1;
-		}
-	}
-}
-
-static cibool ASAPInfo_ParseModule(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int musicLastByte;
-	int blockLen;
-	if ((module[0] != 255 || module[1] != 255) && (module[0] != 0 || module[1] != 0))
-		return FALSE;
-	self->music = ASAPInfo_GetWord(module, 2);
-	musicLastByte = ASAPInfo_GetWord(module, 4);
-	if (self->music <= 55295 && musicLastByte >= 53248)
-		return FALSE;
-	blockLen = musicLastByte + 1 - self->music;
-	if (6 + blockLen != moduleLen) {
-		int infoAddr;
-		int infoLen;
-		if (self->type != ASAPModuleType_RMT || 11 + blockLen > moduleLen)
-			return FALSE;
-		infoAddr = ASAPInfo_GetWord(module, 6 + blockLen);
-		if (infoAddr != self->music + blockLen)
-			return FALSE;
-		infoLen = ASAPInfo_GetWord(module, 8 + blockLen) + 1 - infoAddr;
-		if (10 + blockLen + infoLen != moduleLen)
-			return FALSE;
-	}
-	return TRUE;
-}
-
-static cibool ASAPInfo_ParseMpt(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int track0Addr;
-	int songLen;
-	cibool globalSeen[256];
-	if (moduleLen < 464)
-		return FALSE;
-	self->type = ASAPModuleType_MPT;
-	if (!ASAPInfo_ParseModule(self, module, moduleLen))
-		return FALSE;
-	track0Addr = ASAPInfo_GetWord(module, 2) + 458;
-	if (module[454] + (module[458] << 8) != track0Addr)
-		return FALSE;
-	songLen = (module[455] + (module[459] << 8) - track0Addr) >> 1;
-	if (songLen > 254)
-		return FALSE;
-	memset(globalSeen, 0, sizeof(globalSeen));
-	self->songs = 0;
-	{
-		int pos;
-		for (pos = 0; pos < songLen && self->songs < 32; pos++) {
-			if (!globalSeen[pos]) {
-				self->songPos[self->songs] = pos;
-				ASAPInfo_ParseMptSong(self, module, globalSeen, songLen, pos);
-			}
-		}
-	}
-	if (self->songs == 0)
-		return FALSE;
-	return TRUE;
-}
-
-static void ASAPInfo_ParseMptSong(ASAPInfo *self, unsigned char const *module, cibool *globalSeen, int songLen, int pos)
-{
-	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
-	int tempo = module[463];
-	int playerCalls = 0;
-	unsigned char seen[256];
-	int patternOffset[4];
-	int blankRows[4];
-	int blankRowsCounter[4];
-	memset(seen, 0, sizeof(seen));
-	memset(blankRows, 0, sizeof(blankRows));
-	while (pos < songLen) {
-		int i;
-		int ch;
-		if (seen[pos] != 0) {
-			if (seen[pos] != 1)
-				self->loops[self->songs] = TRUE;
-			break;
-		}
-		seen[pos] = 1;
-		globalSeen[pos] = TRUE;
-		i = module[464 + pos * 2];
-		if (i == 255) {
-			pos = module[465 + pos * 2];
-			continue;
-		}
-		for (ch = 3; ch >= 0; ch--) {
-			i = module[454 + ch] + (module[458 + ch] << 8) - addrToOffset;
-			i = module[i + pos * 2];
-			if (i >= 64)
-				break;
-			i <<= 1;
-			i = ASAPInfo_GetWord(module, 70 + i);
-			patternOffset[ch] = i == 0 ? 0 : i - addrToOffset;
-			blankRowsCounter[ch] = 0;
-		}
-		if (ch >= 0)
-			break;
-		for (i = 0; i < songLen; i++)
-			if (seen[i] == 1)
-				seen[i] = 2;
-		{
-			int patternRows;
-			for (patternRows = module[462]; --patternRows >= 0;) {
-				for (ch = 3; ch >= 0; ch--) {
-					if (patternOffset[ch] == 0 || --blankRowsCounter[ch] >= 0)
-						continue;
-					for (;;) {
-						i = module[patternOffset[ch]++];
-						if (i < 64 || i == 254)
-							break;
-						if (i < 128)
-							continue;
-						if (i < 192) {
-							blankRows[ch] = i - 128;
-							continue;
-						}
-						if (i < 208)
-							continue;
-						if (i < 224) {
-							tempo = i - 207;
-							continue;
-						}
-						patternRows = 0;
-					}
-					blankRowsCounter[ch] = blankRows[ch];
-				}
-				playerCalls += tempo;
-			}
-		}
-		pos++;
-	}
-	if (playerCalls > 0)
-		ASAPInfo_AddSong(self, playerCalls);
-}
-
-static cibool ASAPInfo_ParseRmt(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int posShift;
-	int perFrame;
-	int blockLen;
-	int songLen;
-	cibool globalSeen[256];
-	unsigned char title[127];
-	int titleLen;
-	if (!ASAPInfo_ValidateRmt(module, moduleLen))
-		return FALSE;
-	switch (module[9]) {
-	case 52:
-		posShift = 2;
-		break;
-	case 56:
-		self->channels = 2;
-		posShift = 3;
-		break;
-	default:
-		return FALSE;
-	}
-	perFrame = module[12];
-	if (perFrame < 1 || perFrame > 4)
-		return FALSE;
-	self->type = ASAPModuleType_RMT;
-	if (!ASAPInfo_ParseModule(self, module, moduleLen))
-		return FALSE;
-	blockLen = ASAPInfo_GetWord(module, 4) + 1 - self->music;
-	songLen = ASAPInfo_GetWord(module, 4) + 1 - ASAPInfo_GetWord(module, 20);
-	if (posShift == 3 && (songLen & 4) != 0 && module[6 + blockLen - 4] == 254)
-		songLen += 4;
-	songLen >>= posShift;
-	if (songLen >= 256)
-		return FALSE;
-	memset(globalSeen, 0, sizeof(globalSeen));
-	self->songs = 0;
-	{
-		int pos;
-		for (pos = 0; pos < songLen && self->songs < 32; pos++) {
-			if (!globalSeen[pos]) {
-				self->songPos[self->songs] = pos;
-				ASAPInfo_ParseRmtSong(self, module, globalSeen, songLen, posShift, pos);
-			}
-		}
-	}
-	self->fastplay = 312 / perFrame;
-	self->player = 1536;
-	if (self->songs == 0)
-		return FALSE;
-	for (titleLen = 0; titleLen < 127 && 10 + blockLen + titleLen < moduleLen; titleLen++) {
-		unsigned char c = module[10 + blockLen + titleLen];
-		if (c == 0)
-			break;
-		title[titleLen] = ASAPInfo_IsValidChar(c) ? c : 32;
-	}
-	((char *) memcpy(self->title, title + 0, titleLen))[titleLen] = '\0';
-	return TRUE;
-}
-
-static void ASAPInfo_ParseRmtSong(ASAPInfo *self, unsigned char const *module, cibool *globalSeen, int songLen, int posShift, int pos)
-{
-	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
-	int tempo = module[11];
-	int frames = 0;
-	int songOffset = ASAPInfo_GetWord(module, 20) - addrToOffset;
-	int patternLoOffset = ASAPInfo_GetWord(module, 16) - addrToOffset;
-	int patternHiOffset = ASAPInfo_GetWord(module, 18) - addrToOffset;
-	unsigned char seen[256];
-	int patternBegin[8];
-	int patternOffset[8];
-	int blankRows[8];
-	int instrumentNo[8];
-	int instrumentFrame[8];
-	int volumeValue[8];
-	int volumeFrame[8];
-	int instrumentFrames;
-	memset(seen, 0, sizeof(seen));
-	memset(instrumentNo, 0, sizeof(instrumentNo));
-	memset(instrumentFrame, 0, sizeof(instrumentFrame));
-	memset(volumeValue, 0, sizeof(volumeValue));
-	memset(volumeFrame, 0, sizeof(volumeFrame));
-	while (pos < songLen) {
-		if (seen[pos] != 0) {
-			if (seen[pos] != 1)
-				self->loops[self->songs] = TRUE;
-			break;
-		}
-		seen[pos] = 1;
-		globalSeen[pos] = TRUE;
-		if (module[songOffset + (pos << posShift)] == 254) {
-			pos = module[songOffset + (pos << posShift) + 1];
-			continue;
-		}
-		{
-			int ch;
-			for (ch = 0; ch < 1 << posShift; ch++) {
-				int p = module[songOffset + (pos << posShift) + ch];
-				if (p == 255)
-					blankRows[ch] = 256;
-				else {
-					patternOffset[ch] = patternBegin[ch] = module[patternLoOffset + p] + (module[patternHiOffset + p] << 8) - addrToOffset;
-					if (patternOffset[ch] < 0)
-						return;
-					blankRows[ch] = 0;
-				}
-			}
-		}
-		{
-			int i;
-			for (i = 0; i < songLen; i++)
-				if (seen[i] == 1)
-					seen[i] = 2;
-		}
-		{
-			int patternRows;
-			for (patternRows = module[10]; --patternRows >= 0;) {
-				{
-					int ch;
-					for (ch = 0; ch < 1 << posShift; ch++) {
-						if (--blankRows[ch] > 0)
-							continue;
-						for (;;) {
-							int i = module[patternOffset[ch]++];
-							if ((i & 63) < 62) {
-								i += module[patternOffset[ch]++] << 8;
-								if ((i & 63) != 61) {
-									instrumentNo[ch] = i >> 10;
-									instrumentFrame[ch] = frames;
-								}
-								volumeValue[ch] = (i >> 6) & 15;
-								volumeFrame[ch] = frames;
-								break;
-							}
-							if (i == 62) {
-								blankRows[ch] = module[patternOffset[ch]++];
-								break;
-							}
-							if ((i & 63) == 62) {
-								blankRows[ch] = i >> 6;
-								break;
-							}
-							if ((i & 191) == 63) {
-								tempo = module[patternOffset[ch]++];
-								continue;
-							}
-							if (i == 191) {
-								patternOffset[ch] = patternBegin[ch] + module[patternOffset[ch]];
-								continue;
-							}
-							patternRows = -1;
-							break;
-						}
-						if (patternRows < 0)
-							break;
-					}
-				}
-				if (patternRows >= 0)
-					frames += tempo;
-			}
-		}
-		pos++;
-	}
-	instrumentFrames = 0;
-	{
-		int ch;
-		for (ch = 0; ch < 1 << posShift; ch++) {
-			int frame = instrumentFrame[ch];
-			frame += ASAPInfo_GetRmtInstrumentFrames(module, instrumentNo[ch], volumeValue[ch], volumeFrame[ch] - frame, ch >= 4);
-			if (instrumentFrames < frame)
-				instrumentFrames = frame;
-		}
-	}
-	if (frames > instrumentFrames) {
-		if (frames - instrumentFrames > 100)
-			self->loops[self->songs] = FALSE;
-		frames = instrumentFrames;
-	}
-	if (frames > 0)
-		ASAPInfo_AddSong(self, frames);
-}
-
-static cibool ASAPInfo_ParseSap(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int type;
-	int moduleIndex;
-	int durationIndex;
-	if (!ASAPInfo_ValidateSap(module, moduleLen))
-		return FALSE;
-	self->fastplay = -1;
-	type = 0;
-	moduleIndex = 5;
-	durationIndex = 0;
-	while (module[moduleIndex] != 255) {
-		if (moduleIndex + 8 >= moduleLen)
-			return FALSE;
-		if (ASAPInfo_HasStringAt(module, moduleIndex, "AUTHOR ")) {
-			int len;
-			if ((len = ASAPInfo_ParseText(module, moduleIndex + 7)) == -1)
-				return FALSE;
-			if (len > 0)
-				((char *) memcpy(self->author, module + moduleIndex + 7 + 1, len))[len] = '\0';
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "NAME ")) {
-			int len;
-			if ((len = ASAPInfo_ParseText(module, moduleIndex + 5)) == -1)
-				return FALSE;
-			if (len > 0)
-				((char *) memcpy(self->title, module + moduleIndex + 5 + 1, len))[len] = '\0';
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "DATE ")) {
-			int len;
-			if ((len = ASAPInfo_ParseText(module, moduleIndex + 5)) == -1)
-				return FALSE;
-			if (len > 0)
-				((char *) memcpy(self->date, module + moduleIndex + 5 + 1, len))[len] = '\0';
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "SONGS ")) {
-			if ((self->songs = ASAPInfo_ParseDec(module, moduleIndex + 6, 32)) == -1)
-				return FALSE;
-			if (self->songs < 1)
-				return FALSE;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "DEFSONG ")) {
-			if ((self->defaultSong = ASAPInfo_ParseDec(module, moduleIndex + 8, 31)) == -1)
-				return FALSE;
-			if (self->defaultSong < 0)
-				return FALSE;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "STEREO\r"))
-			self->channels = 2;
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "NTSC\r"))
-			self->ntsc = TRUE;
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "TIME ")) {
-			int len;
-			char s[10];
-			int duration;
-			if (durationIndex >= 32)
-				return FALSE;
-			moduleIndex += 5;
-			for (len = 0; module[moduleIndex + len] != 13; len++) {
-			}
-			if (len > 5 && ASAPInfo_HasStringAt(module, moduleIndex + len - 5, " LOOP")) {
-				self->loops[durationIndex] = TRUE;
-				len -= 5;
-			}
-			if (len > 9)
-				return FALSE;
-			((char *) memcpy(s, module + moduleIndex, len))[len] = '\0';
-			if ((duration = ASAPInfo_ParseDuration(s)) == -1)
-				return FALSE;
-			self->durations[durationIndex++] = duration;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "TYPE "))
-			type = module[moduleIndex + 5];
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "FASTPLAY ")) {
-			if ((self->fastplay = ASAPInfo_ParseDec(module, moduleIndex + 9, 32767)) == -1)
-				return FALSE;
-			if (self->fastplay < 1)
-				return FALSE;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "MUSIC ")) {
-			if ((self->music = ASAPInfo_ParseHex(module, moduleIndex + 6)) == -1)
-				return FALSE;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "INIT ")) {
-			if ((self->init = ASAPInfo_ParseHex(module, moduleIndex + 5)) == -1)
-				return FALSE;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "PLAYER ")) {
-			if ((self->player = ASAPInfo_ParseHex(module, moduleIndex + 7)) == -1)
-				return FALSE;
-		}
-		else if (ASAPInfo_HasStringAt(module, moduleIndex, "COVOX ")) {
-			if ((self->covoxAddr = ASAPInfo_ParseHex(module, moduleIndex + 6)) == -1)
-				return FALSE;
-			if (self->covoxAddr != 54784)
-				return FALSE;
-			self->channels = 2;
-		}
-		while (module[moduleIndex++] != 13) {
-			if (moduleIndex >= moduleLen)
-				return FALSE;
-		}
-		if (module[moduleIndex++] != 10)
-			return FALSE;
-	}
-	if (self->defaultSong >= self->songs)
-		return FALSE;
-	switch (type) {
-	case 66:
-		if (self->player < 0)
-			return FALSE;
-		if (self->init < 0)
-			return FALSE;
-		self->type = ASAPModuleType_SAP_B;
-		break;
-	case 67:
-		if (self->player < 0)
-			return FALSE;
-		if (self->music < 0)
-			return FALSE;
-		self->type = ASAPModuleType_SAP_C;
-		break;
-	case 68:
-		if (self->init < 0)
-			return FALSE;
-		self->type = ASAPModuleType_SAP_D;
-		break;
-	case 83:
-		if (self->init < 0)
-			return FALSE;
-		self->type = ASAPModuleType_SAP_S;
-		if (self->fastplay < 0)
-			self->fastplay = 78;
-		break;
-	default:
-		return FALSE;
-	}
-	if (self->fastplay < 0)
-		self->fastplay = self->ntsc ? 262 : 312;
-	if (module[moduleIndex + 1] != 255)
-		return FALSE;
-	self->headerLen = moduleIndex;
-	return TRUE;
-}
-
-static int ASAPInfo_ParseText(unsigned char const *module, int moduleIndex)
-{
-	if (module[moduleIndex] != 34)
-		return -1;
-	if (ASAPInfo_HasStringAt(module, moduleIndex + 1, "<?>\"\r"))
-		return 0;
-	{
-		int len;
-		for (len = 0;; len++) {
-			int c = module[moduleIndex + 1 + len];
-			if (c == 34 && module[moduleIndex + 2 + len] == 13)
-				return len;
-			if (!ASAPInfo_CheckValidChar(c))
-				return -1;
-		}
-	}
-}
-
-static cibool ASAPInfo_ParseTm2(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int i;
-	int lastPos;
-	int c;
-	unsigned char title[127];
-	int titleLen;
-	if (moduleLen < 932)
-		return FALSE;
-	self->type = ASAPModuleType_TM2;
-	if (!ASAPInfo_ParseModule(self, module, moduleLen))
-		return FALSE;
-	i = module[37];
-	if (i < 1 || i > 4)
-		return FALSE;
-	self->fastplay = 312 / i;
-	self->player = 2048;
-	if (module[31] != 0)
-		self->channels = 2;
-	lastPos = 65535;
-	for (i = 0; i < 128; i++) {
-		int instrAddr = module[134 + i] + (module[774 + i] << 8);
-		if (instrAddr != 0 && instrAddr < lastPos)
-			lastPos = instrAddr;
-	}
-	for (i = 0; i < 256; i++) {
-		int patternAddr = module[262 + i] + (module[518 + i] << 8);
-		if (patternAddr != 0 && patternAddr < lastPos)
-			lastPos = patternAddr;
-	}
-	lastPos -= ASAPInfo_GetWord(module, 2) + 896;
-	if (902 + lastPos >= moduleLen)
-		return FALSE;
-	do {
-		if (lastPos <= 0)
-			return FALSE;
-		lastPos -= 17;
-		c = module[918 + lastPos];
-	}
-	while (c == 0 || c >= 128);
-	self->songs = 0;
-	ASAPInfo_ParseTm2Song(self, module, 0);
-	for (i = 0; i < lastPos && self->songs < 32; i += 17) {
-		c = module[918 + i];
-		if (c == 0 || c >= 128)
-			ASAPInfo_ParseTm2Song(self, module, i + 17);
-	}
-	titleLen = ASAPInfo_ParseTmcTitle(title, 0, module, 39);
-	titleLen = ASAPInfo_ParseTmcTitle(title, titleLen, module, 71);
-	titleLen = ASAPInfo_ParseTmcTitle(title, titleLen, module, 103);
-	((char *) memcpy(self->title, title + 0, titleLen))[titleLen] = '\0';
-	return TRUE;
-}
-
-static void ASAPInfo_ParseTm2Song(ASAPInfo *self, unsigned char const *module, int pos)
-{
-	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
-	int tempo = module[36] + 1;
-	int playerCalls = 0;
-	int patternOffset[8];
-	int blankRows[8];
-	for (;;) {
-		int patternRows = module[918 + pos];
-		if (patternRows == 0)
-			break;
-		if (patternRows >= 128) {
-			self->loops[self->songs] = TRUE;
-			break;
-		}
-		{
-			int ch;
-			for (ch = 7; ch >= 0; ch--) {
-				int pat = module[917 + pos - 2 * ch];
-				patternOffset[ch] = module[262 + pat] + (module[518 + pat] << 8) - addrToOffset;
-				blankRows[ch] = 0;
-			}
-		}
-		while (--patternRows >= 0) {
-			{
-				int ch;
-				for (ch = 7; ch >= 0; ch--) {
-					if (--blankRows[ch] >= 0)
-						continue;
-					for (;;) {
-						int i = module[patternOffset[ch]++];
-						if (i == 0) {
-							patternOffset[ch]++;
-							break;
-						}
-						if (i < 64) {
-							if (module[patternOffset[ch]++] >= 128)
-								patternOffset[ch]++;
-							break;
-						}
-						if (i < 128) {
-							patternOffset[ch]++;
-							break;
-						}
-						if (i == 128) {
-							blankRows[ch] = module[patternOffset[ch]++];
-							break;
-						}
-						if (i < 192)
-							break;
-						if (i < 208) {
-							tempo = i - 191;
-							continue;
-						}
-						if (i < 224) {
-							patternOffset[ch]++;
-							break;
-						}
-						if (i < 240) {
-							patternOffset[ch] += 2;
-							break;
-						}
-						if (i < 255) {
-							blankRows[ch] = i - 240;
-							break;
-						}
-						blankRows[ch] = 64;
-						break;
-					}
-				}
-			}
-			playerCalls += tempo;
-		}
-		pos += 17;
-	}
-	ASAPInfo_AddSong(self, playerCalls);
-}
-
-static cibool ASAPInfo_ParseTmc(ASAPInfo *self, unsigned char const *module, int moduleLen)
-{
-	int i;
-	int lastPos;
-	unsigned char title[127];
-	int titleLen;
-	if (moduleLen < 464)
-		return FALSE;
-	self->type = ASAPModuleType_TMC;
-	if (!ASAPInfo_ParseModule(self, module, moduleLen))
-		return FALSE;
-	self->channels = 2;
-	i = 0;
-	while (module[102 + i] == 0) {
-		if (++i >= 64)
-			return FALSE;
-	}
-	lastPos = (module[102 + i] << 8) + module[38 + i] - ASAPInfo_GetWord(module, 2) - 432;
-	if (437 + lastPos >= moduleLen)
-		return FALSE;
-	do {
-		if (lastPos <= 0)
-			return FALSE;
-		lastPos -= 16;
-	}
-	while (module[437 + lastPos] >= 128);
-	self->songs = 0;
-	ASAPInfo_ParseTmcSong(self, module, 0);
-	for (i = 0; i < lastPos && self->songs < 32; i += 16)
-		if (module[437 + i] >= 128)
-			ASAPInfo_ParseTmcSong(self, module, i + 16);
-	i = module[37];
-	if (i < 1 || i > 4)
-		return FALSE;
-	self->fastplay = 312 / i;
-	titleLen = ASAPInfo_ParseTmcTitle(title, 0, module, 6);
-	((char *) memcpy(self->title, title + 0, titleLen))[titleLen] = '\0';
-	return TRUE;
-}
-
-static void ASAPInfo_ParseTmcSong(ASAPInfo *self, unsigned char const *module, int pos)
-{
-	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
-	int tempo = module[36] + 1;
-	int frames = 0;
-	int patternOffset[8];
-	int blankRows[8];
-	while (module[437 + pos] < 128) {
-		{
-			int ch;
-			for (ch = 7; ch >= 0; ch--) {
-				int pat = module[437 + pos - 2 * ch];
-				patternOffset[ch] = module[166 + pat] + (module[294 + pat] << 8) - addrToOffset;
-				blankRows[ch] = 0;
-			}
-		}
-		{
-			int patternRows;
-			for (patternRows = 64; --patternRows >= 0;) {
-				{
-					int ch;
-					for (ch = 7; ch >= 0; ch--) {
-						if (--blankRows[ch] >= 0)
-							continue;
-						for (;;) {
-							int i = module[patternOffset[ch]++];
-							if (i < 64) {
-								patternOffset[ch]++;
-								break;
-							}
-							if (i == 64) {
-								i = module[patternOffset[ch]++];
-								if ((i & 127) == 0)
-									patternRows = 0;
-								else
-									tempo = (i & 127) + 1;
-								if (i >= 128)
-									patternOffset[ch]++;
-								break;
-							}
-							if (i < 128) {
-								i = module[patternOffset[ch]++] & 127;
-								if (i == 0)
-									patternRows = 0;
-								else
-									tempo = i + 1;
-								patternOffset[ch]++;
-								break;
-							}
-							if (i < 192)
-								continue;
-							blankRows[ch] = i - 191;
-							break;
-						}
-					}
-				}
-				frames += tempo;
-			}
-		}
-		pos += 16;
-	}
-	if (module[436 + pos] < 128)
-		self->loops[self->songs] = TRUE;
-	ASAPInfo_AddSong(self, frames);
-}
-
-static int ASAPInfo_ParseTmcTitle(unsigned char *title, int titleLen, unsigned char const *module, int moduleOffset)
-{
-	int lastOffset = moduleOffset + 29;
-	while (module[lastOffset] == 32) {
-		if (--lastOffset < moduleOffset)
-			return titleLen;
-	}
-	if (titleLen > 0) {
-		title[titleLen++] = 32;
-		title[titleLen++] = 124;
-		title[titleLen++] = 32;
-	}
-	while (moduleOffset <= lastOffset) {
-		int c = module[moduleOffset++] & 127;
-		switch (c) {
-		case 20:
-			c = 42;
-			break;
-		case 1:
-		case 3:
-		case 5:
-		case 12:
-		case 14:
-		case 15:
-		case 19:
-			c += 96;
-			break;
-		case 24:
-		case 26:
-			c = 122;
-			break;
-		default:
-			if (!ASAPInfo_IsValidChar(c))
-				c = 32;
-			break;
-		}
-		title[titleLen++] = c;
-	}
-	return titleLen;
-}
-
-cibool ASAPInfo_SetAuthor(ASAPInfo *self, const char *value)
-{
-	if (!ASAPInfo_CheckValidText(value))
-		return FALSE;
-	strcpy(self->author, value);
-	return TRUE;
-}
-
-cibool ASAPInfo_SetDate(ASAPInfo *self, const char *value)
-{
-	if (!ASAPInfo_CheckValidText(value))
-		return FALSE;
-	strcpy(self->date, value);
-	return TRUE;
-}
-
-cibool ASAPInfo_SetDuration(ASAPInfo *self, int song, int duration)
-{
-	if (song < 0 || song >= self->songs)
-		return FALSE;
-	self->durations[song] = duration;
-	return TRUE;
-}
-
-cibool ASAPInfo_SetLoop(ASAPInfo *self, int song, cibool loop)
-{
-	if (song < 0 || song >= self->songs)
-		return FALSE;
-	self->loops[song] = loop;
-	return TRUE;
-}
-
-cibool ASAPInfo_SetMusicAddress(ASAPInfo *self, int address)
-{
-	if (address < 0 || address >= 65535)
-		return FALSE;
-	self->music = address;
-	return TRUE;
-}
-
-cibool ASAPInfo_SetTitle(ASAPInfo *self, const char *value)
-{
-	if (!ASAPInfo_CheckValidText(value))
-		return FALSE;
-	strcpy(self->title, value);
-	return TRUE;
-}
-
-static cibool ASAPInfo_ValidateFc(unsigned char const *module, int moduleLen)
-{
-	if (moduleLen < 899)
-		return FALSE;
-	if (module[0] != 38 || module[1] != 35)
-		return FALSE;
-	return TRUE;
-}
-
-static cibool ASAPInfo_ValidateRmt(unsigned char const *module, int moduleLen)
-{
-	if (moduleLen < 48)
-		return FALSE;
-	if (module[6] != 82 || module[7] != 77 || module[8] != 84 || module[13] != 1)
-		return FALSE;
-	return TRUE;
-}
-
-static cibool ASAPInfo_ValidateSap(unsigned char const *module, int moduleLen)
-{
-	return moduleLen >= 30 && ASAPInfo_HasStringAt(module, 0, "SAP\r\n");
-}
-
-int ASAPWriter_DurationToString(unsigned char *result, int value)
-{
-	if (!ASAPWriter_SecondsToString(result, 0, value))
-		return 0;
-	value %= 1000;
-	if (value == 0)
-		return 5;
-	result[5] = 46;
-	ASAPWriter_TwoDigitsToString(result, 6, value / 10);
-	value %= 10;
-	if (value == 0)
-		return 8;
-	result[8] = 48 + value;
-	return 9;
-}
-
-void ASAPWriter_EnumSaveExts(StringConsumer output, ASAPInfo const *info, unsigned char const *module, int moduleLen)
-{
-	switch (info->type) {
-		const char *ext;
-	case ASAPModuleType_SAP_B:
-	case ASAPModuleType_SAP_C:
-		output.func(output.obj, "sap");
-		ext = ASAPInfo_GetOriginalModuleExt(info, module, moduleLen);
-		if (ext != NULL)
-			output.func(output.obj, ext);
-		output.func(output.obj, "xex");
-		break;
-	case ASAPModuleType_SAP_D:
-		output.func(output.obj, "sap");
-		if (info->fastplay == 312)
-			output.func(output.obj, "xex");
-		break;
-	case ASAPModuleType_SAP_S:
-		output.func(output.obj, "sap");
-		break;
-	default:
-		output.func(output.obj, ASAPInfo_GetOriginalModuleExt(info, module, moduleLen));
-		output.func(output.obj, "sap");
-		output.func(output.obj, "xex");
-		break;
-	}
-}
-
-static int ASAPWriter_FormatXexInfoText(unsigned char *dest, int destLen, int endColumn, const char *src, cibool author)
-{
-	int srcLen = (int) strlen(src);
-	{
-		int srcOffset;
-		for (srcOffset = 0; srcOffset < srcLen;) {
-			int c = src[srcOffset++];
-			if (c == 32) {
-				int wordLen;
-				if (author && srcOffset < srcLen && src[srcOffset] == 38) {
-					int authorLen;
-					for (authorLen = 1; srcOffset + authorLen < srcLen; authorLen++) {
-						if (src[srcOffset + authorLen] == 32 && srcOffset + authorLen + 1 < srcLen && src[srcOffset + authorLen + 1] == 38)
-							break;
-					}
-					if (authorLen <= 32 && destLen % 32 + 1 + authorLen > 32) {
-						destLen = ASAPWriter_PadXexInfo(dest, destLen, 1);
-						continue;
-					}
-				}
-				for (wordLen = 0; srcOffset + wordLen < srcLen && src[srcOffset + wordLen] != 32; wordLen++) {
-				}
-				if (wordLen <= 32 && destLen % 32 + 1 + wordLen > 32) {
-					destLen = ASAPWriter_PadXexInfo(dest, destLen, 0);
-					continue;
-				}
-			}
-			dest[destLen++] = c;
-		}
-	}
-	return ASAPWriter_PadXexInfo(dest, destLen, endColumn);
-}
-
-static int ASAPWriter_PadXexInfo(unsigned char *dest, int offset, int endColumn)
-{
-	while (offset % 32 != endColumn)
-		dest[offset++] = 32;
-	return offset;
-}
-
-static cibool ASAPWriter_SecondsToString(unsigned char *result, int offset, int value)
-{
-	if (value < 0 || value >= 6000000)
-		return FALSE;
-	value /= 1000;
-	ASAPWriter_TwoDigitsToString(result, offset, value / 60);
-	result[offset + 2] = 58;
-	ASAPWriter_TwoDigitsToString(result, offset + 3, value % 60);
-	return TRUE;
-}
-
-static void ASAPWriter_TwoDigitsToString(unsigned char *result, int offset, int value)
-{
-	result[offset] = 48 + value / 10;
-	result[offset + 1] = 48 + value % 10;
-}
-
-cibool ASAPWriter_Write(const char *targetFilename, ByteWriter w, ASAPInfo const *info, unsigned char const *module, int moduleLen, cibool tag)
-{
-	int destExt = ASAPInfo_GetPackedExt(targetFilename);
-	switch (destExt) {
-		const char *possibleExt;
-	case 7364979:
-		return ASAPWriter_WriteExecutable(w, NULL, info, module, moduleLen);
-	case 7890296:
-		{
-			FlashPack flashPack;
-			ByteWriter resultWriter;
-			int initAndPlayer[2];
-			FlashPack_Construct(&flashPack);
-			resultWriter = w;
-			
-					w.obj = &flashPack;
-					w.func = (void (*)(void *, int)) FlashPack_LoadByte;
-				;
-			if (!ASAPWriter_WriteExecutable(w, initAndPlayer, info, module, moduleLen))
-				return FALSE;
-			switch (info->type) {
-			case ASAPModuleType_SAP_D:
-				if (info->fastplay != 312)
-					return FALSE;
-				ASAPWriter_WriteBytes(w, CiBinaryResource_xexd_obx, 2, 117);
-				ASAPWriter_WriteWord(w, initAndPlayer[0]);
-				if (initAndPlayer[1] < 0) {
-					w.func(w.obj, 96);
-					w.func(w.obj, 96);
-					w.func(w.obj, 96);
-				}
-				else {
-					w.func(w.obj, 76);
-					ASAPWriter_WriteWord(w, initAndPlayer[1]);
-				}
-				w.func(w.obj, info->defaultSong);
-				break;
-			case ASAPModuleType_SAP_S:
-				return FALSE;
-			default:
-				ASAPWriter_WriteBytes(w, CiBinaryResource_xexb_obx, 2, 183);
-				ASAPWriter_WriteWord(w, initAndPlayer[0]);
-				w.func(w.obj, 76);
-				ASAPWriter_WriteWord(w, initAndPlayer[1]);
-				w.func(w.obj, info->defaultSong);
-				w.func(w.obj, info->fastplay & 1);
-				w.func(w.obj, (info->fastplay >> 1) % 156);
-				w.func(w.obj, (info->fastplay >> 1) % 131);
-				w.func(w.obj, info->fastplay / 312);
-				w.func(w.obj, info->fastplay / 262);
-				break;
-			}
-			if (tag)
-				ASAPWriter_WriteXexInfo(w, info);
-			ASAPWriter_WriteWord(w, 736);
-			ASAPWriter_WriteWord(w, 737);
-			ASAPWriter_WriteWord(w, tag ? 256 : 292);
-			return FlashPack_Compress(&flashPack, resultWriter);
-		}
-	default:
-		possibleExt = ASAPInfo_GetOriginalModuleExt(info, module, moduleLen);
-		if (possibleExt != NULL) {
-			int packedPossibleExt = (possibleExt[0] + (possibleExt[1] << 8) + (possibleExt[2] << 16)) | 2105376;
-			if (destExt == packedPossibleExt || (destExt == 3698036 && packedPossibleExt == 6516084)) {
-				return ASAPWriter_WriteNative(w, info, module, moduleLen);
-			}
-		}
-		return FALSE;
-	}
-}
-
-static void ASAPWriter_WriteBytes(ByteWriter w, unsigned char const *array, int startIndex, int endIndex)
-{
-	while (startIndex < endIndex)
-		w.func(w.obj, array[startIndex++]);
-}
-
-static void ASAPWriter_WriteCmcInit(ByteWriter w, int *initAndPlayer, ASAPInfo const *info)
-{
-	if (initAndPlayer == NULL)
-		return;
-	ASAPWriter_WriteWord(w, 4064);
-	ASAPWriter_WriteWord(w, 4080);
-	w.func(w.obj, 72);
-	w.func(w.obj, 162);
-	w.func(w.obj, info->music & 255);
-	w.func(w.obj, 160);
-	w.func(w.obj, info->music >> 8);
-	w.func(w.obj, 169);
-	w.func(w.obj, 112);
-	w.func(w.obj, 32);
-	ASAPWriter_WriteWord(w, initAndPlayer[1] + 3);
-	ASAPWriter_WritePlaTaxLda0(w);
-	w.func(w.obj, 76);
-	ASAPWriter_WriteWord(w, initAndPlayer[1] + 3);
-	initAndPlayer[0] = 4064;
-	initAndPlayer[1] += 6;
-}
-
-static void ASAPWriter_WriteDec(ByteWriter w, int value)
-{
-	if (value >= 10) {
-		ASAPWriter_WriteDec(w, value / 10);
-		value %= 10;
-	}
-	w.func(w.obj, 48 + value);
-}
-
-static void ASAPWriter_WriteDecSapTag(ByteWriter w, const char *tag, int value)
-{
-	ASAPWriter_WriteString(w, tag);
-	ASAPWriter_WriteDec(w, value);
-	w.func(w.obj, 13);
-	w.func(w.obj, 10);
-}
-
-static cibool ASAPWriter_WriteExecutable(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, unsigned char const *module, int moduleLen)
-{
-	unsigned char const *playerRoutine = ASAP6502_GetPlayerRoutine(info);
-	int player = -1;
-	int playerLastByte = -1;
-	int startAddr;
-	if (playerRoutine != NULL) {
-		player = ASAPInfo_GetWord(playerRoutine, 2);
-		playerLastByte = ASAPInfo_GetWord(playerRoutine, 4);
-		if (info->music <= playerLastByte)
-			return FALSE;
-	}
-	switch (info->type) {
-		static const int tmcPlayerOffset[4] = { 3, -9, -10, -10 };
-		int player2;
-		static const int tmcInitOffset[4] = { -14, -16, -17, -17 };
-	case ASAPModuleType_SAP_B:
-		ASAPWriter_WriteExecutableFromSap(w, initAndPlayer, info, 66, module, moduleLen);
-		break;
-	case ASAPModuleType_SAP_C:
-		ASAPWriter_WriteExecutableFromSap(w, initAndPlayer, info, 67, module, moduleLen);
-		ASAPWriter_WriteCmcInit(w, initAndPlayer, info);
-		break;
-	case ASAPModuleType_SAP_D:
-		ASAPWriter_WriteExecutableFromSap(w, initAndPlayer, info, 68, module, moduleLen);
-		break;
-	case ASAPModuleType_SAP_S:
-		ASAPWriter_WriteExecutableFromSap(w, initAndPlayer, info, 83, module, moduleLen);
-		break;
-	case ASAPModuleType_CMC:
-	case ASAPModuleType_CM3:
-	case ASAPModuleType_CMR:
-	case ASAPModuleType_CMS:
-		ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 67, -1, player);
-		w.func(w.obj, 255);
-		w.func(w.obj, 255);
-		ASAPWriter_WriteBytes(w, module, 2, moduleLen);
-		ASAPWriter_WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-		ASAPWriter_WriteCmcInit(w, initAndPlayer, info);
-		break;
-	case ASAPModuleType_DLT:
-		startAddr = ASAPWriter_WriteExecutableHeaderForSongPos(w, initAndPlayer, info, player, 5, 7, 259);
-		if (moduleLen == 11270) {
-			ASAPWriter_WriteBytes(w, module, 0, 4);
-			ASAPWriter_WriteWord(w, 19456);
-			ASAPWriter_WriteBytes(w, module, 6, moduleLen);
-			w.func(w.obj, 0);
-		}
-		else
-			ASAPWriter_WriteBytes(w, module, 0, moduleLen);
-		ASAPWriter_WriteWord(w, startAddr);
-		ASAPWriter_WriteWord(w, playerLastByte);
-		if (info->songs != 1) {
-			ASAPWriter_WriteBytes(w, info->songPos, 0, info->songs);
-			w.func(w.obj, 170);
-			w.func(w.obj, 188);
-			ASAPWriter_WriteWord(w, startAddr);
-		}
-		else {
-			w.func(w.obj, 160);
-			w.func(w.obj, 0);
-		}
-		w.func(w.obj, 76);
-		ASAPWriter_WriteWord(w, player + 256);
-		ASAPWriter_WriteBytes(w, playerRoutine, 6, playerLastByte - player + 7);
-		break;
-	case ASAPModuleType_MPT:
-		startAddr = ASAPWriter_WriteExecutableHeaderForSongPos(w, initAndPlayer, info, player, 13, 17, 3);
-		ASAPWriter_WriteBytes(w, module, 0, moduleLen);
-		ASAPWriter_WriteWord(w, startAddr);
-		ASAPWriter_WriteWord(w, playerLastByte);
-		if (info->songs != 1) {
-			ASAPWriter_WriteBytes(w, info->songPos, 0, info->songs);
-			w.func(w.obj, 72);
-		}
-		w.func(w.obj, 160);
-		w.func(w.obj, info->music & 255);
-		w.func(w.obj, 162);
-		w.func(w.obj, info->music >> 8);
-		w.func(w.obj, 169);
-		w.func(w.obj, 0);
-		w.func(w.obj, 32);
-		ASAPWriter_WriteWord(w, player);
-		if (info->songs != 1) {
-			w.func(w.obj, 104);
-			w.func(w.obj, 168);
-			w.func(w.obj, 190);
-			ASAPWriter_WriteWord(w, startAddr);
-		}
-		else {
-			w.func(w.obj, 162);
-			w.func(w.obj, 0);
-		}
-		w.func(w.obj, 169);
-		w.func(w.obj, 2);
-		ASAPWriter_WriteBytes(w, playerRoutine, 6, playerLastByte - player + 7);
-		break;
-	case ASAPModuleType_RMT:
-		ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 66, 3200, 1539);
-		ASAPWriter_WriteBytes(w, module, 0, ASAPInfo_GetWord(module, 4) - info->music + 7);
-		ASAPWriter_WriteWord(w, 3200);
-		if (info->songs != 1) {
-			ASAPWriter_WriteWord(w, 3210 + info->songs);
-			w.func(w.obj, 168);
-			w.func(w.obj, 185);
-			ASAPWriter_WriteWord(w, 3211);
-		}
-		else {
-			ASAPWriter_WriteWord(w, 3208);
-			w.func(w.obj, 169);
-			w.func(w.obj, 0);
-		}
-		w.func(w.obj, 162);
-		w.func(w.obj, info->music & 255);
-		w.func(w.obj, 160);
-		w.func(w.obj, info->music >> 8);
-		w.func(w.obj, 76);
-		ASAPWriter_WriteWord(w, 1536);
-		if (info->songs != 1)
-			ASAPWriter_WriteBytes(w, info->songPos, 0, info->songs);
-		ASAPWriter_WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-		break;
-	case ASAPModuleType_TMC:
-		player2 = player + tmcPlayerOffset[module[37] - 1];
-		startAddr = player2 + tmcInitOffset[module[37] - 1];
-		if (info->songs != 1)
-			startAddr -= 3;
-		ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 66, startAddr, player2);
-		ASAPWriter_WriteBytes(w, module, 0, moduleLen);
-		ASAPWriter_WriteWord(w, startAddr);
-		ASAPWriter_WriteWord(w, playerLastByte);
-		if (info->songs != 1)
-			w.func(w.obj, 72);
-		w.func(w.obj, 160);
-		w.func(w.obj, info->music & 255);
-		w.func(w.obj, 162);
-		w.func(w.obj, info->music >> 8);
-		w.func(w.obj, 169);
-		w.func(w.obj, 112);
-		w.func(w.obj, 32);
-		ASAPWriter_WriteWord(w, player);
-		if (info->songs != 1)
-			ASAPWriter_WritePlaTaxLda0(w);
-		else {
-			w.func(w.obj, 169);
-			w.func(w.obj, 96);
-		}
-		switch (module[37]) {
-		case 2:
-			w.func(w.obj, 6);
-			w.func(w.obj, 0);
-			w.func(w.obj, 76);
-			ASAPWriter_WriteWord(w, player);
-			w.func(w.obj, 165);
-			w.func(w.obj, 0);
-			w.func(w.obj, 230);
-			w.func(w.obj, 0);
-			w.func(w.obj, 74);
-			w.func(w.obj, 144);
-			w.func(w.obj, 5);
-			w.func(w.obj, 176);
-			w.func(w.obj, 6);
-			break;
-		case 3:
-		case 4:
-			w.func(w.obj, 160);
-			w.func(w.obj, 1);
-			w.func(w.obj, 132);
-			w.func(w.obj, 0);
-			w.func(w.obj, 208);
-			w.func(w.obj, 10);
-			w.func(w.obj, 198);
-			w.func(w.obj, 0);
-			w.func(w.obj, 208);
-			w.func(w.obj, 12);
-			w.func(w.obj, 160);
-			w.func(w.obj, module[37]);
-			w.func(w.obj, 132);
-			w.func(w.obj, 0);
-			w.func(w.obj, 208);
-			w.func(w.obj, 3);
-			break;
-		}
-		ASAPWriter_WriteBytes(w, playerRoutine, 6, playerLastByte - player + 7);
-		break;
-	case ASAPModuleType_TM2:
-		ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 66, 4992, 2051);
-		ASAPWriter_WriteBytes(w, module, 0, moduleLen);
-		ASAPWriter_WriteWord(w, 4992);
-		if (info->songs != 1) {
-			ASAPWriter_WriteWord(w, 5008);
-			w.func(w.obj, 72);
-		}
-		else
-			ASAPWriter_WriteWord(w, 5006);
-		w.func(w.obj, 160);
-		w.func(w.obj, info->music & 255);
-		w.func(w.obj, 162);
-		w.func(w.obj, info->music >> 8);
-		w.func(w.obj, 169);
-		w.func(w.obj, 112);
-		w.func(w.obj, 32);
-		ASAPWriter_WriteWord(w, 2048);
-		if (info->songs != 1)
-			ASAPWriter_WritePlaTaxLda0(w);
-		else {
-			w.func(w.obj, 169);
-			w.func(w.obj, 0);
-			w.func(w.obj, 170);
-		}
-		w.func(w.obj, 76);
-		ASAPWriter_WriteWord(w, 2048);
-		ASAPWriter_WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-		break;
-	case ASAPModuleType_FC:
-		ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 66, player, player + 3);
-		ASAPWriter_WriteWord(w, 65535);
-		ASAPWriter_WriteWord(w, info->music);
-		ASAPWriter_WriteWord(w, info->music + moduleLen - 1);
-		ASAPWriter_WriteBytes(w, module, 0, moduleLen);
-		ASAPWriter_WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-		break;
-	}
-	return TRUE;
-}
-
-static void ASAPWriter_WriteExecutableFromSap(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, int type, unsigned char const *module, int moduleLen)
-{
-	ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, type, info->init, info->player);
-	ASAPWriter_WriteBytes(w, module, info->headerLen, moduleLen);
-}
-
-static void ASAPWriter_WriteExecutableHeader(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, int type, int init, int player)
-{
-	if (initAndPlayer == NULL)
-		ASAPWriter_WriteSapHeader(w, info, type, init, player);
-	else {
-		initAndPlayer[0] = init;
-		initAndPlayer[1] = player;
-	}
-}
-
-static int ASAPWriter_WriteExecutableHeaderForSongPos(ByteWriter w, int *initAndPlayer, ASAPInfo const *info, int player, int codeForOneSong, int codeForManySongs, int playerOffset)
-{
-	if (info->songs != 1) {
-		ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 66, player - codeForManySongs, player + playerOffset);
-		return player - codeForManySongs - info->songs;
-	}
-	ASAPWriter_WriteExecutableHeader(w, initAndPlayer, info, 66, player - codeForOneSong, player + playerOffset);
-	return player - codeForOneSong;
-}
-
-static void ASAPWriter_WriteHexSapTag(ByteWriter w, const char *tag, int value)
-{
-	if (value < 0)
-		return;
-	ASAPWriter_WriteString(w, tag);
-	{
-		int i;
-		for (i = 12; i >= 0; i -= 4) {
-			int digit = (value >> i) & 15;
-			w.func(w.obj, digit + (digit < 10 ? 48 : 55));
-		}
-	}
-	w.func(w.obj, 13);
-	w.func(w.obj, 10);
-}
-
-static cibool ASAPWriter_WriteNative(ByteWriter w, ASAPInfo const *info, unsigned char const *module, int moduleLen)
-{
-	int diff;
-	switch (info->type) {
-		int offset;
-		int blockLen;
-		int music;
-		int patternLowAddress;
-		int pointersAndInstrumentsLen;
-		int patterns;
-		int songOffset;
-		int songEnd;
-	case ASAPModuleType_SAP_B:
-	case ASAPModuleType_SAP_C:
-		offset = ASAPInfo_GetRmtSapOffset(info, module, moduleLen);
-		if (offset > 0) {
-			w.func(w.obj, 255);
-			w.func(w.obj, 255);
-			ASAPWriter_WriteBytes(w, module, offset, moduleLen);
-			break;
-		}
-		blockLen = ASAPInfo_GetWord(module, info->headerLen + 4) - ASAPInfo_GetWord(module, info->headerLen + 2) + 7;
-		if (blockLen < 7 || info->headerLen + blockLen >= moduleLen)
-			return FALSE;
-		if (info->init == 1024 && info->player == 1027)
-			ASAPWriter_WriteBytes(w, module, info->headerLen + 6, info->headerLen + blockLen);
-		else
-			ASAPWriter_WriteBytes(w, module, info->headerLen, info->headerLen + blockLen);
-		break;
-	case ASAPModuleType_CMC:
-	case ASAPModuleType_CM3:
-	case ASAPModuleType_CMR:
-	case ASAPModuleType_CMS:
-		if ((diff = ASAPWriter_WriteNativeHeader(w, info, module)) == -1)
-			return FALSE;
-		ASAPWriter_WriteBytes(w, module, 6, 26);
-		ASAPWriter_WriteRelocatedLowHigh(w, diff, module, 26, 64);
-		ASAPWriter_WriteBytes(w, module, 154, moduleLen);
-		break;
-	case ASAPModuleType_DLT:
-		if ((diff = ASAPWriter_WriteNativeHeader(w, info, module)) == -1)
-			return FALSE;
-		ASAPWriter_WriteBytes(w, module, 6, moduleLen);
-		break;
-	case ASAPModuleType_MPT:
-		if ((diff = ASAPWriter_WriteNativeHeader(w, info, module)) == -1)
-			return FALSE;
-		ASAPWriter_WriteRelocatedWords(w, diff, module, 6, 192);
-		ASAPWriter_WriteBytes(w, module, 198, 454);
-		ASAPWriter_WriteRelocatedLowHigh(w, diff, module, 454, 4);
-		ASAPWriter_WriteBytes(w, module, 462, moduleLen);
-		break;
-	case ASAPModuleType_RMT:
-		if ((diff = ASAPWriter_WriteNativeHeader(w, info, module)) == -1)
-			return FALSE;
-		ASAPWriter_WriteBytes(w, module, 6, 14);
-		music = ASAPInfo_GetWord(module, 2);
-		patternLowAddress = ASAPInfo_GetWord(module, 16);
-		pointersAndInstrumentsLen = patternLowAddress - music - 8;
-		ASAPWriter_WriteRelocatedWords(w, diff, module, 14, pointersAndInstrumentsLen);
-		patterns = ASAPInfo_GetWord(module, 18) - patternLowAddress;
-		ASAPWriter_WriteRelocatedLowHigh(w, diff, module, 14 + pointersAndInstrumentsLen, patterns);
-		songOffset = 6 + ASAPInfo_GetWord(module, 20) - music;
-		ASAPWriter_WriteBytes(w, module, 14 + pointersAndInstrumentsLen + (patterns << 1), songOffset);
-		songEnd = 7 + ASAPInfo_GetWord(module, 4) - music;
-		while (songOffset + 3 < songEnd) {
-			int nextSongOffset = songOffset + module[9] - 48;
-			if (module[songOffset] == 254) {
-				w.func(w.obj, 254);
-				w.func(w.obj, module[songOffset + 1]);
-				ASAPWriter_WriteWord(w, ASAPInfo_GetWord(module, songOffset + 2) + diff);
-				songOffset += 4;
-			}
-			if (nextSongOffset > songEnd)
-				nextSongOffset = songEnd;
-			ASAPWriter_WriteBytes(w, module, songOffset, nextSongOffset);
-			songOffset = nextSongOffset;
-		}
-		ASAPWriter_WriteBytes(w, module, songOffset, songEnd);
-		if (moduleLen >= songEnd + 5) {
-			ASAPWriter_WriteRelocatedWords(w, diff, module, songEnd, 4);
-			ASAPWriter_WriteBytes(w, module, songEnd + 4, moduleLen);
-		}
-		break;
-	case ASAPModuleType_TMC:
-		if ((diff = ASAPWriter_WriteNativeHeader(w, info, module)) == -1)
-			return FALSE;
-		ASAPWriter_WriteBytes(w, module, 6, 38);
-		ASAPWriter_WriteRelocatedLowHigh(w, diff, module, 38, 64);
-		ASAPWriter_WriteRelocatedLowHigh(w, diff, module, 166, 128);
-		ASAPWriter_WriteBytes(w, module, 422, moduleLen);
-		break;
-	case ASAPModuleType_TM2:
-		if ((diff = ASAPWriter_WriteNativeHeader(w, info, module)) == -1)
-			return FALSE;
-		ASAPWriter_WriteBytes(w, module, 6, 134);
-		ASAPWriter_WriteRelocatedBytes(w, diff, module, 134, 774, 128, 0);
-		ASAPWriter_WriteRelocatedLowHigh(w, diff, module, 262, 256);
-		ASAPWriter_WriteRelocatedBytes(w, diff, module, 134, 774, 128, 8);
-		ASAPWriter_WriteBytes(w, module, 902, moduleLen);
-		break;
-	case ASAPModuleType_FC:
-		ASAPWriter_WriteBytes(w, module, 0, moduleLen);
-		break;
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static int ASAPWriter_WriteNativeHeader(ByteWriter w, ASAPInfo const *info, unsigned char const *module)
-{
-	int diff = info->music - ASAPInfo_GetWord(module, 2);
-	int last = ASAPInfo_GetWord(module, 4) + diff;
-	if (last > 65535)
-		return -1;
-	w.func(w.obj, 255);
-	w.func(w.obj, 255);
-	ASAPWriter_WriteWord(w, info->music);
-	ASAPWriter_WriteWord(w, last);
-	return diff;
-}
-
-static void ASAPWriter_WritePlaTaxLda0(ByteWriter w)
-{
-	w.func(w.obj, 104);
-	w.func(w.obj, 170);
-	w.func(w.obj, 169);
-	w.func(w.obj, 0);
-}
-
-static void ASAPWriter_WriteRelocatedBytes(ByteWriter w, int diff, unsigned char const *module, int lowOffset, int highOffset, int len, int shift)
-{
-	{
-		int i;
-		for (i = 0; i < len; i++) {
-			int address = module[lowOffset + i] + (module[highOffset + i] << 8);
-			if (address != 0 && address != 65535)
-				address += diff;
-			w.func(w.obj, (address >> shift) & 255);
-		}
-	}
-}
-
-static void ASAPWriter_WriteRelocatedLowHigh(ByteWriter w, int diff, unsigned char const *module, int lowOffset, int len)
-{
-	ASAPWriter_WriteRelocatedBytes(w, diff, module, lowOffset, lowOffset + len, len, 0);
-	ASAPWriter_WriteRelocatedBytes(w, diff, module, lowOffset, lowOffset + len, len, 8);
-}
-
-static void ASAPWriter_WriteRelocatedWords(ByteWriter w, int diff, unsigned char const *module, int offset, int len)
-{
-	{
-		int i;
-		for (i = 0; i < len; i += 2) {
-			int address = module[offset + i] + (module[offset + i + 1] << 8);
-			if (address != 0 && address != 65535)
-				address += diff;
-			ASAPWriter_WriteWord(w, address);
-		}
-	}
-}
-
-static void ASAPWriter_WriteSapHeader(ByteWriter w, ASAPInfo const *info, int type, int init, int player)
-{
-	ASAPWriter_WriteString(w, "SAP\r\n");
-	ASAPWriter_WriteTextSapTag(w, "AUTHOR ", info->author);
-	ASAPWriter_WriteTextSapTag(w, "NAME ", info->title);
-	ASAPWriter_WriteTextSapTag(w, "DATE ", info->date);
-	if (info->songs > 1) {
-		ASAPWriter_WriteDecSapTag(w, "SONGS ", info->songs);
-		if (info->defaultSong > 0)
-			ASAPWriter_WriteDecSapTag(w, "DEFSONG ", info->defaultSong);
-	}
-	if (info->channels > 1)
-		ASAPWriter_WriteString(w, "STEREO\r\n");
-	if (info->ntsc)
-		ASAPWriter_WriteString(w, "NTSC\r\n");
-	ASAPWriter_WriteString(w, "TYPE ");
-	w.func(w.obj, type);
-	w.func(w.obj, 13);
-	w.func(w.obj, 10);
-	if (info->fastplay != 312 || info->ntsc)
-		ASAPWriter_WriteDecSapTag(w, "FASTPLAY ", info->fastplay);
-	if (type == 67)
-		ASAPWriter_WriteHexSapTag(w, "MUSIC ", info->music);
-	ASAPWriter_WriteHexSapTag(w, "INIT ", init);
-	ASAPWriter_WriteHexSapTag(w, "PLAYER ", player);
-	ASAPWriter_WriteHexSapTag(w, "COVOX ", info->covoxAddr);
-	{
-		int song;
-		for (song = 0; song < info->songs; song++) {
-			unsigned char s[9];
-			if (info->durations[song] < 0)
-				break;
-			ASAPWriter_WriteString(w, "TIME ");
-			ASAPWriter_WriteBytes(w, s, 0, ASAPWriter_DurationToString(s, info->durations[song]));
-			if (info->loops[song])
-				ASAPWriter_WriteString(w, " LOOP");
-			w.func(w.obj, 13);
-			w.func(w.obj, 10);
-		}
-	}
-}
-
-static void ASAPWriter_WriteString(ByteWriter w, const char *s)
-{
-	int n = (int) strlen(s);
-	{
-		int i;
-		for (i = 0; i < n; i++)
-			w.func(w.obj, s[i]);
-	}
-}
-
-static void ASAPWriter_WriteTextSapTag(ByteWriter w, const char *tag, const char *value)
-{
-	ASAPWriter_WriteString(w, tag);
-	w.func(w.obj, 34);
-	if (value[0] == '\0')
-		value = "<?>";
-	ASAPWriter_WriteString(w, value);
-	w.func(w.obj, 34);
-	w.func(w.obj, 13);
-	w.func(w.obj, 10);
-}
-
-static void ASAPWriter_WriteWord(ByteWriter w, int value)
-{
-	w.func(w.obj, value & 255);
-	w.func(w.obj, (value >> 8) & 255);
-}
-
-static void ASAPWriter_WriteXexInfo(ByteWriter w, ASAPInfo const *info)
-{
-	unsigned char title[256];
-	int titleLen = ASAPWriter_FormatXexInfoText(title, 0, 0, info->title[0] == '\0' ? "(untitled)" : info->title, FALSE);
-	unsigned char author[256];
-	int authorLen;
-	unsigned char other[256];
-	int otherLen;
-	int duration;
-	int totalCharacters;
-	int totalLines;
-	int otherAddress;
-	int titleAddress;
-	if (info->author[0] != '\0') {
-		author[0] = 98;
-		author[1] = 121;
-		author[2] = 32;
-		authorLen = ASAPWriter_FormatXexInfoText(author, 3, 0, info->author, TRUE);
-	}
-	else
-		authorLen = 0;
-	otherLen = ASAPWriter_FormatXexInfoText(other, 0, 19, info->date, FALSE);
-	otherLen = ASAPWriter_FormatXexInfoText(other, otherLen, 27, info->channels > 1 ? " STEREO" : "   MONO", FALSE);
-	duration = info->durations[info->defaultSong];
-	if (duration > 0 && ASAPWriter_SecondsToString(other, otherLen, duration + 999))
-		otherLen += 5;
-	else
-		otherLen = ASAPWriter_PadXexInfo(other, otherLen, 0);
-	totalCharacters = titleLen + authorLen + otherLen;
-	totalLines = totalCharacters / 32;
-	otherAddress = 64592 - otherLen;
-	titleAddress = otherAddress - authorLen - 8 - titleLen;
-	ASAPWriter_WriteWord(w, titleAddress);
-	ASAPWriter_WriteBytes(w, CiBinaryResource_xexinfo_obx, 4, 6);
-	ASAPWriter_WriteBytes(w, title, 0, titleLen);
-	{
-		int i;
-		for (i = 0; i < 8; i++)
-			w.func(w.obj, 85);
-	}
-	ASAPWriter_WriteBytes(w, author, 0, authorLen);
-	ASAPWriter_WriteBytes(w, other, 0, otherLen);
-	{
-		int i;
-		for (i = totalLines; i < 26; i++)
-			w.func(w.obj, 112);
-	}
-	w.func(w.obj, 48);
-	ASAPWriter_WriteXexInfoTextDl(w, titleAddress, titleLen, titleLen - 32);
-	w.func(w.obj, 8);
-	w.func(w.obj, 0);
-	{
-		int i;
-		for (i = 0; i < authorLen; i += 32)
-			w.func(w.obj, 2);
-	}
-	w.func(w.obj, 16);
-	{
-		int i;
-		for (i = 0; i < otherLen; i += 32)
-			w.func(w.obj, 2);
-	}
-	ASAPWriter_WriteBytes(w, CiBinaryResource_xexinfo_obx, 6, 178);
-}
-
-static void ASAPWriter_WriteXexInfoTextDl(ByteWriter w, int address, int len, int verticalScrollAt)
-{
-	w.func(w.obj, verticalScrollAt == 0 ? 98 : 66);
-	ASAPWriter_WriteWord(w, address);
-	{
-		int i;
-		for (i = 32; i < len; i += 32)
-			w.func(w.obj, i == verticalScrollAt ? 34 : 2);
-	}
-}
-
-static void Cpu6502_DoFrame(Cpu6502 *self, ASAP *asap, int cycleLimit)
-{
-	int pc = self->pc;
-	int nz = self->nz;
-	int a = self->a;
-	int x = self->x;
-	int y = self->y;
-	int c = self->c;
-	int s = self->s;
-	int vdi = self->vdi;
-	while (asap->cycle < cycleLimit) {
-		int data;
-		static const int opcodeCycles[256] = { 7, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 4, 4, 6, 6,
-			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
-			6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 4, 4, 6, 6,
-			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
-			6, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 3, 4, 6, 6,
-			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
-			6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 5, 4, 6, 6,
-			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
-			2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4,
-			2, 6, 2, 6, 4, 4, 4, 4, 2, 5, 2, 5, 5, 5, 5, 5,
-			2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4,
-			2, 5, 2, 5, 4, 4, 4, 4, 2, 4, 2, 4, 4, 4, 4, 4,
-			2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6,
-			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
-			2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6,
-			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7 };
-		int addr;
-		if (asap->cycle >= asap->nextEventCycle) {
-			self->pc = pc;
-			self->s = s;
-			ASAP_HandleEvent(asap);
-			pc = self->pc;
-			s = self->s;
-			if ((vdi & 4) == 0 && asap->pokeys.irqst != 255) {
-				asap->memory[256 + s] = pc >> 8;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = (unsigned char) pc;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = ((nz | (nz >> 1)) & 128) + vdi + ((nz & 255) == 0 ? 2 : 0) + c + 32;
-				s = (s - 1) & 255;
-				vdi |= 4;
-				pc = asap->memory[65534] + (asap->memory[65535] << 8);
-				asap->cycle += 7;
-			}
-		}
-		data = asap->memory[pc++];
-		asap->cycle += opcodeCycles[data];
-		switch (data) {
-		case 0:
-			pc++;
-			asap->memory[256 + s] = pc >> 8;
-			s = (s - 1) & 255;
-			asap->memory[256 + s] = (unsigned char) pc;
-			s = (s - 1) & 255;
-			asap->memory[256 + s] = ((nz | (nz >> 1)) & 128) + vdi + ((nz & 255) == 0 ? 2 : 0) + c + 48;
-			s = (s - 1) & 255;
-			vdi |= 4;
-			pc = asap->memory[65534] + (asap->memory[65535] << 8);
-			break;
-		case 1:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			nz = a |= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 2:
-		case 18:
-		case 34:
-		case 50:
-		case 66:
-		case 82:
-		case 98:
-		case 114:
-		case 146:
-		case 178:
-		case 210:
-		case 242:
-			pc--;
-			asap->cycle = asap->nextEventCycle;
-			break;
-		case 5:
-			addr = asap->memory[pc++];
-			nz = a |= asap->memory[addr];
-			break;
-		case 6:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			asap->memory[addr] = nz;
-			break;
-		case 8:
-			asap->memory[256 + s] = ((nz | (nz >> 1)) & 128) + vdi + ((nz & 255) == 0 ? 2 : 0) + c + 48;
-			s = (s - 1) & 255;
-			break;
-		case 9:
-			nz = a |= asap->memory[pc++];
-			break;
-		case 10:
-			c = a >> 7;
-			nz = a = (a << 1) & 255;
-			break;
-		case 13:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = a |= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 14:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 16:
-			if (nz < 128) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 17:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a |= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 21:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = a |= asap->memory[addr];
-			break;
-		case 22:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			asap->memory[addr] = nz;
-			break;
-		case 24:
-			c = 0;
-			break;
-		case 25:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a |= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 29:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			nz = a |= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 30:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 32:
-			addr = asap->memory[pc++];
-			asap->memory[256 + s] = pc >> 8;
-			s = (s - 1) & 255;
-			asap->memory[256 + s] = (unsigned char) pc;
-			s = (s - 1) & 255;
-			pc = addr + (asap->memory[pc] << 8);
-			break;
-		case 33:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			nz = a &= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 36:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			vdi = (vdi & 12) + (nz & 64);
-			nz = ((nz & 128) << 1) + (nz & a);
-			break;
-		case 37:
-			addr = asap->memory[pc++];
-			nz = a &= asap->memory[addr];
-			break;
-		case 38:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			asap->memory[addr] = nz;
-			break;
-		case 40:
-			s = (s + 1) & 255;
-			vdi = asap->memory[256 + s];
-			nz = ((vdi & 128) << 1) + (~vdi & 2);
-			c = vdi & 1;
-			vdi &= 76;
-			if ((vdi & 4) == 0 && asap->pokeys.irqst != 255) {
-				asap->memory[256 + s] = pc >> 8;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = (unsigned char) pc;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = ((nz | (nz >> 1)) & 128) + vdi + ((nz & 255) == 0 ? 2 : 0) + c + 32;
-				s = (s - 1) & 255;
-				vdi |= 4;
-				pc = asap->memory[65534] + (asap->memory[65535] << 8);
-				asap->cycle += 7;
-			}
-			break;
-		case 41:
-			nz = a &= asap->memory[pc++];
-			break;
-		case 42:
-			a = (a << 1) + c;
-			c = a >> 8;
-			nz = a &= 255;
-			break;
-		case 44:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			vdi = (vdi & 12) + (nz & 64);
-			nz = ((nz & 128) << 1) + (nz & a);
-			break;
-		case 45:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = a &= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 46:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 48:
-			if (nz >= 128) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 49:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a &= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 53:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = a &= asap->memory[addr];
-			break;
-		case 54:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			asap->memory[addr] = nz;
-			break;
-		case 56:
-			c = 1;
-			break;
-		case 57:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a &= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 61:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			nz = a &= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 62:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 64:
-			s = (s + 1) & 255;
-			vdi = asap->memory[256 + s];
-			nz = ((vdi & 128) << 1) + (~vdi & 2);
-			c = vdi & 1;
-			vdi &= 76;
-			s = (s + 1) & 255;
-			pc = asap->memory[256 + s];
-			s = (s + 1) & 255;
-			addr = asap->memory[256 + s];
-			pc += addr << 8;
-			if ((vdi & 4) == 0 && asap->pokeys.irqst != 255) {
-				asap->memory[256 + s] = pc >> 8;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = (unsigned char) pc;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = ((nz | (nz >> 1)) & 128) + vdi + ((nz & 255) == 0 ? 2 : 0) + c + 32;
-				s = (s - 1) & 255;
-				vdi |= 4;
-				pc = asap->memory[65534] + (asap->memory[65535] << 8);
-				asap->cycle += 7;
-			}
-			break;
-		case 65:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			nz = a ^= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 69:
-			addr = asap->memory[pc++];
-			nz = a ^= asap->memory[addr];
-			break;
-		case 70:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			break;
-		case 72:
-			asap->memory[256 + s] = a;
-			s = (s - 1) & 255;
-			break;
-		case 73:
-			nz = a ^= asap->memory[pc++];
-			break;
-		case 74:
-			c = a & 1;
-			nz = a >>= 1;
-			break;
-		case 76:
-			addr = asap->memory[pc++];
-			pc = addr + (asap->memory[pc] << 8);
-			break;
-		case 77:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = a ^= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 78:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 80:
-			if ((vdi & 64) == 0) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 81:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a ^= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 85:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = a ^= asap->memory[addr];
-			break;
-		case 86:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			break;
-		case 88:
-			vdi &= 72;
-			if ((vdi & 4) == 0 && asap->pokeys.irqst != 255) {
-				asap->memory[256 + s] = pc >> 8;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = (unsigned char) pc;
-				s = (s - 1) & 255;
-				asap->memory[256 + s] = ((nz | (nz >> 1)) & 128) + vdi + ((nz & 255) == 0 ? 2 : 0) + c + 32;
-				s = (s - 1) & 255;
-				vdi |= 4;
-				pc = asap->memory[65534] + (asap->memory[65535] << 8);
-				asap->cycle += 7;
-			}
-			break;
-		case 89:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a ^= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 93:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			nz = a ^= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 94:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 96:
-			s = (s + 1) & 255;
-			pc = asap->memory[256 + s];
-			s = (s + 1) & 255;
-			addr = asap->memory[256 + s];
-			pc += (addr << 8) + 1;
-			break;
-		case 97:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 101:
-			addr = asap->memory[pc++];
-			data = asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 102:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr] + (c << 8);
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			break;
-		case 104:
-			s = (s + 1) & 255;
-			a = asap->memory[256 + s];
-			nz = a;
-			break;
-		case 105:
-			data = asap->memory[pc++];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 106:
-			nz = (c << 7) + (a >> 1);
-			c = a & 1;
-			a = nz;
-			break;
-		case 108:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if ((addr & 255) == 255)
-				pc = asap->memory[addr] + (asap->memory[addr - 255] << 8);
-			else
-				pc = asap->memory[addr] + (asap->memory[addr + 1] << 8);
-			break;
-		case 109:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 110:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 112:
-			if ((vdi & 64) != 0) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 113:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 117:
-			addr = (asap->memory[pc++] + x) & 255;
-			data = asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 118:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr] + (c << 8);
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			break;
-		case 120:
-			vdi |= 4;
-			break;
-		case 121:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 125:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 126:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 129:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, a);
-			else
-				asap->memory[addr] = a;
-			break;
-		case 132:
-			addr = asap->memory[pc++];
-			asap->memory[addr] = y;
-			break;
-		case 133:
-			addr = asap->memory[pc++];
-			asap->memory[addr] = a;
-			break;
-		case 134:
-			addr = asap->memory[pc++];
-			asap->memory[addr] = x;
-			break;
-		case 136:
-			nz = y = (y - 1) & 255;
-			break;
-		case 138:
-			nz = a = x;
-			break;
-		case 140:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, y);
-			else
-				asap->memory[addr] = y;
-			break;
-		case 141:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, a);
-			else
-				asap->memory[addr] = a;
-			break;
-		case 142:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, x);
-			else
-				asap->memory[addr] = x;
-			break;
-		case 144:
-			if (c == 0) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 145:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, a);
-			else
-				asap->memory[addr] = a;
-			break;
-		case 148:
-			addr = (asap->memory[pc++] + x) & 255;
-			asap->memory[addr] = y;
-			break;
-		case 149:
-			addr = (asap->memory[pc++] + x) & 255;
-			asap->memory[addr] = a;
-			break;
-		case 150:
-			addr = (asap->memory[pc++] + y) & 255;
-			asap->memory[addr] = x;
-			break;
-		case 152:
-			nz = a = y;
-			break;
-		case 153:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, a);
-			else
-				asap->memory[addr] = a;
-			break;
-		case 154:
-			s = x;
-			break;
-		case 157:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, a);
-			else
-				asap->memory[addr] = a;
-			break;
-		case 160:
-			nz = y = asap->memory[pc++];
-			break;
-		case 161:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			nz = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 162:
-			nz = x = asap->memory[pc++];
-			break;
-		case 164:
-			addr = asap->memory[pc++];
-			nz = y = asap->memory[addr];
-			break;
-		case 165:
-			addr = asap->memory[pc++];
-			nz = a = asap->memory[addr];
-			break;
-		case 166:
-			addr = asap->memory[pc++];
-			nz = x = asap->memory[addr];
-			break;
-		case 168:
-			nz = y = a;
-			break;
-		case 169:
-			nz = a = asap->memory[pc++];
-			break;
-		case 170:
-			nz = x = a;
-			break;
-		case 172:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = y = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 173:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 174:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = x = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 176:
-			if (c != 0) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 177:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 180:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = y = asap->memory[addr];
-			break;
-		case 181:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = a = asap->memory[addr];
-			break;
-		case 182:
-			addr = (asap->memory[pc++] + y) & 255;
-			nz = x = asap->memory[addr];
-			break;
-		case 184:
-			vdi &= 12;
-			break;
-		case 185:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 186:
-			nz = x = s;
-			break;
-		case 188:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			nz = y = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 189:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			nz = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 190:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = x = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 192:
-			nz = asap->memory[pc++];
-			c = y >= nz ? 1 : 0;
-			nz = (y - nz) & 255;
-			break;
-		case 193:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 196:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = y >= nz ? 1 : 0;
-			nz = (y - nz) & 255;
-			break;
-		case 197:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 198:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			asap->memory[addr] = nz;
-			break;
-		case 200:
-			nz = y = (y + 1) & 255;
-			break;
-		case 201:
-			nz = asap->memory[pc++];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 202:
-			nz = x = (x - 1) & 255;
-			break;
-		case 204:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = y >= nz ? 1 : 0;
-			nz = (y - nz) & 255;
-			break;
-		case 205:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 206:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 208:
-			if ((nz & 255) != 0) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 209:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 213:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 214:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			asap->memory[addr] = nz;
-			break;
-		case 216:
-			vdi &= 68;
-			break;
-		case 217:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 221:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 222:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 224:
-			nz = asap->memory[pc++];
-			c = x >= nz ? 1 : 0;
-			nz = (x - nz) & 255;
-			break;
-		case 225:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 228:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = x >= nz ? 1 : 0;
-			nz = (x - nz) & 255;
-			break;
-		case 229:
-			addr = asap->memory[pc++];
-			data = asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 230:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			asap->memory[addr] = nz;
-			break;
-		case 232:
-			nz = x = (x + 1) & 255;
-			break;
-		case 233:
-		case 235:
-			data = asap->memory[pc++];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 234:
-		case 26:
-		case 58:
-		case 90:
-		case 122:
-		case 218:
-		case 250:
-			break;
-		case 236:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			c = x >= nz ? 1 : 0;
-			nz = (x - nz) & 255;
-			break;
-		case 237:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 238:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 240:
-			if ((nz & 255) == 0) {
-				addr = (signed char) asap->memory[pc];
-				pc++;
-				addr += pc;
-				if ((addr ^ pc) >> 8 != 0)
-					asap->cycle++;
-				asap->cycle++;
-				pc = addr;
-				break;
-			}
-			pc++;
-			break;
-		case 241:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 245:
-			addr = (asap->memory[pc++] + x) & 255;
-			data = asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 246:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			asap->memory[addr] = nz;
-			break;
-		case 248:
-			vdi |= 8;
-			break;
-		case 249:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 253:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if ((addr & 255) < x)
-				asap->cycle++;
-			data = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 254:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			break;
-		case 3:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 4:
-		case 68:
-		case 100:
-		case 20:
-		case 52:
-		case 84:
-		case 116:
-		case 212:
-		case 244:
-		case 128:
-		case 130:
-		case 137:
-		case 194:
-		case 226:
-			pc++;
-			break;
-		case 7:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 11:
-		case 43:
-			nz = a &= asap->memory[pc++];
-			c = nz >> 7;
-			break;
-		case 12:
-			pc += 2;
-			break;
-		case 15:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 19:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 23:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 27:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 28:
-		case 60:
-		case 92:
-		case 124:
-		case 220:
-		case 252:
-			if (asap->memory[pc++] + x >= 256)
-				asap->cycle++;
-			pc++;
-			break;
-		case 31:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz >> 7;
-			nz = (nz << 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a |= nz;
-			break;
-		case 35:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 39:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 47:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 51:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 55:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 59:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 63:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz << 1) + c;
-			c = nz >> 8;
-			nz &= 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a &= nz;
-			break;
-		case 67:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 71:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 75:
-			a &= asap->memory[pc++];
-			c = a & 1;
-			nz = a >>= 1;
-			break;
-		case 79:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 83:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 87:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 91:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 95:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			nz = a ^= nz;
-			break;
-		case 99:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 103:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr] + (c << 8);
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 107:
-			data = a & asap->memory[pc++];
-			nz = a = (data >> 1) + (c << 7);
-			vdi = (vdi & 12) + ((a ^ data) & 64);
-			if ((vdi & 8) == 0)
-				c = data >> 7;
-			else {
-				if ((data & 15) >= 5)
-					a = (a & 240) + ((a + 6) & 15);
-				if (data >= 80) {
-					a = (a + 96) & 255;
-					c = 1;
-				}
-				else
-					c = 0;
-			}
-			break;
-		case 111:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 115:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 119:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr] + (c << 8);
-			c = nz & 1;
-			nz >>= 1;
-			asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 123:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 127:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz += c << 8;
-			c = nz & 1;
-			nz >>= 1;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a + data + c;
-				nz = tmp & 255;
-				if ((vdi & 8) == 0) {
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					int al = (a & 15) + (data & 15) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						if (nz != 0)
-							nz = (tmp & 128) + 1;
-					}
-					vdi = (vdi & 12) + (((~(data ^ a) & (a ^ tmp)) >> 1) & 64);
-					if (tmp >= 160) {
-						c = 1;
-						a = (tmp + 96) & 255;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}
-			break;
-		case 131:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			data = a & x;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, data);
-			else
-				asap->memory[addr] = data;
-			break;
-		case 135:
-			addr = asap->memory[pc++];
-			data = a & x;
-			asap->memory[addr] = data;
-			break;
-		case 139:
-			data = asap->memory[pc++];
-			a &= (data | 239) & x;
-			nz = a & data;
-			break;
-		case 143:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			data = a & x;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, data);
-			else
-				asap->memory[addr] = data;
-			break;
-		case 147:
-			{
-				int hi;
-				addr = asap->memory[pc++];
-				hi = asap->memory[(addr + 1) & 255];
-				addr = asap->memory[addr];
-				data = (hi + 1) & a & x;
-				addr += y;
-				if (addr >= 256)
-					hi = data - 1;
-				addr += hi << 8;
-				if ((addr & 63744) == 53248)
-					ASAP_PokeHardware(asap, addr, data);
-				else
-					asap->memory[addr] = data;
-			}
-			break;
-		case 151:
-			addr = (asap->memory[pc++] + y) & 255;
-			data = a & x;
-			asap->memory[addr] = data;
-			break;
-		case 155:
-			s = a & x;
-			{
-				int hi;
-				addr = asap->memory[pc++];
-				hi = asap->memory[pc++];
-				data = (hi + 1) & s;
-				addr += y;
-				if (addr >= 256)
-					hi = data - 1;
-				addr += hi << 8;
-				if ((addr & 63744) == 53248)
-					ASAP_PokeHardware(asap, addr, data);
-				else
-					asap->memory[addr] = data;
-			}
-			break;
-		case 156:
-			{
-				int hi;
-				addr = asap->memory[pc++];
-				hi = asap->memory[pc++];
-				data = (hi + 1) & y;
-				addr += x;
-				if (addr >= 256)
-					hi = data - 1;
-				addr += hi << 8;
-				if ((addr & 63744) == 53248)
-					ASAP_PokeHardware(asap, addr, data);
-				else
-					asap->memory[addr] = data;
-			}
-			break;
-		case 158:
-			{
-				int hi;
-				addr = asap->memory[pc++];
-				hi = asap->memory[pc++];
-				data = (hi + 1) & x;
-				addr += y;
-				if (addr >= 256)
-					hi = data - 1;
-				addr += hi << 8;
-				if ((addr & 63744) == 53248)
-					ASAP_PokeHardware(asap, addr, data);
-				else
-					asap->memory[addr] = data;
-			}
-			break;
-		case 159:
-			{
-				int hi;
-				addr = asap->memory[pc++];
-				hi = asap->memory[pc++];
-				data = (hi + 1) & a & x;
-				addr += y;
-				if (addr >= 256)
-					hi = data - 1;
-				addr += hi << 8;
-				if ((addr & 63744) == 53248)
-					ASAP_PokeHardware(asap, addr, data);
-				else
-					asap->memory[addr] = data;
-			}
-			break;
-		case 163:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			nz = x = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 167:
-			addr = asap->memory[pc++];
-			nz = x = a = asap->memory[addr];
-			break;
-		case 171:
-			nz = x = a &= asap->memory[pc++];
-			break;
-		case 175:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			nz = x = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 179:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = x = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 183:
-			addr = (asap->memory[pc++] + y) & 255;
-			nz = x = a = asap->memory[addr];
-			break;
-		case 187:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = x = a = s &= (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 191:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if ((addr & 255) < y)
-				asap->cycle++;
-			nz = x = a = (addr & 63744) == 53248 ? ASAP_PeekHardware(asap, addr) : asap->memory[addr];
-			break;
-		case 195:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 199:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 203:
-			nz = asap->memory[pc++];
-			x &= a;
-			c = x >= nz ? 1 : 0;
-			nz = x = (x - nz) & 255;
-			break;
-		case 207:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 211:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 215:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 219:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 223:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz - 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			c = a >= nz ? 1 : 0;
-			nz = (a - nz) & 255;
-			break;
-		case 227:
-			addr = (asap->memory[pc++] + x) & 255;
-			addr = asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8);
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 231:
-			addr = asap->memory[pc++];
-			nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 239:
-			addr = asap->memory[pc++];
-			addr += asap->memory[pc++] << 8;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 243:
-			addr = asap->memory[pc++];
-			addr = (asap->memory[addr] + (asap->memory[(addr + 1) & 255] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 247:
-			addr = (asap->memory[pc++] + x) & 255;
-			nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 251:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + y) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		case 255:
-			addr = asap->memory[pc++];
-			addr = (addr + (asap->memory[pc++] << 8) + x) & 65535;
-			if (addr >> 8 == 210) {
-				asap->cycle--;
-				nz = ASAP_PeekHardware(asap, addr);
-				ASAP_PokeHardware(asap, addr, nz);
-				asap->cycle++;
-			}
-			else
-				nz = asap->memory[addr];
-			nz = (nz + 1) & 255;
-			if ((addr & 63744) == 53248)
-				ASAP_PokeHardware(asap, addr, nz);
-			else
-				asap->memory[addr] = nz;
-			data = nz;
-			{
-				int tmp = a - data - 1 + c;
-				int al = (a & 15) - (data & 15) - 1 + c;
-				vdi = (vdi & 12) + ((((data ^ a) & (a ^ tmp)) >> 1) & 64);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 255;
-				if ((vdi & 8) != 0) {
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 96) & 255;
-				}
-			}
-			break;
-		}
-	}
-	self->pc = pc;
-	self->nz = nz;
-	self->a = a;
-	self->x = x;
-	self->y = y;
-	self->c = c;
-	self->s = s;
-	self->vdi = vdi;
-}
-
-static void FlashPack_Construct(FlashPack *self)
-{
-	{
-		int i;
-		for (i = 0; i < 65536; i++)
-			self->memory[i] = -1;
-	}
-	self->loadState = FlashPackLoadState_START_LOW_BYTE;
-}
-
-static cibool FlashPack_Compress(FlashPack *self, ByteWriter w)
-{
-	int runAddress;
-	int depackerEndAddress;
-	int depackerStartAddress;
-	int compressedStartAddress;
-	if (self->memory[252] >= 0 || self->memory[253] >= 0 || self->memory[254] >= 0 || self->memory[255] >= 0)
-		return FALSE;
-	runAddress = self->memory[736] + (self->memory[737] << 8);
-	self->memory[736] = self->memory[737] = -1;
-	if ((depackerEndAddress = FlashPack_FindHole(self)) == -1)
-		return FALSE;
-	self->compressedLength = 0;
-	self->itemsCount = 0;
-	FlashPack_PutPoke(self, 54286, 0);
-	FlashPack_PutPoke(self, 53774, 0);
-	FlashPack_PutPoke(self, 54272, 0);
-	FlashPack_PutPoke(self, 54017, 254);
-	FlashPack_PutPoke(self, 580, 255);
-	FlashPack_CompressMemoryArea(self, depackerEndAddress, 65535);
-	FlashPack_CompressMemoryArea(self, 0, depackerEndAddress);
-	FlashPack_PutItem(self, FlashPackItemType_END_OF_STREAM, 0);
-	FlashPack_PutItems(self);
-	depackerStartAddress = depackerEndAddress - 87;
-	compressedStartAddress = depackerStartAddress - self->compressedLength;
-	if (compressedStartAddress < 8192)
-		return FALSE;
-	w.func(w.obj, 255);
-	w.func(w.obj, 255);
-	ASAPWriter_WriteWord(w, 54017);
-	ASAPWriter_WriteWord(w, 54017);
-	w.func(w.obj, 255);
-	ASAPWriter_WriteWord(w, compressedStartAddress);
-	ASAPWriter_WriteWord(w, depackerEndAddress);
-	ASAPWriter_WriteBytes(w, self->compressed, 0, self->compressedLength);
-	w.func(w.obj, 173);
-	ASAPWriter_WriteWord(w, compressedStartAddress);
-	w.func(w.obj, 238);
-	ASAPWriter_WriteWord(w, depackerStartAddress + 1);
-	w.func(w.obj, 208);
-	w.func(w.obj, 3);
-	w.func(w.obj, 238);
-	ASAPWriter_WriteWord(w, depackerStartAddress + 2);
-	w.func(w.obj, 96);
-	w.func(w.obj, 76);
-	ASAPWriter_WriteWord(w, runAddress);
-	w.func(w.obj, 133);
-	w.func(w.obj, 254);
-	w.func(w.obj, 138);
-	w.func(w.obj, 42);
-	w.func(w.obj, 170);
-	w.func(w.obj, 240);
-	w.func(w.obj, 246);
-	w.func(w.obj, 177);
-	w.func(w.obj, 254);
-	w.func(w.obj, 153);
-	w.func(w.obj, 128);
-	w.func(w.obj, 128);
-	w.func(w.obj, 200);
-	w.func(w.obj, 208);
-	w.func(w.obj, 9);
-	w.func(w.obj, 152);
-	w.func(w.obj, 56);
-	w.func(w.obj, 101);
-	w.func(w.obj, 255);
-	w.func(w.obj, 133);
-	w.func(w.obj, 255);
-	w.func(w.obj, 141);
-	ASAPWriter_WriteWord(w, depackerStartAddress + 26);
-	w.func(w.obj, 202);
-	w.func(w.obj, 208);
-	w.func(w.obj, 236);
-	w.func(w.obj, 6);
-	w.func(w.obj, 253);
-	w.func(w.obj, 208);
-	w.func(w.obj, 21);
-	w.func(w.obj, 6);
-	w.func(w.obj, 252);
-	w.func(w.obj, 208);
-	w.func(w.obj, 7);
-	w.func(w.obj, 56);
-	w.func(w.obj, 32);
-	ASAPWriter_WriteWord(w, depackerStartAddress);
-	w.func(w.obj, 42);
-	w.func(w.obj, 133);
-	w.func(w.obj, 252);
-	w.func(w.obj, 169);
-	w.func(w.obj, 1);
-	w.func(w.obj, 144);
-	w.func(w.obj, 4);
-	w.func(w.obj, 32);
-	ASAPWriter_WriteWord(w, depackerStartAddress);
-	w.func(w.obj, 42);
-	w.func(w.obj, 133);
-	w.func(w.obj, 253);
-	w.func(w.obj, 32);
-	ASAPWriter_WriteWord(w, depackerStartAddress);
-	w.func(w.obj, 162);
-	w.func(w.obj, 1);
-	w.func(w.obj, 144);
-	w.func(w.obj, 206);
-	w.func(w.obj, 74);
-	w.func(w.obj, 208);
-	w.func(w.obj, 194);
-	w.func(w.obj, 32);
-	ASAPWriter_WriteWord(w, depackerStartAddress);
-	w.func(w.obj, 176);
-	w.func(w.obj, 193);
-	w.func(w.obj, 168);
-	w.func(w.obj, 32);
-	ASAPWriter_WriteWord(w, depackerStartAddress);
-	w.func(w.obj, 144);
-	w.func(w.obj, 202);
-	ASAPWriter_WriteWord(w, 736);
-	ASAPWriter_WriteWord(w, 737);
-	ASAPWriter_WriteWord(w, depackerStartAddress + 50);
-	return TRUE;
-}
-
-static void FlashPack_CompressMemoryArea(FlashPack *self, int startAddress, int endAddress)
-{
-	int lastDistance = -1;
-	{
-		int address;
-		for (address = startAddress; address <= endAddress;) {
-			while (self->memory[address] < 0)
-				if (++address > endAddress)
-					return;
-			FlashPack_PutItem(self, FlashPackItemType_SET_ADDRESS, address);
-			while (address <= endAddress && self->memory[address] >= 0) {
-				int bestMatch = 0;
-				int bestDistance = -1;
-				{
-					int backAddress;
-					for (backAddress = address - 1; backAddress >= startAddress && address - backAddress < 128; backAddress--) {
-						int match;
-						for (match = 0; address + match <= endAddress; match++) {
-							int data = self->memory[address + match];
-							if (data < 0 || data != self->memory[backAddress + match])
-								break;
-						}
-						if (bestMatch < match) {
-							bestMatch = match;
-							bestDistance = address - backAddress;
-						}
-						else if (bestMatch == match && address - backAddress == lastDistance)
-							bestDistance = lastDistance;
-					}
-				}
-				switch (bestMatch) {
-					int length;
-				case 0:
-				case 1:
-					FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address++]);
-					continue;
-				case 2:
-					FlashPack_PutItem(self, FlashPackItemType_COPY_TWO_BYTES, bestDistance);
-					break;
-				case 3:
-					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-					break;
-				case 4:
-					if (bestDistance == lastDistance)
-						FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 4);
-					else if (FlashPack_IsLiteralPreferred(self)) {
-						FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address]);
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-					}
-					else {
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-						FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address + 3]);
-					}
-					break;
-				case 5:
-					if (bestDistance == lastDistance)
-						FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 5);
-					else {
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-						FlashPack_PutItem(self, FlashPackItemType_COPY_TWO_BYTES, bestDistance);
-					}
-					break;
-				case 6:
-					if (bestDistance == lastDistance)
-						FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 6);
-					else {
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-					}
-					break;
-				default:
-					length = bestMatch;
-					if (bestDistance != lastDistance) {
-						if (FlashPack_IsLiteralPreferred(self) && length % 255 == 4) {
-							FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address]);
-							length--;
-						}
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-						length -= 3;
-					}
-					else if (FlashPack_IsLiteralPreferred(self) && length % 255 == 1) {
-						FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address]);
-						length--;
-					}
-					for (; length > 255; length -= 255)
-						FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 255);
-					switch (length) {
-					case 0:
-						break;
-					case 1:
-						FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address + bestMatch - 1]);
-						break;
-					case 2:
-						FlashPack_PutItem(self, FlashPackItemType_COPY_TWO_BYTES, bestDistance);
-						break;
-					case 3:
-						FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
-						break;
-					default:
-						FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, length);
-						break;
-					}
-					break;
-				}
-				address += bestMatch;
-				lastDistance = bestDistance;
-			}
-		}
-	}
-}
-
-static int FlashPack_FindHole(FlashPack const *self)
-{
-	int end = 48159;
-	for (;;) {
-		int start;
-		while (self->memory[end] >= 0)
-			if (--end < 9216)
-				return -1;
-		start = end;
-		while (self->memory[--start] < 0)
-			if (end - start >= 1023)
-				return end;
-		end = start;
-	}
-}
-
-static int FlashPack_GetInnerFlags(FlashPack const *self, int index)
-{
-	int flags = 1;
-	do {
-		flags <<= 1;
-		if (index < self->itemsCount && self->items[index++].type != FlashPackItemType_LITERAL)
-			flags++;
-	}
-	while (flags < 256);
-	return flags & 255;
-}
-
-static cibool FlashPack_IsLiteralPreferred(FlashPack const *self)
-{
-	return (self->itemsCount & 7) == 7 && FlashPack_GetInnerFlags(self, self->itemsCount - 7) == 0;
-}
-
-static void FlashPack_LoadByte(FlashPack *self, int data)
-{
-	switch (self->loadState) {
-	case FlashPackLoadState_START_LOW_BYTE:
-		self->loadAddress = data;
-		self->loadState = FlashPackLoadState_START_HIGH_BYTE;
-		break;
-	case FlashPackLoadState_START_HIGH_BYTE:
-		self->loadAddress += data << 8;
-		self->loadState = self->loadAddress == 65535 ? FlashPackLoadState_START_LOW_BYTE : FlashPackLoadState_END_LOW_BYTE;
-		break;
-	case FlashPackLoadState_END_LOW_BYTE:
-		self->loadEndAddress = data;
-		self->loadState = FlashPackLoadState_END_HIGH_BYTE;
-		break;
-	case FlashPackLoadState_END_HIGH_BYTE:
-		self->loadEndAddress += data << 8;
-		self->loadState = FlashPackLoadState_CONTENT;
-		break;
-	case FlashPackLoadState_CONTENT:
-		self->memory[self->loadAddress] = data;
-		if (self->loadAddress == self->loadEndAddress)
-			self->loadState = FlashPackLoadState_START_LOW_BYTE;
-		else
-			self->loadAddress = (self->loadAddress + 1) & 65535;
-		break;
-	}
-}
-
-static void FlashPack_PutItem(FlashPack *self, FlashPackItemType type, int value)
-{
-	if (self->itemsCount >= 64) {
-		FlashPack_PutItems(self);
-		self->itemsCount = 0;
-	}
-	self->items[self->itemsCount].type = type;
-	self->items[self->itemsCount].value = value;
-	self->itemsCount++;
-}
-
-static void FlashPack_PutItems(FlashPack *self)
-{
-	int outerFlags = 0;
-	{
-		int i;
-		for (i = 0; i < self->itemsCount; i += 8) {
-			if (FlashPack_GetInnerFlags(self, i) != 0)
-				outerFlags |= 128 >> (i >> 3);
-		}
-	}
-	self->compressed[self->compressedLength++] = outerFlags;
-	{
-		int i;
-		for (i = 0; i < self->itemsCount; i++) {
-			if ((i & 7) == 0) {
-				int flags = FlashPack_GetInnerFlags(self, i);
-				if (flags != 0)
-					self->compressed[self->compressedLength++] = flags;
-			}
-			self->compressedLength += FlashPackItem_WriteValueTo(&self->items[i], self->compressed, self->compressedLength);
-		}
-	}
-}
-
-static void FlashPack_PutPoke(FlashPack *self, int address, int value)
-{
-	FlashPack_PutItem(self, FlashPackItemType_SET_ADDRESS, address);
-	FlashPack_PutItem(self, FlashPackItemType_LITERAL, value);
-}
-
-static int FlashPackItem_WriteValueTo(FlashPackItem const *self, unsigned char *buffer, int index)
-{
-	switch (self->type) {
-		int value;
-	case FlashPackItemType_LITERAL:
-		buffer[index] = self->value;
-		return 1;
-	case FlashPackItemType_COPY_TWO_BYTES:
-		buffer[index] = (128 - self->value) << 1;
-		return 1;
-	case FlashPackItemType_COPY_THREE_BYTES:
-		buffer[index] = ((128 - self->value) << 1) + 1;
-		return 1;
-	case FlashPackItemType_COPY_MANY_BYTES:
-		buffer[index] = 1;
-		buffer[index + 1] = self->value;
-		return 2;
-	case FlashPackItemType_SET_ADDRESS:
-		value = self->value - 128;
-		buffer[index] = 0;
-		buffer[index + 1] = (unsigned char) value;
-		buffer[index + 2] = value >> 8;
-		return 3;
-	default:
-		buffer[index] = 1;
-		buffer[index + 1] = 0;
-		return 2;
-	}
-}
-
-static void Pokey_AddDelta(Pokey *self, PokeyPair const *pokeys, int cycle, int delta)
-{
-	int i = cycle * pokeys->sampleFactor + pokeys->sampleOffset;
-	int delta2 = (delta >> 16) * ((i >> 4) & 65535);
-	i >>= 20;
-	self->deltaBuffer[i] += delta - delta2;
-	self->deltaBuffer[i + 1] += delta2;
-}
-
-static void Pokey_EndFrame(Pokey *self, PokeyPair const *pokeys, int cycle)
-{
-	int m;
-	Pokey_GenerateUntilCycle(self, pokeys, cycle);
-	self->polyIndex += cycle;
-	m = (self->audctl & 128) != 0 ? 237615 : 60948015;
-	if (self->polyIndex >= 2 * m)
-		self->polyIndex -= m;
-	if (self->tickCycle1 != 8388608)
-		self->tickCycle1 -= cycle;
-	if (self->tickCycle2 != 8388608)
-		self->tickCycle2 -= cycle;
-	if (self->tickCycle3 != 8388608)
-		self->tickCycle3 -= cycle;
-	if (self->tickCycle4 != 8388608)
-		self->tickCycle4 -= cycle;
-}
-
-static void Pokey_GenerateUntilCycle(Pokey *self, PokeyPair const *pokeys, int cycleLimit)
-{
-	for (;;) {
-		int cycle = cycleLimit;
-		static const unsigned char poly4Lookup[15] = { 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1 };
-		static const unsigned char poly5Lookup[31] = { 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0,
-			1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1 };
-		if (cycle > self->tickCycle1)
-			cycle = self->tickCycle1;
-		if (cycle > self->tickCycle2)
-			cycle = self->tickCycle2;
-		if (cycle > self->tickCycle3)
-			cycle = self->tickCycle3;
-		if (cycle > self->tickCycle4)
-			cycle = self->tickCycle4;
-		if (cycle == cycleLimit)
-			break;
-		if (cycle == self->tickCycle3) {
-			self->tickCycle3 += self->periodCycles3;
-			if ((self->audctl & 4) != 0 && self->delta1 > 0 && self->mute1 == 0) {
-				self->delta1 = -self->delta1;
-				Pokey_AddDelta(self, pokeys, cycle, self->delta1);
-			}
-			if (self->init) {
-				switch (self->audc3 >> 4) {
-				case 10:
-				case 14:
-					self->out3 ^= 1;
-					self->delta3 = -self->delta3;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta3);
-					break;
-				default:
-					break;
-				}
-			}
-			else {
-				int poly = cycle + self->polyIndex - 2;
-				int newOut = self->out3;
-				switch (self->audc3 >> 4) {
-				case 0:
-					if (poly5Lookup[poly % 31] != 0) {
-						if ((self->audctl & 128) != 0)
-							newOut = pokeys->poly9Lookup[poly % 511] & 1;
-						else {
-							poly %= 131071;
-							newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-						}
-					}
-					break;
-				case 2:
-				case 6:
-					newOut ^= poly5Lookup[poly % 31];
-					break;
-				case 4:
-					if (poly5Lookup[poly % 31] != 0)
-						newOut = poly4Lookup[poly % 15];
-					break;
-				case 8:
-					if ((self->audctl & 128) != 0)
-						newOut = pokeys->poly9Lookup[poly % 511] & 1;
-					else {
-						poly %= 131071;
-						newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-					}
-					break;
-				case 10:
-				case 14:
-					newOut ^= 1;
-					break;
-				case 12:
-					newOut = poly4Lookup[poly % 15];
-					break;
-				default:
-					break;
-				}
-				if (newOut != self->out3) {
-					self->out3 = newOut;
-					self->delta3 = -self->delta3;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta3);
-				}
-			}
-		}
-		if (cycle == self->tickCycle4) {
-			self->tickCycle4 += self->periodCycles4;
-			if ((self->audctl & 8) != 0)
-				self->tickCycle3 = cycle + self->reloadCycles3;
-			if ((self->audctl & 2) != 0 && self->delta2 > 0 && self->mute2 == 0) {
-				self->delta2 = -self->delta2;
-				Pokey_AddDelta(self, pokeys, cycle, self->delta2);
-			}
-			if (self->init) {
-				switch (self->audc4 >> 4) {
-				case 10:
-				case 14:
-					self->out4 ^= 1;
-					self->delta4 = -self->delta4;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta4);
-					break;
-				default:
-					break;
-				}
-			}
-			else {
-				int poly = cycle + self->polyIndex - 3;
-				int newOut = self->out4;
-				switch (self->audc4 >> 4) {
-				case 0:
-					if (poly5Lookup[poly % 31] != 0) {
-						if ((self->audctl & 128) != 0)
-							newOut = pokeys->poly9Lookup[poly % 511] & 1;
-						else {
-							poly %= 131071;
-							newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-						}
-					}
-					break;
-				case 2:
-				case 6:
-					newOut ^= poly5Lookup[poly % 31];
-					break;
-				case 4:
-					if (poly5Lookup[poly % 31] != 0)
-						newOut = poly4Lookup[poly % 15];
-					break;
-				case 8:
-					if ((self->audctl & 128) != 0)
-						newOut = pokeys->poly9Lookup[poly % 511] & 1;
-					else {
-						poly %= 131071;
-						newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-					}
-					break;
-				case 10:
-				case 14:
-					newOut ^= 1;
-					break;
-				case 12:
-					newOut = poly4Lookup[poly % 15];
-					break;
-				default:
-					break;
-				}
-				if (newOut != self->out4) {
-					self->out4 = newOut;
-					self->delta4 = -self->delta4;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta4);
-				}
-			}
-		}
-		if (cycle == self->tickCycle1) {
-			self->tickCycle1 += self->periodCycles1;
-			if ((self->skctl & 136) == 8)
-				self->tickCycle2 = cycle + self->periodCycles2;
-			if (self->init) {
-				switch (self->audc1 >> 4) {
-				case 10:
-				case 14:
-					self->out1 ^= 1;
-					self->delta1 = -self->delta1;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta1);
-					break;
-				default:
-					break;
-				}
-			}
-			else {
-				int poly = cycle + self->polyIndex - 0;
-				int newOut = self->out1;
-				switch (self->audc1 >> 4) {
-				case 0:
-					if (poly5Lookup[poly % 31] != 0) {
-						if ((self->audctl & 128) != 0)
-							newOut = pokeys->poly9Lookup[poly % 511] & 1;
-						else {
-							poly %= 131071;
-							newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-						}
-					}
-					break;
-				case 2:
-				case 6:
-					newOut ^= poly5Lookup[poly % 31];
-					break;
-				case 4:
-					if (poly5Lookup[poly % 31] != 0)
-						newOut = poly4Lookup[poly % 15];
-					break;
-				case 8:
-					if ((self->audctl & 128) != 0)
-						newOut = pokeys->poly9Lookup[poly % 511] & 1;
-					else {
-						poly %= 131071;
-						newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-					}
-					break;
-				case 10:
-				case 14:
-					newOut ^= 1;
-					break;
-				case 12:
-					newOut = poly4Lookup[poly % 15];
-					break;
-				default:
-					break;
-				}
-				if (newOut != self->out1) {
-					self->out1 = newOut;
-					self->delta1 = -self->delta1;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta1);
-				}
-			}
-		}
-		if (cycle == self->tickCycle2) {
-			self->tickCycle2 += self->periodCycles2;
-			if ((self->audctl & 16) != 0)
-				self->tickCycle1 = cycle + self->reloadCycles1;
-			else if ((self->skctl & 8) != 0)
-				self->tickCycle1 = cycle + self->periodCycles1;
-			if (self->init) {
-				switch (self->audc2 >> 4) {
-				case 10:
-				case 14:
-					self->out2 ^= 1;
-					self->delta2 = -self->delta2;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta2);
-					break;
-				default:
-					break;
-				}
-			}
-			else {
-				int poly = cycle + self->polyIndex - 1;
-				int newOut = self->out2;
-				switch (self->audc2 >> 4) {
-				case 0:
-					if (poly5Lookup[poly % 31] != 0) {
-						if ((self->audctl & 128) != 0)
-							newOut = pokeys->poly9Lookup[poly % 511] & 1;
-						else {
-							poly %= 131071;
-							newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-						}
-					}
-					break;
-				case 2:
-				case 6:
-					newOut ^= poly5Lookup[poly % 31];
-					break;
-				case 4:
-					if (poly5Lookup[poly % 31] != 0)
-						newOut = poly4Lookup[poly % 15];
-					break;
-				case 8:
-					if ((self->audctl & 128) != 0)
-						newOut = pokeys->poly9Lookup[poly % 511] & 1;
-					else {
-						poly %= 131071;
-						newOut = (pokeys->poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-					}
-					break;
-				case 10:
-				case 14:
-					newOut ^= 1;
-					break;
-				case 12:
-					newOut = poly4Lookup[poly % 15];
-					break;
-				default:
-					break;
-				}
-				if (newOut != self->out2) {
-					self->out2 = newOut;
-					self->delta2 = -self->delta2;
-					Pokey_AddDelta(self, pokeys, cycle, self->delta2);
-				}
-			}
-		}
-	}
-}
-
-static void Pokey_Initialize(Pokey *self)
-{
-	self->audf1 = 0;
-	self->audf2 = 0;
-	self->audf3 = 0;
-	self->audf4 = 0;
-	self->audc1 = 0;
-	self->audc2 = 0;
-	self->audc3 = 0;
-	self->audc4 = 0;
-	self->audctl = 0;
-	self->skctl = 3;
-	self->init = FALSE;
-	self->divCycles = 28;
-	self->periodCycles1 = 28;
-	self->periodCycles2 = 28;
-	self->periodCycles3 = 28;
-	self->periodCycles4 = 28;
-	self->reloadCycles1 = 28;
-	self->reloadCycles3 = 28;
-	self->polyIndex = 60948015;
-	self->tickCycle1 = 8388608;
-	self->tickCycle2 = 8388608;
-	self->tickCycle3 = 8388608;
-	self->tickCycle4 = 8388608;
-	self->mute1 = 1;
-	self->mute2 = 1;
-	self->mute3 = 1;
-	self->mute4 = 1;
-	self->out1 = 0;
-	self->out2 = 0;
-	self->out3 = 0;
-	self->out4 = 0;
-	self->delta1 = 0;
-	self->delta2 = 0;
-	self->delta3 = 0;
-	self->delta4 = 0;
-	memset(self->deltaBuffer, 0, sizeof(self->deltaBuffer));
-}
-
-static cibool Pokey_IsSilent(Pokey const *self)
-{
-	return ((self->audc1 | self->audc2 | self->audc3 | self->audc4) & 15) == 0;
-}
-
-static void Pokey_Mute(Pokey *self, int mask)
-{
-	if ((mask & 1) != 0) {
-		self->mute1 |= 4;
-		self->tickCycle1 = 8388608;
-	}
-	else {
-		self->mute1 &= ~4;
-		if (self->tickCycle1 == 8388608 && self->mute1 == 0)
-			self->tickCycle1 = 0;
-	}
-	if ((mask & 2) != 0) {
-		self->mute2 |= 4;
-		self->tickCycle2 = 8388608;
-	}
-	else {
-		self->mute2 &= ~4;
-		if (self->tickCycle2 == 8388608 && self->mute2 == 0)
-			self->tickCycle2 = 0;
-	}
-	if ((mask & 4) != 0) {
-		self->mute3 |= 4;
-		self->tickCycle3 = 8388608;
-	}
-	else {
-		self->mute3 &= ~4;
-		if (self->tickCycle3 == 8388608 && self->mute3 == 0)
-			self->tickCycle3 = 0;
-	}
-	if ((mask & 8) != 0) {
-		self->mute4 |= 4;
-		self->tickCycle4 = 8388608;
-	}
-	else {
-		self->mute4 &= ~4;
-		if (self->tickCycle4 == 8388608 && self->mute4 == 0)
-			self->tickCycle4 = 0;
-	}
-}
-
-static void PokeyPair_Construct(PokeyPair *self)
-{
-	int reg = 511;
-	{
-		int i;
-		for (i = 0; i < 511; i++) {
-			reg = ((((reg >> 5) ^ reg) & 1) << 8) + (reg >> 1);
-			self->poly9Lookup[i] = (unsigned char) reg;
-		}
-	}
-	reg = 131071;
-	{
-		int i;
-		for (i = 0; i < 16385; i++) {
-			reg = ((((reg >> 5) ^ reg) & 255) << 9) + (reg >> 8);
-			self->poly17Lookup[i] = (unsigned char) (reg >> 1);
-		}
-	}
-}
-
-static int PokeyPair_EndFrame(PokeyPair *self, int cycle)
-{
-	Pokey_EndFrame(&self->basePokey, self, cycle);
-	if (self->extraPokeyMask != 0)
-		Pokey_EndFrame(&self->extraPokey, self, cycle);
-	self->sampleOffset += cycle * self->sampleFactor;
-	self->readySamplesStart = 0;
-	self->readySamplesEnd = self->sampleOffset >> 20;
-	self->sampleOffset &= 1048575;
-	return self->readySamplesEnd;
-}
-
-static int PokeyPair_Generate(PokeyPair *self, unsigned char *buffer, int bufferOffset, int blocks, ASAPSampleFormat format)
-{
-	int i = self->readySamplesStart;
-	int samplesEnd = self->readySamplesEnd;
-	int accLeft;
-	int accRight;
-	if (blocks < samplesEnd - i)
-		samplesEnd = i + blocks;
-	else
-		blocks = samplesEnd - i;
-	accLeft = self->iirAccLeft;
-	accRight = self->iirAccRight;
-	for (; i < samplesEnd; i++) {
-		int sample;
-		accLeft += self->basePokey.deltaBuffer[i] - (accLeft * 3 >> 10);
-		sample = accLeft >> 10;
-		if (sample < -32767)
-			sample = -32767;
-		else if (sample > 32767)
-			sample = 32767;
-		switch (format) {
-		case ASAPSampleFormat_U8:
-			buffer[bufferOffset++] = (sample >> 8) + 128;
-			break;
-		case ASAPSampleFormat_S16_L_E:
-			buffer[bufferOffset++] = (unsigned char) sample;
-			buffer[bufferOffset++] = (unsigned char) (sample >> 8);
-			break;
-		case ASAPSampleFormat_S16_B_E:
-			buffer[bufferOffset++] = (unsigned char) (sample >> 8);
-			buffer[bufferOffset++] = (unsigned char) sample;
-			break;
-		}
-		if (self->extraPokeyMask != 0) {
-			accRight += self->extraPokey.deltaBuffer[i] - (accRight * 3 >> 10);
-			sample = accRight >> 10;
-			if (sample < -32767)
-				sample = -32767;
-			else if (sample > 32767)
-				sample = 32767;
-			switch (format) {
-			case ASAPSampleFormat_U8:
-				buffer[bufferOffset++] = (sample >> 8) + 128;
-				break;
-			case ASAPSampleFormat_S16_L_E:
-				buffer[bufferOffset++] = (unsigned char) sample;
-				buffer[bufferOffset++] = (unsigned char) (sample >> 8);
-				break;
-			case ASAPSampleFormat_S16_B_E:
-				buffer[bufferOffset++] = (unsigned char) (sample >> 8);
-				buffer[bufferOffset++] = (unsigned char) sample;
-				break;
-			}
-		}
-	}
-	if (i == self->readySamplesEnd) {
-		accLeft += self->basePokey.deltaBuffer[i] + self->basePokey.deltaBuffer[i + 1];
-		accRight += self->extraPokey.deltaBuffer[i] + self->extraPokey.deltaBuffer[i + 1];
-	}
-	self->readySamplesStart = i;
-	self->iirAccLeft = accLeft;
-	self->iirAccRight = accRight;
-	return blocks;
-}
-
-static int PokeyPair_GetRandom(PokeyPair const *self, int addr, int cycle)
-{
-	Pokey const *pokey = (addr & self->extraPokeyMask) != 0 ? &self->extraPokey : &self->basePokey;
-	int i;
-	int j;
-	if (pokey->init)
-		return 255;
-	i = cycle + pokey->polyIndex;
-	if ((pokey->audctl & 128) != 0)
-		return self->poly9Lookup[i % 511];
-	i %= 131071;
-	j = i >> 3;
-	i &= 7;
-	return ((self->poly17Lookup[j] >> i) + (self->poly17Lookup[j + 1] << (8 - i))) & 255;
-}
-
-static void PokeyPair_Initialize(PokeyPair *self, cibool ntsc, cibool stereo)
-{
-	self->extraPokeyMask = stereo ? 16 : 0;
-	self->timer1Cycle = 8388608;
-	self->timer2Cycle = 8388608;
-	self->timer4Cycle = 8388608;
-	self->irqst = 255;
-	Pokey_Initialize(&self->basePokey);
-	Pokey_Initialize(&self->extraPokey);
-	self->sampleFactor = ntsc ? 25837 : 26075;
-	self->sampleOffset = 0;
-	self->readySamplesStart = 0;
-	self->readySamplesEnd = 0;
-	self->iirAccLeft = 0;
-	self->iirAccRight = 0;
-}
-
-static cibool PokeyPair_IsSilent(PokeyPair const *self)
-{
-	return Pokey_IsSilent(&self->basePokey) && Pokey_IsSilent(&self->extraPokey);
-}
-
-static void PokeyPair_Poke(PokeyPair *self, int addr, int data, int cycle)
-{
-	Pokey *pokey = (addr & self->extraPokeyMask) != 0 ? &self->extraPokey : &self->basePokey;
-	switch (addr & 15) {
-		cibool init;
-	case 0:
-		if (data == pokey->audf1)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audf1 = data;
-		switch (pokey->audctl & 80) {
-		case 0:
-			pokey->periodCycles1 = pokey->divCycles * (data + 1);
-			break;
-		case 16:
-			pokey->periodCycles2 = pokey->divCycles * (data + (pokey->audf2 << 8) + 1);
-			pokey->reloadCycles1 = pokey->divCycles * (data + 1);
-			if (pokey->periodCycles2 <= 112 && (pokey->audc2 >> 4 == 10 || pokey->audc2 >> 4 == 14)) {
-				pokey->mute2 |= 1;
-				pokey->tickCycle2 = 8388608;
-			}
-			else {
-				pokey->mute2 &= ~1;
-				if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-					pokey->tickCycle2 = cycle;
-			}
-			break;
-		case 64:
-			pokey->periodCycles1 = data + 4;
-			break;
-		case 80:
-			pokey->periodCycles2 = data + (pokey->audf2 << 8) + 7;
-			pokey->reloadCycles1 = data + 4;
-			if (pokey->periodCycles2 <= 112 && (pokey->audc2 >> 4 == 10 || pokey->audc2 >> 4 == 14)) {
-				pokey->mute2 |= 1;
-				pokey->tickCycle2 = 8388608;
-			}
-			else {
-				pokey->mute2 &= ~1;
-				if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-					pokey->tickCycle2 = cycle;
-			}
-			break;
-		}
-		if (pokey->periodCycles1 <= 112 && (pokey->audc1 >> 4 == 10 || pokey->audc1 >> 4 == 14)) {
-			pokey->mute1 |= 1;
-			pokey->tickCycle1 = 8388608;
-		}
-		else {
-			pokey->mute1 &= ~1;
-			if (pokey->tickCycle1 == 8388608 && pokey->mute1 == 0)
-				pokey->tickCycle1 = cycle;
-		}
-		break;
-	case 1:
-		if (data == pokey->audc1)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audc1 = data;
-		if ((data & 16) != 0) {
-			data = (data & 15) << 20;
-			if ((pokey->mute1 & 4) == 0)
-				Pokey_AddDelta(pokey, self, cycle, pokey->delta1 > 0 ? data - pokey->delta1 : data);
-			pokey->delta1 = data;
-		}
-		else {
-			data = (data & 15) << 20;
-			if (pokey->periodCycles1 <= 112 && (pokey->audc1 >> 4 == 10 || pokey->audc1 >> 4 == 14)) {
-				pokey->mute1 |= 1;
-				pokey->tickCycle1 = 8388608;
-			}
-			else {
-				pokey->mute1 &= ~1;
-				if (pokey->tickCycle1 == 8388608 && pokey->mute1 == 0)
-					pokey->tickCycle1 = cycle;
-			}
-			if (pokey->delta1 > 0) {
-				if ((pokey->mute1 & 4) == 0)
-					Pokey_AddDelta(pokey, self, cycle, data - pokey->delta1);
-				pokey->delta1 = data;
-			}
-			else
-				pokey->delta1 = -data;
-		}
-		break;
-	case 2:
-		if (data == pokey->audf2)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audf2 = data;
-		switch (pokey->audctl & 80) {
-		case 0:
-		case 64:
-			pokey->periodCycles2 = pokey->divCycles * (data + 1);
-			break;
-		case 16:
-			pokey->periodCycles2 = pokey->divCycles * (pokey->audf1 + (data << 8) + 1);
-			break;
-		case 80:
-			pokey->periodCycles2 = pokey->audf1 + (data << 8) + 7;
-			break;
-		}
-		if (pokey->periodCycles2 <= 112 && (pokey->audc2 >> 4 == 10 || pokey->audc2 >> 4 == 14)) {
-			pokey->mute2 |= 1;
-			pokey->tickCycle2 = 8388608;
-		}
-		else {
-			pokey->mute2 &= ~1;
-			if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-				pokey->tickCycle2 = cycle;
-		}
-		break;
-	case 3:
-		if (data == pokey->audc2)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audc2 = data;
-		if ((data & 16) != 0) {
-			data = (data & 15) << 20;
-			if ((pokey->mute2 & 4) == 0)
-				Pokey_AddDelta(pokey, self, cycle, pokey->delta2 > 0 ? data - pokey->delta2 : data);
-			pokey->delta2 = data;
-		}
-		else {
-			data = (data & 15) << 20;
-			if (pokey->periodCycles2 <= 112 && (pokey->audc2 >> 4 == 10 || pokey->audc2 >> 4 == 14)) {
-				pokey->mute2 |= 1;
-				pokey->tickCycle2 = 8388608;
-			}
-			else {
-				pokey->mute2 &= ~1;
-				if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-					pokey->tickCycle2 = cycle;
-			}
-			if (pokey->delta2 > 0) {
-				if ((pokey->mute2 & 4) == 0)
-					Pokey_AddDelta(pokey, self, cycle, data - pokey->delta2);
-				pokey->delta2 = data;
-			}
-			else
-				pokey->delta2 = -data;
-		}
-		break;
-	case 4:
-		if (data == pokey->audf3)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audf3 = data;
-		switch (pokey->audctl & 40) {
-		case 0:
-			pokey->periodCycles3 = pokey->divCycles * (data + 1);
-			break;
-		case 8:
-			pokey->periodCycles4 = pokey->divCycles * (data + (pokey->audf4 << 8) + 1);
-			pokey->reloadCycles3 = pokey->divCycles * (data + 1);
-			if (pokey->periodCycles4 <= 112 && (pokey->audc4 >> 4 == 10 || pokey->audc4 >> 4 == 14)) {
-				pokey->mute4 |= 1;
-				pokey->tickCycle4 = 8388608;
-			}
-			else {
-				pokey->mute4 &= ~1;
-				if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-					pokey->tickCycle4 = cycle;
-			}
-			break;
-		case 32:
-			pokey->periodCycles3 = data + 4;
-			break;
-		case 40:
-			pokey->periodCycles4 = data + (pokey->audf4 << 8) + 7;
-			pokey->reloadCycles3 = data + 4;
-			if (pokey->periodCycles4 <= 112 && (pokey->audc4 >> 4 == 10 || pokey->audc4 >> 4 == 14)) {
-				pokey->mute4 |= 1;
-				pokey->tickCycle4 = 8388608;
-			}
-			else {
-				pokey->mute4 &= ~1;
-				if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-					pokey->tickCycle4 = cycle;
-			}
-			break;
-		}
-		if (pokey->periodCycles3 <= 112 && (pokey->audc3 >> 4 == 10 || pokey->audc3 >> 4 == 14)) {
-			pokey->mute3 |= 1;
-			pokey->tickCycle3 = 8388608;
-		}
-		else {
-			pokey->mute3 &= ~1;
-			if (pokey->tickCycle3 == 8388608 && pokey->mute3 == 0)
-				pokey->tickCycle3 = cycle;
-		}
-		break;
-	case 5:
-		if (data == pokey->audc3)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audc3 = data;
-		if ((data & 16) != 0) {
-			data = (data & 15) << 20;
-			if ((pokey->mute3 & 4) == 0)
-				Pokey_AddDelta(pokey, self, cycle, pokey->delta3 > 0 ? data - pokey->delta3 : data);
-			pokey->delta3 = data;
-		}
-		else {
-			data = (data & 15) << 20;
-			if (pokey->periodCycles3 <= 112 && (pokey->audc3 >> 4 == 10 || pokey->audc3 >> 4 == 14)) {
-				pokey->mute3 |= 1;
-				pokey->tickCycle3 = 8388608;
-			}
-			else {
-				pokey->mute3 &= ~1;
-				if (pokey->tickCycle3 == 8388608 && pokey->mute3 == 0)
-					pokey->tickCycle3 = cycle;
-			}
-			if (pokey->delta3 > 0) {
-				if ((pokey->mute3 & 4) == 0)
-					Pokey_AddDelta(pokey, self, cycle, data - pokey->delta3);
-				pokey->delta3 = data;
-			}
-			else
-				pokey->delta3 = -data;
-		}
-		break;
-	case 6:
-		if (data == pokey->audf4)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audf4 = data;
-		switch (pokey->audctl & 40) {
-		case 0:
-		case 32:
-			pokey->periodCycles4 = pokey->divCycles * (data + 1);
-			break;
-		case 8:
-			pokey->periodCycles4 = pokey->divCycles * (pokey->audf3 + (data << 8) + 1);
-			break;
-		case 40:
-			pokey->periodCycles4 = pokey->audf3 + (data << 8) + 7;
-			break;
-		}
-		if (pokey->periodCycles4 <= 112 && (pokey->audc4 >> 4 == 10 || pokey->audc4 >> 4 == 14)) {
-			pokey->mute4 |= 1;
-			pokey->tickCycle4 = 8388608;
-		}
-		else {
-			pokey->mute4 &= ~1;
-			if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-				pokey->tickCycle4 = cycle;
-		}
-		break;
-	case 7:
-		if (data == pokey->audc4)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audc4 = data;
-		if ((data & 16) != 0) {
-			data = (data & 15) << 20;
-			if ((pokey->mute4 & 4) == 0)
-				Pokey_AddDelta(pokey, self, cycle, pokey->delta4 > 0 ? data - pokey->delta4 : data);
-			pokey->delta4 = data;
-		}
-		else {
-			data = (data & 15) << 20;
-			if (pokey->periodCycles4 <= 112 && (pokey->audc4 >> 4 == 10 || pokey->audc4 >> 4 == 14)) {
-				pokey->mute4 |= 1;
-				pokey->tickCycle4 = 8388608;
-			}
-			else {
-				pokey->mute4 &= ~1;
-				if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-					pokey->tickCycle4 = cycle;
-			}
-			if (pokey->delta4 > 0) {
-				if ((pokey->mute4 & 4) == 0)
-					Pokey_AddDelta(pokey, self, cycle, data - pokey->delta4);
-				pokey->delta4 = data;
-			}
-			else
-				pokey->delta4 = -data;
-		}
-		break;
-	case 8:
-		if (data == pokey->audctl)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->audctl = data;
-		pokey->divCycles = (data & 1) != 0 ? 114 : 28;
-		switch (data & 80) {
-		case 0:
-			pokey->periodCycles1 = pokey->divCycles * (pokey->audf1 + 1);
-			pokey->periodCycles2 = pokey->divCycles * (pokey->audf2 + 1);
-			break;
-		case 16:
-			pokey->periodCycles1 = pokey->divCycles << 8;
-			pokey->periodCycles2 = pokey->divCycles * (pokey->audf1 + (pokey->audf2 << 8) + 1);
-			pokey->reloadCycles1 = pokey->divCycles * (pokey->audf1 + 1);
-			break;
-		case 64:
-			pokey->periodCycles1 = pokey->audf1 + 4;
-			pokey->periodCycles2 = pokey->divCycles * (pokey->audf2 + 1);
-			break;
-		case 80:
-			pokey->periodCycles1 = 256;
-			pokey->periodCycles2 = pokey->audf1 + (pokey->audf2 << 8) + 7;
-			pokey->reloadCycles1 = pokey->audf1 + 4;
-			break;
-		}
-		if (pokey->periodCycles1 <= 112 && (pokey->audc1 >> 4 == 10 || pokey->audc1 >> 4 == 14)) {
-			pokey->mute1 |= 1;
-			pokey->tickCycle1 = 8388608;
-		}
-		else {
-			pokey->mute1 &= ~1;
-			if (pokey->tickCycle1 == 8388608 && pokey->mute1 == 0)
-				pokey->tickCycle1 = cycle;
-		}
-		if (pokey->periodCycles2 <= 112 && (pokey->audc2 >> 4 == 10 || pokey->audc2 >> 4 == 14)) {
-			pokey->mute2 |= 1;
-			pokey->tickCycle2 = 8388608;
-		}
-		else {
-			pokey->mute2 &= ~1;
-			if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-				pokey->tickCycle2 = cycle;
-		}
-		switch (data & 40) {
-		case 0:
-			pokey->periodCycles3 = pokey->divCycles * (pokey->audf3 + 1);
-			pokey->periodCycles4 = pokey->divCycles * (pokey->audf4 + 1);
-			break;
-		case 8:
-			pokey->periodCycles3 = pokey->divCycles << 8;
-			pokey->periodCycles4 = pokey->divCycles * (pokey->audf3 + (pokey->audf4 << 8) + 1);
-			pokey->reloadCycles3 = pokey->divCycles * (pokey->audf3 + 1);
-			break;
-		case 32:
-			pokey->periodCycles3 = pokey->audf3 + 4;
-			pokey->periodCycles4 = pokey->divCycles * (pokey->audf4 + 1);
-			break;
-		case 40:
-			pokey->periodCycles3 = 256;
-			pokey->periodCycles4 = pokey->audf3 + (pokey->audf4 << 8) + 7;
-			pokey->reloadCycles3 = pokey->audf3 + 4;
-			break;
-		}
-		if (pokey->periodCycles3 <= 112 && (pokey->audc3 >> 4 == 10 || pokey->audc3 >> 4 == 14)) {
-			pokey->mute3 |= 1;
-			pokey->tickCycle3 = 8388608;
-		}
-		else {
-			pokey->mute3 &= ~1;
-			if (pokey->tickCycle3 == 8388608 && pokey->mute3 == 0)
-				pokey->tickCycle3 = cycle;
-		}
-		if (pokey->periodCycles4 <= 112 && (pokey->audc4 >> 4 == 10 || pokey->audc4 >> 4 == 14)) {
-			pokey->mute4 |= 1;
-			pokey->tickCycle4 = 8388608;
-		}
-		else {
-			pokey->mute4 &= ~1;
-			if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-				pokey->tickCycle4 = cycle;
-		}
-		if (pokey->init && (data & 64) == 0) {
-			pokey->mute1 |= 2;
-			pokey->tickCycle1 = 8388608;
-		}
-		else {
-			pokey->mute1 &= ~2;
-			if (pokey->tickCycle1 == 8388608 && pokey->mute1 == 0)
-				pokey->tickCycle1 = cycle;
-		}
-		if (pokey->init && (data & 80) != 80) {
-			pokey->mute2 |= 2;
-			pokey->tickCycle2 = 8388608;
-		}
-		else {
-			pokey->mute2 &= ~2;
-			if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-				pokey->tickCycle2 = cycle;
-		}
-		if (pokey->init && (data & 32) == 0) {
-			pokey->mute3 |= 2;
-			pokey->tickCycle3 = 8388608;
-		}
-		else {
-			pokey->mute3 &= ~2;
-			if (pokey->tickCycle3 == 8388608 && pokey->mute3 == 0)
-				pokey->tickCycle3 = cycle;
-		}
-		if (pokey->init && (data & 40) != 40) {
-			pokey->mute4 |= 2;
-			pokey->tickCycle4 = 8388608;
-		}
-		else {
-			pokey->mute4 &= ~2;
-			if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-				pokey->tickCycle4 = cycle;
-		}
-		break;
-	case 9:
-		if (pokey->tickCycle1 != 8388608)
-			pokey->tickCycle1 = cycle + pokey->periodCycles1;
-		if (pokey->tickCycle2 != 8388608)
-			pokey->tickCycle2 = cycle + pokey->periodCycles2;
-		if (pokey->tickCycle3 != 8388608)
-			pokey->tickCycle3 = cycle + pokey->periodCycles3;
-		if (pokey->tickCycle4 != 8388608)
-			pokey->tickCycle4 = cycle + pokey->periodCycles4;
-		break;
-	case 15:
-		if (data == pokey->skctl)
-			break;
-		Pokey_GenerateUntilCycle(pokey, self, cycle);
-		pokey->skctl = data;
-		init = (data & 3) == 0;
-		if (pokey->init && !init)
-			pokey->polyIndex = ((pokey->audctl & 128) != 0 ? 237614 : 60948014) - cycle;
-		pokey->init = init;
-		if (pokey->init && (pokey->audctl & 64) == 0) {
-			pokey->mute1 |= 2;
-			pokey->tickCycle1 = 8388608;
-		}
-		else {
-			pokey->mute1 &= ~2;
-			if (pokey->tickCycle1 == 8388608 && pokey->mute1 == 0)
-				pokey->tickCycle1 = cycle;
-		}
-		if (pokey->init && (pokey->audctl & 80) != 80) {
-			pokey->mute2 |= 2;
-			pokey->tickCycle2 = 8388608;
-		}
-		else {
-			pokey->mute2 &= ~2;
-			if (pokey->tickCycle2 == 8388608 && pokey->mute2 == 0)
-				pokey->tickCycle2 = cycle;
-		}
-		if (pokey->init && (pokey->audctl & 32) == 0) {
-			pokey->mute3 |= 2;
-			pokey->tickCycle3 = 8388608;
-		}
-		else {
-			pokey->mute3 &= ~2;
-			if (pokey->tickCycle3 == 8388608 && pokey->mute3 == 0)
-				pokey->tickCycle3 = cycle;
-		}
-		if (pokey->init && (pokey->audctl & 40) != 40) {
-			pokey->mute4 |= 2;
-			pokey->tickCycle4 = 8388608;
-		}
-		else {
-			pokey->mute4 &= ~2;
-			if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-				pokey->tickCycle4 = cycle;
-		}
-		if ((data & 16) != 0) {
-			pokey->mute3 |= 8;
-			pokey->tickCycle3 = 8388608;
-		}
-		else {
-			pokey->mute3 &= ~8;
-			if (pokey->tickCycle3 == 8388608 && pokey->mute3 == 0)
-				pokey->tickCycle3 = cycle;
-		}
-		if ((data & 16) != 0) {
-			pokey->mute4 |= 8;
-			pokey->tickCycle4 = 8388608;
-		}
-		else {
-			pokey->mute4 &= ~8;
-			if (pokey->tickCycle4 == 8388608 && pokey->mute4 == 0)
-				pokey->tickCycle4 = cycle;
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void PokeyPair_StartFrame(PokeyPair *self)
-{
-	memset(self->basePokey.deltaBuffer, 0, sizeof(self->basePokey.deltaBuffer));
-	if (self->extraPokeyMask != 0)
-		memset(self->extraPokey.deltaBuffer, 0, sizeof(self->extraPokey.deltaBuffer));
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,671 +0,0 @@
-// asap.ci - emulation engine
-//
-// Copyright (C) 2010-2013  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-enum NmiStatus
-{
-	Reset,
-	OnVBlank,
-	WasVBlank
-}
-
-/// Atari 8-bit chip music emulator.
-/// This class performs no I/O operations - all music data must be passed in byte arrays.
-public class ASAP
-{
-	/// Output sample rate.
-	public const int SampleRate = Pokey.SampleRate;
-
-	int Cycle;
-	int NextEventCycle;
-
-	byte[65536] Memory;
-
-	Cpu6502() Cpu;
-
-	// ANTIC:
-	int NextScanlineCycle;
-	NmiStatus Nmist;
-
-	// GTIA:
-	int Consol;
-
-	// COVOX:
-	byte[4] Covox;
-
-	// POKEYs:
-	PokeyPair() Pokeys;
-
-	ASAPInfo() ModuleInfo;
-	int NextPlayerCycle;
-	int TmcPerFrameCounter;
-	int CurrentSong;
-	int CurrentDuration;
-	int BlocksPlayed;
-	int SilenceCycles;
-	int SilenceCyclesCounter;
-
-	public ASAP()
-	{
-		SilenceCycles = 0;
-	}
-
-	/// Enables silence detection.
-	/// Causes playback to stop after the specified period of silence.
-	public void DetectSilence(
-		/// Length of silence which ends playback. Zero disables silence detection.
-		int seconds)
-	{
-		// for simplicity ignore PAL/NTSC difference - this doesn't need to be precise
-		SilenceCyclesCounter = SilenceCycles = seconds * 1773447;
-	}
-
-	int PeekHardware(int addr)
-	{
-		switch (addr & 0xff1f) {
-		case 0xd014:
-			return ModuleInfo.Ntsc ? 0xf : 1;
-		case 0xd01f:
-			return ~Consol & 0xf;
-		case 0xd20a:
-		case 0xd21a:
-			return Pokeys.GetRandom(addr, Cycle);
-		case 0xd20e:
-			return Pokeys.Irqst;
-		case 0xd21e:
-			if (Pokeys.ExtraPokeyMask != 0) {
-				// interrupts in the extra POKEY not emulated at the moment
-				return 0xff;
-			}
-			return Pokeys.Irqst;
-		case 0xd20c:
-		case 0xd21c:
-		case 0xd20f: // just because some SAP files rely on this
-		case 0xd21f:
-			return 0xff;
-		case 0xd40b:
-		case 0xd41b:
-			if (Cycle > (ModuleInfo.Ntsc ? 262 * 114 : 312 * 114))
-				return 0;
-			return Cycle / 228;
-		case 0xd40f:
-		case 0xd41f:
-			switch (Nmist) {
-			case NmiStatus.Reset:
-				return 0x1f;
-			case NmiStatus.WasVBlank:
-				return 0x5f;
-			default: // case NmiStatus.OnVBlank:
-				return Cycle < 28291 ? 0x1f : 0x5f;
-			}
-		default:
-			return Memory[addr];
-		}
-	}
-
-	void PokeHardware(int addr, int data)
-	{
-		if (addr >> 8 == 0xd2) {
-			if ((addr & (Pokeys.ExtraPokeyMask + 0xf)) == 0xe) {
-				Pokeys.Irqst |= data ^ 0xff;
-				macro SET_TIMER_IRQ(ch) {
-					if ((data & Pokeys.Irqst & ch) != 0) {
-						if (Pokeys.Timer##ch##Cycle == Pokey.NeverCycle) {
-							int t = Pokeys.BasePokey.TickCycle##ch;
-							while (t < Cycle)
-								t += Pokeys.BasePokey.PeriodCycles##ch;
-							Pokeys.Timer##ch##Cycle = t;
-							if (NextEventCycle > t)
-								NextEventCycle = t;
-						}
-					}
-					else
-						Pokeys.Timer##ch##Cycle = Pokey.NeverCycle;
-				}
-				SET_TIMER_IRQ(1);
-				SET_TIMER_IRQ(2);
-				SET_TIMER_IRQ(4);
-			}
-			else
-				Pokeys.Poke(addr, data, Cycle);
-		}
-		else if ((addr & 0xff0f) == 0xd40a) {
-			int x = Cycle % 114;
-			Cycle += (x <= 106 ? 106 : 106 + 114) - x;
-		}
-		else if ((addr & 0xff0f) == 0xd40f) {
-			Nmist = Cycle < 28292 ? NmiStatus.OnVBlank : NmiStatus.Reset;
-		}
-		else if ((addr & 0xff00) == ModuleInfo.CovoxAddr) {
-			Pokey pokey;
-			addr &= 3;
-			if (addr == 0 || addr == 3)
-				pokey = Pokeys.BasePokey;
-			else
-				pokey = Pokeys.ExtraPokey;
-			const int DeltaShiftCOVOX = 17;
-			pokey.AddDelta(Pokeys, Cycle, (data - Covox[addr]) << DeltaShiftCOVOX);
-			Covox[addr] = data;
-		}
-		else if ((addr & 0xff1f) == 0xd01f) {
-			const int DeltaShiftGTIA = 20;
-			// NOT data - Consol; reverse to the POKEY sound
-			int delta = ((Consol & 8) - (data & 8)) << DeltaShiftGTIA;
-			Pokeys.BasePokey.AddDelta(Pokeys, Cycle, delta);
-			Pokeys.ExtraPokey.AddDelta(Pokeys, Cycle, delta);
-			Consol = data;
-		}
-		else
-			Memory[addr] = data;
-	}
-
-	void Call6502(int addr)
-	{
-		const int codeAddr = 0xd200;
-		Memory[codeAddr] = 0x20; // JSR
-		Memory[codeAddr + 1] = addr.LowByte;
-		Memory[codeAddr + 2] = addr >> 8;
-		Memory[codeAddr + 3] = 0xd2; // escape
-		Cpu.Pc = codeAddr;
-	}
-
-	void Call6502Player()
-	{
-		int player = ModuleInfo.Player;
-		switch (ModuleInfo.Type) {
-		case ASAPModuleType.SapB:
-			Call6502(player);
-			break;
-		case ASAPModuleType.SapC:
-#if !ASAP_ONLY_SAP
-		case ASAPModuleType.Cmc:
-		case ASAPModuleType.Cm3:
-		case ASAPModuleType.Cmr:
-		case ASAPModuleType.Cms:
-#endif
-			Call6502(player + 6);
-			break;
-		case ASAPModuleType.SapD:
-			if (player >= 0) {
-				int s = Cpu.S;
-				Memory[0x100 + s] = Cpu.Pc >> 8;
-				s = s - 1 & 0xff;
-				Memory[0x100 + s] = Cpu.Pc.LowByte;
-				Cpu.S = s - 1 & 0xff;
-				const int codeAddr = 0xd200;
-				Memory[codeAddr] = 0x08; // PHP
-				Memory[codeAddr + 1] = 0x48; // PHA
-				Memory[codeAddr + 2] = 0x8a; // TXA
-				Memory[codeAddr + 3] = 0x48; // PHA
-				Memory[codeAddr + 4] = 0x98; // TYA
-				Memory[codeAddr + 5] = 0x48; // PHA
-				Memory[codeAddr + 6] = 0x20; // JSR
-				Memory[codeAddr + 7] = player.LowByte;
-				Memory[codeAddr + 8] = player >> 8;
-				Memory[codeAddr + 9] = 0x68; // PLA
-				Memory[codeAddr + 10] = 0xa8; // TAY
-				Memory[codeAddr + 11] = 0x68; // PLA
-				Memory[codeAddr + 12] = 0xaa; // TAX
-				Memory[codeAddr + 13] = 0x68; // PLA
-				Memory[codeAddr + 14] = 0x40; // RTI
-				Cpu.Pc = codeAddr;
-			}
-			break;
-		case ASAPModuleType.SapS:
-			int i = Memory[0x45] - 1;
-			Memory[0x45] = i.LowByte;
-			if (i == 0)
-				Memory[0xb07b] = (Memory[0xb07b] + 1).LowByte;
-			break;
-#if !ASAP_ONLY_SAP
-		case ASAPModuleType.Dlt:
-			Call6502(player + 0x103);
-			break;
-		case ASAPModuleType.Mpt:
-		case ASAPModuleType.Rmt:
-		case ASAPModuleType.Tm2:
-		case ASAPModuleType.Fc:
-			Call6502(player + 3);
-			break;
-		case ASAPModuleType.Tmc:
-			if (--TmcPerFrameCounter <= 0) {
-				TmcPerFrameCounter = Memory[ModuleInfo.Music + 0x1f];
-				Call6502(player + 3);
-			}
-			else
-				Call6502(player + 6);
-			break;
-#if EXPERIMENTAL_XEX
-		case ASAPModuleType.Xex:
-			break;
-#endif
-#endif
-		}
-	}
-
-	void HandleEvent()
-	{
-		int cycle = Cycle;
-		if (cycle >= NextScanlineCycle) {
-			if (cycle - NextScanlineCycle < 50) // not WSYNC
-				Cycle = cycle += 9;
-			NextScanlineCycle += 114;
-			if (cycle >= NextPlayerCycle) {
-				Call6502Player();
-				NextPlayerCycle += 114 * ModuleInfo.Fastplay;
-			}
-		}
-		int nextEventCycle = NextScanlineCycle;
-		macro CHECK_TIMER_IRQ(ch) {
-			if (cycle >= Pokeys.Timer##ch##Cycle) {
-				Pokeys.Irqst &= ~ch;
-				Pokeys.Timer##ch##Cycle = Pokey.NeverCycle;
-			}
-			else if (nextEventCycle > Pokeys.Timer##ch##Cycle)
-				nextEventCycle = Pokeys.Timer##ch##Cycle;
-		}
-		CHECK_TIMER_IRQ(1);
-		CHECK_TIMER_IRQ(2);
-		CHECK_TIMER_IRQ(4);
-		NextEventCycle = nextEventCycle;
-	}
-
-	int Do6502Frame()
-	{
-		NextEventCycle = 0;
-		NextScanlineCycle = 0;
-		Nmist = Nmist == NmiStatus.Reset ? NmiStatus.OnVBlank : NmiStatus.WasVBlank;
-		int cycles = ModuleInfo.Ntsc ? 262 * 114 : 312 * 114;
-		Cpu.DoFrame(this, cycles);
-		Cycle -= cycles;
-		if (NextPlayerCycle != Pokey.NeverCycle)
-			NextPlayerCycle -= cycles;
-		if (Pokeys.Timer1Cycle != Pokey.NeverCycle)
-			Pokeys.Timer1Cycle -= cycles;
-		if (Pokeys.Timer2Cycle != Pokey.NeverCycle)
-			Pokeys.Timer2Cycle -= cycles;
-		if (Pokeys.Timer4Cycle != Pokey.NeverCycle)
-			Pokeys.Timer4Cycle -= cycles;
-		return cycles;
-	}
-
-	int DoFrame()
-	{
-		Pokeys.StartFrame();
-		int cycles = Do6502Frame();
-		Pokeys.EndFrame(cycles);
-		return cycles;
-	}
-
-	/// Loads music data ("module").
-	public void Load(
-		/// Filename, used to determine the format.
-		string filename,
-		/// Contents of the file.
-		byte[] module,
-		/// Length of the file.
-		int moduleLen)
-	{
-		ModuleInfo.Load(filename, module, moduleLen);
-#if !ASAP_ONLY_SAP
-		byte[] playerRoutine = ASAP6502.GetPlayerRoutine(ModuleInfo);
-		if (playerRoutine != null) {
-			int player = ASAPInfo.GetWord(playerRoutine, 2);
-			int playerLastByte = ASAPInfo.GetWord(playerRoutine, 4);
-			if (ModuleInfo.Music <= playerLastByte)
-				throw "Module address conflicts with the player routine";
-			Memory[0x4c00] = 0; // for 11270-byte DLT
-			if (ModuleInfo.Type == ASAPModuleType.Fc)
-				module.CopyTo(0, Memory, ModuleInfo.Music, moduleLen);
-			else
-				module.CopyTo(6, Memory, ModuleInfo.Music, moduleLen - 6);
-			playerRoutine.CopyTo(6, Memory, player, playerLastByte + 1 - player);
-			if (ModuleInfo.Player < 0)
-				ModuleInfo.Player = player;
-			return;
-		}
-#endif
-		Memory.Clear();
-		int moduleIndex = ModuleInfo.HeaderLen + 2;
-		while (moduleIndex + 5 <= moduleLen) {
-			int startAddr = ASAPInfo.GetWord(module, moduleIndex);
-			int blockLen = ASAPInfo.GetWord(module, moduleIndex + 2) + 1 - startAddr;
-			if (blockLen <= 0 || moduleIndex + blockLen > moduleLen)
-				throw "Invalid binary block";
-			moduleIndex += 4;
-			module.CopyTo(moduleIndex, Memory, startAddr, blockLen);
-			moduleIndex += blockLen;
-			if (moduleIndex == moduleLen)
-				return;
-			if (moduleIndex + 7 <= moduleLen && module[moduleIndex] == 0xff && module[moduleIndex + 1] == 0xff)
-				moduleIndex += 2;
-		}
-		throw "Invalid binary block";
-	}
-
-	/// Returns information about the loaded module.
-	public ASAPInfo GetInfo()
-	{
-		return ModuleInfo;
-	}
-
-	void Do6502Init(int pc, int a, int x, int y)
-	{
-		Cpu.Pc = pc;
-		Cpu.A = a & 0xff;
-		Cpu.X = x & 0xff;
-		Cpu.Y = y & 0xff;
-		const int escapeAddr = 0xd200;
-		Memory[escapeAddr] = 0xd2; // escape code
-		Memory[0x1fe] = (escapeAddr - 1).LowByte; // return address points to the escape code
-		Memory[0x1ff] = (escapeAddr - 1) >> 8;
-		Cpu.S = 0xfd;
-		for (int frame = 0; frame < 50; frame++) {
-			Do6502Frame();
-			if (Cpu.Pc == escapeAddr)
-				return;
-		}
-		throw "INIT routine didn't return";
-	}
-
-	/// Mutes the selected POKEY channels.
-	public void MutePokeyChannels(
-		/// An 8-bit mask which selects POKEY channels to be muted.
-		int mask)
-	{
-		Pokeys.BasePokey.Mute(mask);
-		Pokeys.ExtraPokey.Mute(mask >> 4);
-	}
-
-	/// Prepares playback of the specified song of the loaded module.
-	public void PlaySong(
-		/// Zero-based song index.
-		int song,
-		/// Playback time in milliseconds, -1 means infinity.
-		int duration)
-	{
-		if (song < 0 || song >= ModuleInfo.Songs)
-			throw "Song number out of range";
-		CurrentSong = song;
-		CurrentDuration = duration;
-		NextPlayerCycle = Pokey.NeverCycle;
-		BlocksPlayed = 0;
-		SilenceCyclesCounter = SilenceCycles;
-
-		Cycle = 0;
-		Cpu.Nz = 0;
-		Cpu.C = 0;
-		Cpu.Vdi = 0;
-		Nmist = NmiStatus.OnVBlank;
-		Consol = 8;
-		Covox[0] = 0x80;
-		Covox[1] = 0x80;
-		Covox[2] = 0x80;
-		Covox[3] = 0x80;
-		Pokeys.Initialize(ModuleInfo.Ntsc, ModuleInfo.Channels > 1);
-		MutePokeyChannels(0xff);
-		switch (ModuleInfo.Type) {
-		case ASAPModuleType.SapB:
-			Do6502Init(ModuleInfo.Init, song, 0, 0);
-			break;
-		case ASAPModuleType.SapC:
-#if !ASAP_ONLY_SAP
-		case ASAPModuleType.Cmc:
-		case ASAPModuleType.Cm3:
-		case ASAPModuleType.Cmr:
-		case ASAPModuleType.Cms:
-#endif
-			Do6502Init(ModuleInfo.Player + 3, 0x70, ModuleInfo.Music, ModuleInfo.Music >> 8);
-			Do6502Init(ModuleInfo.Player + 3, 0x00, song, 0);
-			break;
-		case ASAPModuleType.SapD:
-		case ASAPModuleType.SapS:
-			Cpu.Pc = ModuleInfo.Init;
-			Cpu.A = song;
-			Cpu.X = 0x00;
-			Cpu.Y = 0x00;
-			Cpu.S = 0xff;
-			break;
-#if !ASAP_ONLY_SAP
-		case ASAPModuleType.Dlt:
-			Do6502Init(ModuleInfo.Player + 0x100, 0x00, 0x00, ModuleInfo.SongPos[song]);
-			break;
-		case ASAPModuleType.Mpt:
-			Do6502Init(ModuleInfo.Player, 0x00, ModuleInfo.Music >> 8, ModuleInfo.Music);
-			Do6502Init(ModuleInfo.Player, 0x02, ModuleInfo.SongPos[song], 0);
-			break;
-		case ASAPModuleType.Rmt:
-			Do6502Init(ModuleInfo.Player, ModuleInfo.SongPos[song], ModuleInfo.Music, ModuleInfo.Music >> 8);
-			break;
-		case ASAPModuleType.Tmc:
-		case ASAPModuleType.Tm2:
-			Do6502Init(ModuleInfo.Player, 0x70, ModuleInfo.Music >> 8, ModuleInfo.Music);
-			Do6502Init(ModuleInfo.Player, 0x00, song, 0);
-			TmcPerFrameCounter = 1;
-			break;
-		case ASAPModuleType.Fc:
-			Do6502Init(ModuleInfo.Player, song, 0, 0);
-			break;
-#if EXPERIMENTAL_XEX
-		case ASAPModuleType.Xex:
-			Cpu.Pc = ASAPInfo.GetWord(Memory, 0x2e0);
-			Cpu.A = song;
-			Cpu.X = 0x00;
-			Cpu.Y = 0x00;
-			Cpu.S = 0xff;
-			break;
-#endif
-#endif
-		}
-		MutePokeyChannels(0);
-		NextPlayerCycle = 0;
-	}
-
-	/// Returns current playback position in blocks.
-	/// A block is one sample or a pair of samples for stereo.
-	public int GetBlocksPlayed()
-	{
-		return BlocksPlayed;
-	}
-
-	/// Returns current playback position in milliseconds.
-	public int GetPosition()
-	{
-		return BlocksPlayed * 10 / (SampleRate / 100);
-	}
-
-	static int MillisecondsToBlocks(int milliseconds)
-	{
-		return milliseconds * (SampleRate / 100) / 10;
-	}
-
-	/// Changes the playback position.
-	public void SeekSample(
-		/// The requested absolute position in samples (always 44100 per second, even in stereo).
-		int block)
-	{
-		if (block < BlocksPlayed)
-			PlaySong(CurrentSong, CurrentDuration);
-		while (BlocksPlayed + Pokeys.ReadySamplesEnd < block) {
-			BlocksPlayed += Pokeys.ReadySamplesEnd;
-			DoFrame();
-		}
-		Pokeys.ReadySamplesStart = block - BlocksPlayed;
-		BlocksPlayed = block;
-	}
-
-	/// Changes the playback position.
-	public void Seek(
-		/// The requested absolute position in milliseconds.
-		int position)
-	{
-		SeekSample(MillisecondsToBlocks(position));
-	}
-
-	static void PutLittleEndian(byte[] buffer, int offset, int value)
-	{
-		buffer[offset] = value.LowByte;
-		buffer[offset + 1] = (value >> 8).LowByte;
-		buffer[offset + 2] = (value >> 16).LowByte;
-		buffer[offset + 3] = (value >> 24).LowByte;
-	}
-
-	macro FOUR_CC(s) ( s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24) )
-
-	static void PutLittleEndians(byte[] buffer, int offset, int value1, int value2)
-	{
-		PutLittleEndian(buffer, offset, value1);
-		PutLittleEndian(buffer, offset + 4, value2);
-	}
-
-	static int PutWavMetadata(byte[] buffer, int offset, int fourCC, string value)
-	{
-		int len = value.Length;
-		if (len > 0) {
-			// include terminator and round up to the nearest word
-			PutLittleEndians(buffer, offset, fourCC, (len | 1) + 1);
-			offset += 8;
-			for (int i = 0; i < len; i++)
-				buffer[offset++] = value[i];
-			buffer[offset++] = 0;
-			if ((len & 1) == 0)
-				buffer[offset++] = 0;
-		}
-		return offset;
-	}
-
-	/// Fills leading bytes of the specified buffer with WAV file header.
-	/// Returns the number of changed bytes.
-	public int GetWavHeader(
-		/// The destination buffer.
-		byte[] buffer,
-		/// Format of samples.
-		ASAPSampleFormat format,
-		/// Include metadata (title, author, date).
-		bool metadata)
-	{
-		int use16bit = format != ASAPSampleFormat.U8 ? 1 : 0;
-		int blockSize = ModuleInfo.Channels << use16bit;
-		int bytesPerSecond = SampleRate * blockSize;
-		int totalBlocks = MillisecondsToBlocks(CurrentDuration);
-		int nBytes = (totalBlocks - BlocksPlayed) * blockSize;
-		PutLittleEndian(buffer, 8, FOUR_CC("WAVE"));
-		PutLittleEndians(buffer, 12, FOUR_CC("fmt "), 16);
-		buffer[20] = 1;
-		buffer[21] = 0;
-		buffer[22] = ModuleInfo.Channels;
-		buffer[23] = 0;
-		PutLittleEndians(buffer, 24, SampleRate, bytesPerSecond);
-		buffer[32] = blockSize;
-		buffer[33] = 0;
-		buffer[34] = 8 << use16bit;
-		buffer[35] = 0;
-		int i = 36;
-		if (metadata) {
-			int year = ModuleInfo.GetYear();
-			if (ModuleInfo.Title.Length > 0 || ModuleInfo.Author.Length > 0 || year > 0) {
-				PutLittleEndian(buffer, 44, FOUR_CC("INFO"));
-				i = PutWavMetadata(buffer, 48, FOUR_CC("INAM"), ModuleInfo.Title);
-				i = PutWavMetadata(buffer, i, FOUR_CC("IART"), ModuleInfo.Author);
-				if (year > 0) {
-					PutLittleEndians(buffer, i, FOUR_CC("ICRD"), 6);
-					for (int j = 3; j >= 0; j--) {
-						buffer[i + 8 + j] = '0' + year % 10;
-						year /= 10;
-					}
-					buffer[i + 12] =  0;
-					buffer[i + 13] =  0;
-					i += 14;
-				}
-				PutLittleEndians(buffer, 36, FOUR_CC("LIST"), i - 44);
-			}
-		}
-		PutLittleEndians(buffer, 0, FOUR_CC("RIFF"), i + nBytes);
-		PutLittleEndians(buffer, i, FOUR_CC("data"), nBytes);
-		return i + 8;
-	}
-
-	int GenerateAt(byte[] buffer, int bufferOffset, int bufferLen, ASAPSampleFormat format)
-	{
-		if (SilenceCycles > 0 && SilenceCyclesCounter <= 0)
-			return 0;
-		int blockShift =
-#if FLASH
-			0;
-#else
-			(ModuleInfo.Channels - 1) + (format != ASAPSampleFormat.U8 ? 1 : 0);
-#endif
-		int bufferBlocks = bufferLen >> blockShift;
-		if (CurrentDuration > 0) {
-			int totalBlocks = MillisecondsToBlocks(CurrentDuration);
-			if (bufferBlocks > totalBlocks - BlocksPlayed)
-				bufferBlocks = totalBlocks - BlocksPlayed;
-		}
-		int block = 0;
-		for (;;) {
-			int blocks = Pokeys.Generate(buffer, bufferOffset + (block << blockShift), bufferBlocks - block, format);
-			BlocksPlayed += blocks;
-			block += blocks;
-			if (block >= bufferBlocks)
-				break;
-			int cycles = DoFrame();
-			if (SilenceCycles > 0) {
-				if (Pokeys.IsSilent()) {
-					SilenceCyclesCounter -= cycles;
-					if (SilenceCyclesCounter <= 0)
-						break;
-				}
-				else
-					SilenceCyclesCounter = SilenceCycles;
-			}
-		}
-		return block << blockShift;
-	}
-
-	/// Fills the specified buffer with generated samples.
-	public int Generate(
-		/// The destination buffer.
-		byte[] buffer,
-		/// Number of bytes to fill.
-		int bufferLen,
-		/// Format of samples.
-		ASAPSampleFormat format)
-	{
-		return GenerateAt(buffer, 0, bufferLen, format);
-	}
-
-	/// Returns POKEY channel volume - an integer between 0 and 15.
-	public int GetPokeyChannelVolume(
-		/// POKEY channel number (from 0 to 7).
-		int channel)
-	{
-		switch (channel) {
-		case 0: return Pokeys.BasePokey.Audc1 & 0xf;
-		case 1: return Pokeys.BasePokey.Audc2 & 0xf;
-		case 2: return Pokeys.BasePokey.Audc3 & 0xf;
-		case 3: return Pokeys.BasePokey.Audc4 & 0xf;
-		case 4: return Pokeys.ExtraPokey.Audc1 & 0xf;
-		case 5: return Pokeys.ExtraPokey.Audc2 & 0xf;
-		case 6: return Pokeys.ExtraPokey.Audc3 & 0xf;
-		case 7: return Pokeys.ExtraPokey.Audc4 & 0xf;
-		default: return 0;
-		}
-	}
-}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapconv and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapconv differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapconv.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapconv.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapconv.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapconv.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,626 +0,0 @@
-/*
- * asapconv.c - converter of ASAP-supported formats
- *
- * Copyright (C) 2005-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#ifdef _WIN32
-#include <fcntl.h>
-#ifdef _MSC_VER
-#define strcasecmp _stricmp
-#include <io.h>
-#endif
-#endif
-
-#ifdef HAVE_LIBMP3LAME
-#define SAMPLE_FORMATS "WAV, RAW or MP3"
-#ifndef HAVE_LIBMP3LAME_DLL
-#include <lame.h>
-#endif
-#else
-#define SAMPLE_FORMATS "WAV or RAW"
-#endif
-
-#include "asap.h"
-
-static const char *output_arg = NULL;
-static int song = -1;
-static ASAPSampleFormat sample_format = ASAPSampleFormat_S16_L_E;
-static int duration = -1;
-static int mute_mask = 0;
-static const char *tag_author = NULL;
-static const char *tag_name = NULL;
-static const char *tag_date = NULL;
-static cibool tag = FALSE;
-static int music_address = -1;
-static char output_file[FILENAME_MAX];
-
-static void print_help(void)
-{
-	printf(
-		"Usage: asapconv [OPTIONS] INPUTFILE...\n"
-		"Each INPUTFILE must be in a supported format:\n"
-		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n"
-		"Output EXT must be one of the above or XEX, " SAMPLE_FORMATS ".\n"
-		"Options:\n"
-		"-o FILE.EXT --output=FILE.EXT  Write to the specified file\n"
-		"-o .EXT     --output=.EXT      Use input file path and name\n"
-		"-o DIR/.EXT --output=DIR/.EXT  Write to the specified directory\n"
-		"-o -.EXT    --output=-.EXT     Write to standard output\n"
-		"-a \"TEXT\"   --author=\"TEXT\"    Set author name\n"
-		"-n \"TEXT\"   --name=\"TEXT\"      Set music name\n"
-		"-d \"TEXT\"   --date=\"TEXT\"      Set music creation date (DD/MM/YYYY format)\n"
-		"-h          --help             Display this information\n"
-		"-v          --version          Display version information\n"
-		"In FILE, DIR and EXT you may use the following placeholders:\n"
-		"%%a                             Music author\n"
-		"%%n                             Music name\n"
-		"%%d                             Music creation date\n"
-		"%%e                             Original extension (e.g. \"cmc\")\n"
-		"Options for " SAMPLE_FORMATS " output:\n"
-		"-s SONG     --song=SONG        Select subsong number (zero-based)\n"
-		"-t TIME     --time=TIME        Set output length (MM:SS format)\n"
-		"-m CHANNELS --mute=CHANNELS    Mute POKEY channels (1-8)\n"
-#ifdef HAVE_LIBMP3LAME
-		"Options for WAV or RAW output:\n"
-#endif
-		"-b          --byte-samples     Output 8-bit samples\n"
-		"-w          --word-samples     Output 16-bit samples (default)\n"
-		"Options for XEX, WAV "
-#ifdef HAVE_LIBMP3LAME
-		                "or MP3 "
-#endif
-		                       "output:\n"
-		"            --tag              Include metadata in the output file\n"
-		"Options for SAP output:\n"
-		"-s SONG     --song=SONG        Select subsong to set length of\n"
-		"-t TIME     --time=TIME        Set subsong length (MM:SS format)\n"
-		"Options for native modules (output format same as input format):\n"
-		"            --address=HEXNUM   Relocate music to the given address\n"
-	);
-}
-
-static void fatal_error(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	fprintf(stderr, "asapconv: ");
-	vfprintf(stderr, format, args);
-	fputc('\n', stderr);
-	va_end(args);
-	exit(1);
-}
-
-static void set_song(const char *s)
-{
-	song = 0;
-	do {
-		if (*s < '0' || *s > '9')
-			fatal_error("subsong number must be an integer");
-		song = 10 * song + *s++ - '0';
-		if (song >= ASAPInfo_MAX_SONGS)
-			fatal_error("maximum subsong number is %d", ASAPInfo_MAX_SONGS - 1);
-	} while (*s != '\0');
-}
-
-static void set_time(const char *s)
-{
-	duration = ASAPInfo_ParseDuration(s);
-	if (duration <= 0)
-		fatal_error("invalid time format");
-}
-
-static void set_mute_mask(const char *s)
-{
-	int mask = 0;
-	while (*s != '\0') {
-		if (*s >= '1' && *s <= '8')
-			mask |= 1 << (*s - '1');
-		s++;
-	}
-	mute_mask = mask;
-}
-
-static void set_music_address(const char *s)
-{
-	int address = 0;
-	if (s[0] == '0' && s[1] == 'x')
-		s += 2;
-	else if (s[0] == '$')
-		s++;
-	do {
-		int digit = *s++;
-		if (digit >= '0' && digit <= '9')
-			digit -= '0';
-		else if (digit >= 'A' && digit <= 'F')
-			digit -= 'A' - 10;
-		else if (digit >= 'a' && digit <= 'f')
-			digit -= 'a' - 10;
-		else
-			fatal_error("invalid hex number");
-		address = (address << 4) + digit;
-		if (address > 0xffff)
-			fatal_error("address must be 16-bit");
-	} while (*s != '\0');
-	music_address = address;
-}
-
-static void apply_tags(const char *input_file, ASAPInfo *info)
-{
-	if (tag_author != NULL) {
-		if (!ASAPInfo_SetAuthor(info, tag_author))
-			fatal_error("invalid author");
-	}
-	if (tag_name != NULL) {
-		if (!ASAPInfo_SetTitle(info, tag_name))
-			fatal_error("invalid music name");
-		tag_name = NULL;
-	}
-	if (tag_date != NULL) {
-		if (!ASAPInfo_SetDate(info, tag_date))
-			fatal_error("invalid date");
-	}
-
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(info);
-	else if (song >= ASAPInfo_GetSongs(info)) {
-		fatal_error("you have requested subsong %d ...\n"
-			"... but %s contains only %d subsongs",
-			song, input_file, ASAPInfo_GetSongs(info));
-	}
-}
-
-static ASAP *load_module(const char *input_file, const unsigned char *module, int module_len)
-{
-	ASAP *asap = ASAP_New();
-	ASAPInfo *info;
-	if (asap == NULL)
-		fatal_error("out of memory");
-	if (!ASAP_Load(asap, input_file, module, module_len))
-		fatal_error("%s: unsupported file", input_file);
-	info = (ASAPInfo *) ASAP_GetInfo(asap); /* FIXME: avoid cast */
-	apply_tags(input_file, info);
-	if (duration < 0) {
-		duration = ASAPInfo_GetDuration(info, song);
-		if (duration < 0)
-			duration = 180 * 1000;
-	}
-	if (!ASAP_PlaySong(asap, song, duration))
-		fatal_error("%s: PlaySong failed", input_file);
-	ASAP_MutePokeyChannels(asap, mute_mask);
-	return asap;
-}
-
-static FILE *open_output_file(const char *input_file, const unsigned char *module, int module_len, const ASAPInfo *info)
-{
-	const char *output_ext = strrchr(output_arg, '.');
-	const char *pattern_ptr;
-	char *output_ptr;
-	FILE *fp;
-	if (output_ext == output_arg) {
-		/* .EXT */
-	}
-	else if (output_ext == output_arg + 1 && output_arg[0] == '-') {
-		/* -.EXT */
-		strcpy(output_file, "stdout");
-#ifdef _WIN32
-		_setmode(_fileno(stdout), _O_BINARY);
-#endif
-		return stdout;
-	}
-	else if (output_ext[-1] == '/' || output_ext[-1] == '\\') {
-		/* DIR/.EXT */
-		const char *p;
-		for (p = input_file; *p != '\0'; p++)
-			if (*p == '/' || *p == '\\')
-				input_file = p + 1;
-	}
-	else {
-		/* FILE.EXT */
-		output_ext = NULL; /* don't insert input_file */
-	}
-
-	output_ptr = output_file;
-	for (pattern_ptr = output_arg; *pattern_ptr != '\0'; pattern_ptr++) {
-		char c;
-		if (pattern_ptr == output_ext) {
-			/* insert input_file without the extension */
-			size_t len = strrchr(input_file, '.') - input_file;
-			if (output_ptr + len >= output_file + sizeof(output_file))
-				fatal_error("filename too long");
-			memcpy(output_ptr, input_file, len);
-			output_ptr += len;
-		}
-		c = *pattern_ptr;
-		if (c == '%') {
-			const char *tag;
-			c = *++pattern_ptr;
-			switch (c) {
-			case 'a':
-				tag = ASAPInfo_GetAuthor(info);
-				break;
-			case 'n':
-				tag = ASAPInfo_GetTitleOrFilename(info);
-				break;
-			case 'd':
-				tag = ASAPInfo_GetDate(info);
-				break;
-			case 'e':
-				tag = ASAPInfo_GetOriginalModuleExt(info, module, module_len);
-				if (tag == NULL)
-					tag = "unknown";
-				break;
-			case '%':
-				tag = "%";
-				break;
-			default:
-				fatal_error("unrecognized %%%c", c);
-				return 0;
-			}
-			while (*tag != '\0') {
-				if (output_ptr >= output_file + sizeof(output_file) - 1)
-					fatal_error("filename too long");
-				c = *tag++;
-				switch (c) {
-				case '<':
-				case '>':
-				case ':':
-				case '/':
-				case '\\':
-				case '|':
-				case '?':
-				case '*':
-					c = '_';
-					break;
-				default:
-					break;
-				}
-				*output_ptr++ = c;
-			}
-		}
-		else {
-			if (output_ptr >= output_file + sizeof(output_file) - 1)
-				fatal_error("filename too long");
-			*output_ptr++ = c;
-		}
-	}
-	*output_ptr = '\0';
-
-	fp = fopen(output_file, "wb");
-	if (fp == NULL)
-		fatal_error("cannot write %s", output_file);
-	return fp;
-}
-
-static void write_output_file(FILE *fp, unsigned char *buffer, int n_bytes)
-{
-	if (fwrite(buffer, 1, n_bytes, fp) != n_bytes) {
-		fclose(fp);
-		fatal_error("error writing to %s", output_file);
-	}
-}
-
-static void close_output_file(FILE *fp)
-{
-	if (fp != stdout) {
-		if (fclose(fp) != 0)
-			fatal_error("error closing %s", output_file);
-	}
-}
-
-static void convert_to_wav(const char *input_file, const unsigned char *module, int module_len, cibool output_header)
-{
-	ASAP *asap = load_module(input_file, module, module_len);
-	FILE *fp = open_output_file(input_file, module, module_len, ASAP_GetInfo(asap));
-	int n_bytes;
-	static unsigned char buffer[8192];
-
-	if (output_header) {
-		n_bytes = ASAP_GetWavHeader(asap, buffer, sample_format, tag);
-		fwrite(buffer, 1, n_bytes, fp);
-	}
-	do {
-		n_bytes = ASAP_Generate(asap, buffer, sizeof(buffer), sample_format);
-		write_output_file(fp, buffer, n_bytes);
-	} while (n_bytes == sizeof(buffer));
-	close_output_file(fp);
-}
-
-#ifdef HAVE_LIBMP3LAME
-
-#ifdef HAVE_LIBMP3LAME_DLL
-
-#include <windows.h>
-
-typedef struct lame_global_struct *lame_global_flags;
-typedef lame_global_flags *(*plame_init)(void);
-typedef int (*plame_set_num_samples)(lame_global_flags *, unsigned long);
-typedef int (*plame_set_in_samplerate)(lame_global_flags *, int);
-typedef int (*plame_set_num_channels)(lame_global_flags *, int);
-typedef int (*plame_init_params)(lame_global_flags *);
-typedef int (*plame_encode_buffer_interleaved)(lame_global_flags *, short int[], int, unsigned char *, int);
-typedef int (*plame_encode_flush)(lame_global_flags *, unsigned char *, int);
-typedef int (*plame_close)(lame_global_flags *);
-typedef int (*pid3tag_init)(lame_global_flags *);
-typedef int (*pid3tag_set_title)(lame_global_flags *, const char *);
-typedef int (*pid3tag_set_artist)(lame_global_flags *, const char *);
-typedef int (*pid3tag_set_year)(lame_global_flags *, const char *);
-typedef int (*pid3tag_set_genre)(lame_global_flags *, const char *);
-#define LAME_OKAY 0
-
-static HMODULE lame_load(void)
-{
-	HMODULE lame_dll = LoadLibrary("libmp3lame.dll");
-	if (lame_dll != NULL)
-		return lame_dll;
-	lame_dll = LoadLibrary("lame_enc.dll");
-	if (lame_dll != NULL)
-		return lame_dll;
-	fatal_error("libmp3lame.dll and lame_enc.dll not found");
-	return NULL;
-}
-
-static FARPROC lame_proc(HMODULE lame_dll, const char *name)
-{
-	FARPROC proc = GetProcAddress(lame_dll, name);
-	if (proc == NULL) {
-		char dll_name[FILENAME_MAX];
-		GetModuleFileName(lame_dll, dll_name, FILENAME_MAX);
-		fatal_error("%s not found in %s", name, dll_name);
-	}
-	return proc;
-}
-
-#define LAME_FUNC(name) p##name name = (p##name) lame_proc(lame_dll, #name)
-
-#endif
-
-static void convert_to_mp3(const char *input_file, const unsigned char *module, int module_len)
-{
-	ASAP *asap = load_module(input_file, module, module_len);
-	const ASAPInfo *info = ASAP_GetInfo(asap);
-	int channels = ASAPInfo_GetChannels(info);
-	FILE *fp;
-	int n_bytes;
-	static unsigned char buffer[8192];
-	lame_global_flags *lame = NULL;
-	static unsigned char mp3buf[4096 * 5 / 4 + 7200];
-	int mp3_bytes;
-
-#ifdef HAVE_LIBMP3LAME_DLL
-	HMODULE lame_dll = lame_load();
-	LAME_FUNC(lame_init);
-	LAME_FUNC(lame_set_num_samples);
-	LAME_FUNC(lame_set_in_samplerate);
-	LAME_FUNC(lame_set_num_channels);
-	LAME_FUNC(lame_init_params);
-	LAME_FUNC(lame_encode_buffer_interleaved);
-	LAME_FUNC(lame_encode_flush);
-	LAME_FUNC(lame_close);
-#endif
-	lame = lame_init();
-	if (lame == NULL)
-		fatal_error("lame_init failed");
-	if (lame_set_num_samples(lame, duration * (ASAP_SAMPLE_RATE / 100) / 10) != LAME_OKAY
-	 || lame_set_in_samplerate(lame, ASAP_SAMPLE_RATE) != LAME_OKAY
-	 || lame_set_num_channels(lame, channels) != LAME_OKAY)
-		fatal_error("lame_set_* failed");
-	if (lame_init_params(lame) != LAME_OKAY)
-		fatal_error("lame_init_params failed");
-	if (tag) {
-#ifdef HAVE_LIBMP3LAME_DLL
-		LAME_FUNC(id3tag_init);
-		LAME_FUNC(id3tag_set_title);
-		LAME_FUNC(id3tag_set_artist);
-		LAME_FUNC(id3tag_set_year);
-		LAME_FUNC(id3tag_set_genre);
-#endif
-		const char *s;
-		int year;
-		id3tag_init(lame);
-		s = ASAPInfo_GetTitle(info);
-		if (s[0] != '\0')
-			id3tag_set_title(lame, s);
-		s = ASAPInfo_GetAuthor(info);
-		if (s[0] != '\0')
-			id3tag_set_artist(lame, s);
-		year = ASAPInfo_GetYear(info);
-		if (year > 0) {
-			char year_string[16];
-			sprintf(year_string, "%d", year);
-			id3tag_set_year(lame, year_string);
-		}
-		id3tag_set_genre(lame, "Electronic");
-	}
-	fp = open_output_file(input_file, module, module_len, info);
-	do {
-		static short pcm[8192];
-		int i;
-		short *p = pcm;
-		n_bytes = ASAP_Generate(asap, buffer, sizeof(buffer), ASAPSampleFormat_S16_L_E);
-		for (i = 0; i < n_bytes; i += 2) {
-			*p++ = buffer[i] + (buffer[i + 1] << 8);
-			if (channels == 1)
-				p++;
-		}
-		mp3_bytes = lame_encode_buffer_interleaved(lame, pcm, n_bytes >> channels, mp3buf, sizeof(mp3buf));
-		if (mp3_bytes < 0)
-			fatal_error("lame_encode_buffer_interleaved failed");
-		write_output_file(fp, mp3buf, mp3_bytes);
-	} while (n_bytes == sizeof(buffer));
-	mp3_bytes = lame_encode_flush(lame, mp3buf, sizeof(mp3buf));
-	if (mp3_bytes < 0)
-		fatal_error("lame_encode_flush failed");
-	write_output_file(fp, mp3buf, mp3_bytes);
-	lame_close(lame);
-	close_output_file(fp);
-}
-
-#endif /* HAVE_LIBMP3LAME */
-
-static void write_byte(void *obj, int data)
-{
-	putc(data, (FILE *) obj);
-}
-
-static void convert_to_module(const char *input_file, const unsigned char *module, int module_len, const char *output_ext)
-{
-	const char *input_ext;
-	ASAPInfo *info;
-	FILE *fp;
-	ByteWriter bw;
-
-	input_ext = strrchr(input_file, '.');
-	if (input_ext == NULL)
-		fatal_error("%s: missing extension", input_file);
-	input_ext++;
-	info = ASAPInfo_New();
-	if (info == NULL)
-		fatal_error("out of memory");
-	if (!ASAPInfo_Load(info, input_file, module, module_len))
-		fatal_error("%s: unsupported file", input_file);
-	apply_tags(input_file, info);
-	if (duration >= 0)
-		ASAPInfo_SetDuration(info, song, duration);
-	if (music_address >= 0)
-		ASAPInfo_SetMusicAddress(info, music_address);
-
-	fp = open_output_file(input_file, module, module_len, info);
-	bw.obj = fp;
-	bw.func = write_byte;
-	/* FIXME: stdout */
-	if (!ASAPWriter_Write(output_file, bw, info, module, module_len, tag)) {
-		if (fp != stdout) {
-			fclose(fp);
-			remove(output_file); /* "unlink" is less portable */
-		}
-		fatal_error("%s: conversion error", input_file);
-	}
-	close_output_file(fp);
-}
-
-static void process_file(const char *input_file)
-{
-	FILE *fp;
-	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	const char *output_ext;
-
-	if (output_arg == NULL)
-		fatal_error("the -o/--output option is mandatory");
-	fp = fopen(input_file, "rb");
-	if (fp == NULL)
-		fatal_error("cannot open %s", input_file);
-	module_len = fread(module, 1, sizeof(module), fp);
-	fclose(fp);
-
-	output_ext = strrchr(output_arg, '.');
-	if (output_ext == NULL)
-		fatal_error("missing .EXT in -o/--output");
-	output_ext++;
-	if (strcasecmp(output_ext, "wav") == 0)
-		convert_to_wav(input_file, module, module_len, TRUE);
-	else if (strcasecmp(output_ext, "raw") == 0)
-		convert_to_wav(input_file, module, module_len, FALSE);
-	else if (strcasecmp(output_ext, "mp3") == 0) {
-#ifdef HAVE_LIBMP3LAME
-		convert_to_mp3(input_file, module, module_len);
-#else
-		fatal_error("this build of asapconv doesn't support MP3");
-#endif
-	}
-	else
-		convert_to_module(input_file, module, module_len, output_ext);
-
-	song = -1;
-	duration = -1;
-}
-
-int main(int argc, char *argv[])
-{
-	const char *options_error = "no input files";
-	int i;
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
-		if (arg[0] != '-') {
-			process_file(arg);
-			options_error = NULL;
-			continue;
-		}
-		options_error = "options must be specified before the input file";
-#define is_opt(c)  (arg[1] == c && arg[2] == '\0')
-		if (is_opt('o'))
-			output_arg = argv[++i];
-		else if (strncmp(arg, "--output=", 9) == 0)
-			output_arg = arg + 9;
-		else if (is_opt('s'))
-			set_song(argv[++i]);
-		else if (strncmp(arg, "--song=", 7) == 0)
-			set_song(arg + 7);
-		else if (is_opt('t'))
-			set_time(argv[++i]);
-		else if (strncmp(arg, "--time=", 7) == 0)
-			set_time(arg + 7);
-		else if (is_opt('b') || strcmp(arg, "--byte-samples") == 0)
-			sample_format = ASAPSampleFormat_U8;
-		else if (is_opt('w') || strcmp(arg, "--word-samples") == 0)
-			sample_format = ASAPSampleFormat_S16_L_E;
-		else if (is_opt('m'))
-			set_mute_mask(argv[++i]);
-		else if (strncmp(arg, "--mute=", 7) == 0)
-			set_mute_mask(arg + 7);
-		else if (is_opt('a'))
-			tag_author = argv[++i];
-		else if (strncmp(arg, "--author=", 9) == 0)
-			tag_author = arg + 9;
-		else if (is_opt('n'))
-			tag_name = argv[++i];
-		else if (strncmp(arg, "--name=", 7) == 0)
-			tag_name = arg + 7;
-		else if (is_opt('d'))
-			tag_date = argv[++i];
-		else if (strncmp(arg, "--date=", 7) == 0)
-			tag_date = arg + 7;
-		else if (strcmp(arg, "--tag") == 0)
-			tag = TRUE;
-		else if (strncmp(arg, "--address=", 10) == 0)
-			set_music_address(arg + 10);
-		else if (is_opt('h') || strcmp(arg, "--help") == 0) {
-			print_help();
-			options_error = NULL;
-		}
-		else if (is_opt('v') || strcmp(arg, "--version") == 0) {
-			printf("asapconv " ASAPInfo_VERSION "\n");
-			options_error = NULL;
-		}
-		else
-			fatal_error("unknown option: %s", arg);
-	}
-	if (options_error != NULL) {
-		fprintf(stderr, "asapconv: %s\n", options_error);
-		print_help();
-		return 1;
-	}
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,429 +0,0 @@
-/* Generated automatically with "cito". Do not edit. */
-#ifndef _ASAP_H_
-#define _ASAP_H_
-typedef int cibool;
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef struct ASAP ASAP;
-typedef struct ASAPInfo ASAPInfo;
-
-/**
- * Format of output samples.
- */
-typedef enum {
-	/**
-	 * Unsigned 8-bit.
-	 */
-	ASAPSampleFormat_U8,
-	/**
-	 * Signed 16-bit little-endian.
-	 */
-	ASAPSampleFormat_S16_L_E,
-	/**
-	 * Signed 16-bit big-endian.
-	 */
-	ASAPSampleFormat_S16_B_E
-}
-ASAPSampleFormat;
-
-typedef struct 
-{
-	void *obj;
-	void (*func)(void *obj, int data);
-}
-ByteWriter;
-
-typedef struct 
-{
-	void *obj;
-	void (*func)(void *obj, const char *s);
-}
-StringConsumer;
-
-ASAP *ASAP_New(void);
-void ASAP_Delete(ASAP *self);
-
-/**
- * Enables silence detection.
- * Causes playback to stop after the specified period of silence.
- * @param seconds Length of silence which ends playback. Zero disables silence detection.
- */
-void ASAP_DetectSilence(ASAP *self, int seconds);
-
-/**
- * Fills the specified buffer with generated samples.
- * @param buffer The destination buffer.
- * @param bufferLen Number of bytes to fill.
- * @param format Format of samples.
- */
-int ASAP_Generate(ASAP *self, unsigned char *buffer, int bufferLen, ASAPSampleFormat format);
-
-/**
- * Returns current playback position in blocks.
- * A block is one sample or a pair of samples for stereo.
- */
-int ASAP_GetBlocksPlayed(ASAP const *self);
-
-/**
- * Returns information about the loaded module.
- */
-ASAPInfo const *ASAP_GetInfo(ASAP const *self);
-
-/**
- * Returns POKEY channel volume - an integer between 0 and 15.
- * @param channel POKEY channel number (from 0 to 7).
- */
-int ASAP_GetPokeyChannelVolume(ASAP const *self, int channel);
-
-/**
- * Returns current playback position in milliseconds.
- */
-int ASAP_GetPosition(ASAP const *self);
-
-/**
- * Fills leading bytes of the specified buffer with WAV file header.
- * Returns the number of changed bytes.
- * @param buffer The destination buffer.
- * @param format Format of samples.
- * @param metadata Include metadata (title, author, date).
- */
-int ASAP_GetWavHeader(ASAP const *self, unsigned char *buffer, ASAPSampleFormat format, cibool metadata);
-
-/**
- * Loads music data ("module").
- * @param filename Filename, used to determine the format.
- * @param module Contents of the file.
- * @param moduleLen Length of the file.
- */
-cibool ASAP_Load(ASAP *self, const char *filename, unsigned char const *module, int moduleLen);
-
-/**
- * Mutes the selected POKEY channels.
- * @param mask An 8-bit mask which selects POKEY channels to be muted.
- */
-void ASAP_MutePokeyChannels(ASAP *self, int mask);
-
-/**
- * Prepares playback of the specified song of the loaded module.
- * @param song Zero-based song index.
- * @param duration Playback time in milliseconds, -1 means infinity.
- */
-cibool ASAP_PlaySong(ASAP *self, int song, int duration);
-
-/**
- * Output sample rate.
- */
-#define ASAP_SAMPLE_RATE  44100
-
-/**
- * Changes the playback position.
- * @param position The requested absolute position in milliseconds.
- */
-cibool ASAP_Seek(ASAP *self, int position);
-
-/**
- * Changes the playback position.
- * @param block The requested absolute position in samples (always 44100 per second, even in stereo).
- */
-cibool ASAP_SeekSample(ASAP *self, int block);
-
-ASAPInfo *ASAPInfo_New(void);
-void ASAPInfo_Delete(ASAPInfo *self);
-
-/**
- * Short license notice.
- * Display after the credits.
- */
-#define ASAPInfo_COPYRIGHT  "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published\nby the Free Software Foundation; either version 2 of the License,\nor (at your option) any later version."
-
-/**
- * Short credits for ASAP.
- */
-#define ASAPInfo_CREDITS  "Another Slight Atari Player (C) 2005-2013 Piotr Fusik\nCMC, MPT, TMC, TM2 players (C) 1994-2005 Marcin Lewandowski\nRMT player (C) 2002-2005 Radek Sterba\nDLT player (C) 2009 Marek Konopka\nCMS player (C) 1999 David Spilka\nFC player (C) 2011 Jerzy Kut\n"
-
-/**
- * Returns author's name.
- * A nickname may be included in parentheses after the real name.
- * Multiple authors are separated with <code>" &amp; "</code>.
- * An empty string means the author is unknown.
- */
-const char *ASAPInfo_GetAuthor(ASAPInfo const *self);
-
-/**
- * Returns 1 for mono or 2 for stereo.
- */
-int ASAPInfo_GetChannels(ASAPInfo const *self);
-
-int ASAPInfo_GetCovoxAddress(ASAPInfo const *self);
-
-/**
- * Returns music creation date.
- * Some of the possible formats are:
- * <ul>
- * <li>YYYY</li>
- * <li>MM/YYYY</li>
- * <li>DD/MM/YYYY</li>
- * <li>YYYY-YYYY</li>
- * </ul>
- * An empty string means the date is unknown.
- */
-const char *ASAPInfo_GetDate(ASAPInfo const *self);
-
-/**
- * Returns day of month of the music creation date.
- * -1 means the day is unknown.
- */
-int ASAPInfo_GetDayOfMonth(ASAPInfo const *self);
-
-/**
- * Returns 0-based index of the "main" song.
- * The specified song should be played by default.
- */
-int ASAPInfo_GetDefaultSong(ASAPInfo const *self);
-
-/**
- * Returns length of the specified song.
- * The length is specified in milliseconds. -1 means the length is indeterminate.
- */
-int ASAPInfo_GetDuration(ASAPInfo const *self, int song);
-
-/**
- * Returns human-readable description of the filename extension.
- * @param ext Filename extension without the leading dot.
- */
-const char *ASAPInfo_GetExtDescription(const char *ext);
-
-int ASAPInfo_GetInitAddress(ASAPInfo const *self);
-
-const char *ASAPInfo_GetInstrumentName(ASAPInfo const *self, unsigned char const *module, int moduleLen, int i);
-
-/**
- * Returns information whether the specified song loops.
- * Returns:
- * <ul>
- * <li><code>true</code> if the song loops</li>
- * <li><code>false</code> if the song stops</li>
- * </ul>
- * 
- */
-cibool ASAPInfo_GetLoop(ASAPInfo const *self, int song);
-
-/**
- * Returns music creation month (1-12).
- * -1 means the month is unknown.
- */
-int ASAPInfo_GetMonth(ASAPInfo const *self);
-
-int ASAPInfo_GetMusicAddress(ASAPInfo const *self);
-
-/**
- * Returns the extension of the original module format.
- * For native modules it simply returns their extension.
- * For the SAP format it attempts to detect the original module format.
- * @param module Contents of the file.
- * @param moduleLen Length of the file.
- */
-const char *ASAPInfo_GetOriginalModuleExt(ASAPInfo const *self, unsigned char const *module, int moduleLen);
-
-int ASAPInfo_GetPlayerAddress(ASAPInfo const *self);
-
-int ASAPInfo_GetPlayerRateHz(ASAPInfo const *self);
-
-int ASAPInfo_GetPlayerRateScanlines(ASAPInfo const *self);
-
-int ASAPInfo_GetSapHeaderLength(ASAPInfo const *self);
-
-/**
- * Returns number of songs in the file.
- */
-int ASAPInfo_GetSongs(ASAPInfo const *self);
-
-/**
- * Returns music title.
- * An empty string means the title is unknown.
- */
-const char *ASAPInfo_GetTitle(ASAPInfo const *self);
-
-/**
- * Returns music title or filename.
- * If title is unknown returns filename without the path or extension.
- */
-const char *ASAPInfo_GetTitleOrFilename(ASAPInfo const *self);
-
-int ASAPInfo_GetTypeLetter(ASAPInfo const *self);
-
-/**
- * Returns music creation year.
- * -1 means the year is unknown.
- */
-int ASAPInfo_GetYear(ASAPInfo const *self);
-
-/**
- * Returns <code>true</code> for NTSC song and <code>false</code> for PAL song.
- */
-cibool ASAPInfo_IsNtsc(ASAPInfo const *self);
-
-/**
- * Checks whether the filename extension represents a module type supported by ASAP.
- * Returns <code>true</code> if the filename extension is supported by ASAP.
- * @param ext Filename extension without the leading dot.
- */
-cibool ASAPInfo_IsOurExt(const char *ext);
-
-/**
- * Checks whether the filename represents a module type supported by ASAP.
- * Returns <code>true</code> if the filename is supported by ASAP.
- * @param filename Filename to check the extension of.
- */
-cibool ASAPInfo_IsOurFile(const char *filename);
-
-/**
- * Loads file information.
- * @param filename Filename, used to determine the format.
- * @param module Contents of the file.
- * @param moduleLen Length of the file.
- */
-cibool ASAPInfo_Load(ASAPInfo *self, const char *filename, unsigned char const *module, int moduleLen);
-
-/**
- * Maximum length of a supported input file.
- * You may assume that files longer than this are not supported by ASAP.
- */
-#define ASAPInfo_MAX_MODULE_LENGTH  65000
-
-/**
- * Maximum number of songs in a file.
- */
-#define ASAPInfo_MAX_SONGS  32
-
-/**
- * Maximum length of text metadata.
- */
-#define ASAPInfo_MAX_TEXT_LENGTH  127
-
-/**
- * Returns the number of milliseconds represented by the given string.
- * @param s Time in the <code>"mm:ss.xxx"</code> format.
- */
-int ASAPInfo_ParseDuration(const char *s);
-
-/**
- * Sets author's name.
- * A nickname may be included in parentheses after the real name.
- * Multiple authors are separated with <code>" &amp; "</code>.
- * An empty string means the author is unknown.
- */
-cibool ASAPInfo_SetAuthor(ASAPInfo *self, const char *value);
-
-/**
- * Sets music creation date.
- * Some of the possible formats are:
- * <ul>
- * <li>YYYY</li>
- * <li>MM/YYYY</li>
- * <li>DD/MM/YYYY</li>
- * <li>YYYY-YYYY</li>
- * </ul>
- * An empty string means the date is unknown.
- */
-cibool ASAPInfo_SetDate(ASAPInfo *self, const char *value);
-
-/**
- * Sets length of the specified song.
- * The length is specified in milliseconds. -1 means the length is indeterminate.
- */
-cibool ASAPInfo_SetDuration(ASAPInfo *self, int song, int duration);
-
-/**
- * Sets information whether the specified song loops.
- * Use:
- * <ul>
- * <li><code>true</code> if the song loops</li>
- * <li><code>false</code> if the song stops</li>
- * </ul>
- * 
- */
-cibool ASAPInfo_SetLoop(ASAPInfo *self, int song, cibool loop);
-
-/**
- * Causes music to be relocated.
- * Use only with <code>ASAPWriter.Write</code>.
- */
-cibool ASAPInfo_SetMusicAddress(ASAPInfo *self, int address);
-
-/**
- * Sets music title.
- * An empty string means the title is unknown.
- */
-cibool ASAPInfo_SetTitle(ASAPInfo *self, const char *value);
-
-/**
- * ASAP version as a string.
- */
-#define ASAPInfo_VERSION  "3.1.5"
-
-/**
- * ASAP version - major part.
- */
-#define ASAPInfo_VERSION_MAJOR  3
-
-/**
- * ASAP version - micro part.
- */
-#define ASAPInfo_VERSION_MICRO  5
-
-/**
- * ASAP version - minor part.
- */
-#define ASAPInfo_VERSION_MINOR  1
-
-/**
- * Years ASAP was created in.
- */
-#define ASAPInfo_YEARS  "2005-2013"
-
-/**
- * Writes text representation of the given duration.
- * Returns the number of bytes written to <code>result</code>.
- * @param result The output buffer.
- * @param value Number of milliseconds.
- */
-int ASAPWriter_DurationToString(unsigned char *result, int value);
-
-/**
- * Enumerates possible file types the given module can be written as.
- * @param output Receives filename extensions without the leading dot.
- * @param info File information.
- * @param module Contents of the file.
- * @param moduleLen Length of the file.
- */
-void ASAPWriter_EnumSaveExts(StringConsumer output, ASAPInfo const *info, unsigned char const *module, int moduleLen);
-
-/**
- * Maximum length of text representation of a duration.
- * Corresponds to the longest format which is <code>"mm:ss.xxx"</code>.
- */
-#define ASAPWriter_MAX_DURATION_LENGTH  9
-
-/**
- * Writes the given module in a possibly different file format.
- * @param targetFilename Output filename, used to determine the format.
- * @param w Receives output file contents.
- * @param info File information got from the source file with data updated for the output file.
- * @param module Contents of the source file.
- * @param moduleLen Length of the source file.
- * @param tag Display information (xex output only).
- */
-cibool ASAPWriter_Write(const char *targetFilename, ByteWriter w, ASAPInfo const *info, unsigned char const *module, int moduleLen, cibool tag);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapinfo.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapinfo.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapinfo.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapinfo.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,1846 +0,0 @@
-// asapinfo.ci - module parser
-//
-// Copyright (C) 2010-2013  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-enum ASAPModuleType
-{
-	SapB,
-	SapC,
-	SapD,
-	SapS,
-	Cmc,
-	Cm3,
-	Cmr,
-	Cms,
-	Dlt,
-	Mpt,
-	Rmt,
-	Tmc,
-	Tm2,
-	Fc
-#if EXPERIMENTAL_XEX
-	// actually it works, but without VBLKI it's practically useless
-	, Xex
-#endif
-}
-
-/// Information about a music file.
-public class ASAPInfo
-{
-	/// ASAP version - major part.
-	public const int VersionMajor = 3;
-	/// ASAP version - minor part.
-	public const int VersionMinor = 1;
-	/// ASAP version - micro part.
-	public const int VersionMicro = 5;
-	/// ASAP version as a string.
-	public const string Version = VersionMajor + "." + VersionMinor + "." + VersionMicro;
-
-	/// Years ASAP was created in.
-	public const string Years = "2005-2013";
-
-	/// Short credits for ASAP.
-	public const string Credits =
-		"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" +
-		"CMS player (C) 1999 David Spilka\n" +
-		"FC player (C) 2011 Jerzy Kut\n";
-
-	/// Short license notice.
-	/// Display after the credits.
-	public const string Copyright =
-		"This program is free software; you can redistribute it and/or modify\n" +
-		"it under the terms of the GNU General Public License as published\n" +
-		"by the Free Software Foundation; either version 2 of the License,\n" +
-		"or (at your option) any later version.";
-
-	/// Maximum length of a supported input file.
-	/// You may assume that files longer than this are not supported by ASAP.
-	public const int MaxModuleLength = 65000;
-
-	/// Maximum length of text metadata.
-	public const int MaxTextLength = 127;
-
-	/// Maximum number of songs in a file.
-	public const int MaxSongs = 32;
-
-	string(MaxTextLength) Filename;
-	string(MaxTextLength) Author;
-	string(MaxTextLength) Title;
-	string(MaxTextLength) Date;
-	int Channels;
-	int Songs;
-	int DefaultSong;
-	int[MaxSongs] Durations;
-	bool[MaxSongs] Loops;
-	bool Ntsc;
-	ASAPModuleType Type;
-	int Fastplay;
-	int Music;
-	int Init;
-	int Player;
-	int CovoxAddr;
-	int HeaderLen;
-	byte[MaxSongs] SongPos;
-
-	static bool IsValidChar(int c)
-	{
-		return c >= ' ' && c <= '|' && c != '`' && c != '{';
-	}
-
-	static void CheckValidChar(int c)
-	{
-		if (!IsValidChar(c))
-			throw "Invalid character";
-	}
-
-	static void CheckValidText(string s)
-	{
-		int n = s.Length;
-		if (n > MaxTextLength)
-			throw "Text too long";
-		for (int i = 0; i < n; i++)
-			CheckValidChar(s[i]);
-	}
-
-	/// 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()
-	{
-		return 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(string value)
-	{
-		CheckValidText(value);
-		Author = value;
-	}
-
-	/// Returns music title.
-	/// An empty string means the title is unknown.
-	public string GetTitle()
-	{
-		return Title;
-	}
-
-	/// Sets music title.
-	/// An empty string means the title is unknown.
-	public void SetTitle(string value)
-	{
-		CheckValidText(value);
-		Title = value;
-	}
-
-	/// Returns music title or filename.
-	/// If title is unknown returns filename without the path or extension.
-	public string GetTitleOrFilename()
-	{
-		return 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()
-	{
-		return 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(string value)
-	{
-		CheckValidText(value);
-		Date = value;
-	}
-
-	bool CheckTwoDateDigits(int i)
-	{
-		int d1 = Date[i];
-		int d2 = Date[i + 1];
-		return d1 >= '0' && d1 <= '9' && d2 >= '0' && d2 <= '9';
-	}
-
-	int CheckDate()
-	{
-		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;
-		}
-	}
-
-	int GetTwoDateDigits(int i)
-	{
-		return (Date[i] - '0') * 10 + Date[i + 1] - '0';
-	}
-
-	/// 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()
-	{
-		return Channels;
-	}
-
-	/// Returns number of songs in the file.
-	public int GetSongs()
-	{
-		return Songs;
-	}
-
-	/// Returns 0-based index of the "main" song.
-	/// The specified song should be played by default.
-	public int GetDefaultSong()
-	{
-		return DefaultSong;
-	}
-
-	/// Returns length of the specified song.
-	/// The length is specified in milliseconds. -1 means the length is indeterminate.
-	public int GetDuration(int song)
-	{
-		return Durations[song];
-	}
-
-	/// Sets length of the specified song.
-	/// The length is specified in milliseconds. -1 means the length is indeterminate.
-	public void SetDuration(int song, int duration)
-	{
-		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(int song)
-	{
-		return Loops[song];
-	}
-
-	/// Sets information whether the specified song loops.
-	/// Use:
-	/// * `true` if the song loops
-	/// * `false` if the song stops
-	public void SetLoop(int song, bool loop)
-	{
-		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()
-	{
-		return Ntsc;
-	}
-
-	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;
-		}
-	}
-
-	public int GetPlayerRateScanlines()
-	{
-		return Fastplay;
-	}
-
-	public int GetPlayerRateHz()
-	{
-		int scanlineClock = Ntsc ? 1789772 / 114 : 1773447 / 114;
-		return (scanlineClock + (Fastplay >> 1)) / Fastplay;
-	}
-
-	public int GetMusicAddress()
-	{
-		return Music;
-	}
-
-	/// Causes music to be relocated.
-	/// Use only with `ASAPWriter.Write`.
-	public void SetMusicAddress(int address)
-	{
-		if (address < 0 || address >= 0xffff)
-			throw "Invalid music address";
-		Music = address;
-	}
-
-	public int GetInitAddress()
-	{
-		return Init;
-	}
-
-	public int GetPlayerAddress()
-	{
-		return Player;
-	}
-
-	public int GetCovoxAddress()
-	{
-		return CovoxAddr;
-	}
-
-	public int GetSapHeaderLength()
-	{
-		return HeaderLen;
-	}
-
-#if C
-	public string GetInstrumentName(byte[] module, int moduleLen, int i)
-	{
-		if (Type != ASAPModuleType.Rmt)
-			return null;
-		for (int offset = GetWord(module, 4) - GetWord(module, 2) + 12; offset < moduleLen; offset++) {
-			// skip title and i instruments
-			if (module[offset - 1] == 0 && --i == -1) {
-				native {
-					return (const char *) module + offset;
-				}
-			}
-		}
-		return null;
-	}
-#endif
-
-	static int GetWord(byte[] array, int i)
-	{
-		return array[i] + (array[i + 1] << 8);
-	}
-
-	void ParseModule(byte[] module, int moduleLen)
-	{
-		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)
-	{
-		Durations[Songs++] = (playerCalls * Fastplay).MulDiv(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)
-	{
-		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)
-	{
-		if (moduleLen != 0x2c06 && moduleLen != 0x2c07)
-			throw "Invalid module length";
-		Type = ASAPModuleType.Dlt;
-		ParseModule(module, moduleLen);
-		if (Music != 0x2000)
-			throw "Unsupported module address";
-		bool[128] seen = false;
-		Songs = 0;
-		for (int pos = 0; pos < 128 && Songs < MaxSongs; pos++) {
-			if (!seen[pos])
-				ParseDltSong(module, seen, pos);
-		}
-		if (Songs == 0)
-			throw "No songs found";
-	}
-
-	void ParseMptSong(byte[] module, bool[] globalSeen, int songLen, int pos)
-	{
-		int addrToOffset = GetWord(module, 2) - 6;
-		int tempo = module[0x1cf];
-		int playerCalls = 0;
-		byte[256] seen = 0;
-		int[4] patternOffset;
-		int[4] blankRows = 0;
-		int[4] blankRowsCounter;
-		while (pos < songLen) {
-			if (seen[pos] != 0) {
-				if (seen[pos] != SeenThisCall)
-					Loops[Songs] = true;
-				break;
-			}
-			seen[pos] = SeenThisCall;
-			globalSeen[pos] = true;
-			int i = module[0x1d0 + pos * 2];
-			if (i == 0xff) {
-				pos = module[0x1d1 + pos * 2];
-				continue;
-			}
-			int ch;
-			for (ch = 3; ch >= 0; ch--) {
-				i = module[0x1c6 + ch] + (module[0x1ca + ch] << 8) - addrToOffset;
-				i = module[i + pos * 2];
-				if (i >= 0x40)
-					break;
-				i <<= 1;
-				i = GetWord(module, 0x46 + i);
-				patternOffset[ch] = i == 0 ? 0 : i - addrToOffset;
-				blankRowsCounter[ch] = 0;
-			}
-			if (ch >= 0)
-				break;
-			for (i = 0; i < songLen; i++)
-				if (seen[i] == SeenThisCall)
-					seen[i] = SeenBefore;
-			for (int patternRows = module[0x1ce]; --patternRows >= 0; ) {
-				for (ch = 3; ch >= 0; ch--) {
-					if (patternOffset[ch] == 0 || --blankRowsCounter[ch] >= 0)
-						continue;
-					for (;;) {
-						i = module[patternOffset[ch]++];
-						if (i < 0x40 || i == 0xfe)
-							break;
-						if (i < 0x80)
-							continue;
-						if (i < 0xc0) {
-							blankRows[ch] = i - 0x80;
-							continue;
-						}
-						if (i < 0xd0)
-							continue;
-						if (i < 0xe0) {
-							tempo = i - 0xcf;
-							continue;
-						}
-						patternRows = 0;
-					}
-					blankRowsCounter[ch] = blankRows[ch];
-				}
-				playerCalls += tempo;
-			}
-			pos++;
-		}
-		if (playerCalls > 0)
-			AddSong(playerCalls);
-	}
-
-	void ParseMpt(byte[] module, int moduleLen)
-	{
-		if (moduleLen < 0x1d0)
-			throw "Module too short";
-		Type = ASAPModuleType.Mpt;
-		ParseModule(module, moduleLen);
-		int track0Addr = GetWord(module, 2) + 0x1ca;
-		if (module[0x1c6] + (module[0x1ca] << 8) != track0Addr)
-			throw "Invalid address of the first track";
-		// Calculate the length of the first track. Address of the second track minus
-		// address of the first track equals the length of the first track in bytes.
-		// Divide by two to get number of track positions.
-		int songLen = (module[0x1c7] + (module[0x1cb] << 8) - track0Addr) >> 1;
-		if (songLen > 0xfe)
-			throw "Song too long";
-		// `globalSeen[i] == true` if the track position `i` has been processed
-		bool[256] globalSeen = false;
-		Songs = 0;
-		for (int pos = 0; pos < songLen && Songs < MaxSongs; pos++) {
-			if (!globalSeen[pos]) {
-				SongPos[Songs] = pos;
-				ParseMptSong(module, globalSeen, songLen, pos);
-			}
-		}
-		if (Songs == 0)
-			throw "No songs found";
-	}
-
-	static int GetRmtInstrumentFrames(byte[] module, int instrument, int volume, int volumeFrame, bool onExtraPokey)
-	{
-		int addrToOffset = GetWord(module, 2) - 6;
-		instrument = GetWord(module, 0xe) - addrToOffset + (instrument << 1);
-		if (module[instrument + 1] == 0)
-			return 0;
-		instrument = GetWord(module, instrument) - addrToOffset;
-		int perFrame = module[0xc];
-		int playerCall = volumeFrame * perFrame;
-		int playerCalls = playerCall;
-		int index = module[instrument] + 1 + playerCall * 3;
-		int indexEnd = module[instrument + 2] + 3;
-		int indexLoop = module[instrument + 3];
-		if (indexLoop >= indexEnd)
-			return 0; // error
-		int volumeSlideDepth = module[instrument + 6];
-		int volumeMin = module[instrument + 7];
-		const byte[] rmtVolumeSilent = { 16, 8, 4, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1 };
-		if (index >= indexEnd)
-			index = (index - indexEnd) % (indexEnd - indexLoop) + indexLoop;
-		else {
-			do {
-				int vol = module[instrument + index];
-				if (onExtraPokey)
-					vol >>= 4;
-				if ((vol & 0xf) >= rmtVolumeSilent[volume])
-					playerCalls = playerCall + 1;
-				playerCall++;
-				index += 3;
-			} while (index < indexEnd);
-		}
-		if (volumeSlideDepth == 0)
-			return playerCalls / perFrame;
-		int volumeSlide = 128;
-		bool silentLoop = false;
-		for (;;) {
-			if (index >= indexEnd) {
-				if (silentLoop)
-					break;
-				silentLoop = true;
-				index = indexLoop;
-			}
-			int vol = module[instrument + index];
-			if (onExtraPokey)
-				vol >>= 4;
-			if ((vol & 0xf) >= rmtVolumeSilent[volume]) {
-				playerCalls = playerCall + 1;
-				silentLoop = false;
-			}
-			playerCall++;
-			index += 3;
-			volumeSlide -= volumeSlideDepth;
-			if (volumeSlide < 0) {
-				volumeSlide += 256;
-				if (--volume <= volumeMin)
-					break;
-			}
-		}
-		return playerCalls / perFrame;
-	}
-
-	void ParseRmtSong(byte[] module, bool[] globalSeen, int songLen, int posShift, int pos)
-	{
-		int addrToOffset = GetWord(module, 2) - 6;
-		int tempo = module[0xb];
-		int frames = 0;
-		int songOffset = GetWord(module, 0x14) - addrToOffset;
-		int patternLoOffset = GetWord(module, 0x10) - addrToOffset;
-		int patternHiOffset = GetWord(module, 0x12) - addrToOffset;
-		byte[256] seen = 0;
-		int[8] patternBegin;
-		int[8] patternOffset;
-		int[8] blankRows;
-		int[8] instrumentNo = 0;
-		int[8] instrumentFrame = 0;
-		int[8] volumeValue = 0;
-		int[8] volumeFrame = 0;
-		while (pos < songLen) {
-			if (seen[pos] != 0) {
-				if (seen[pos] != SeenThisCall)
-					Loops[Songs] = true;
-				break;
-			}
-			seen[pos] = SeenThisCall;
-			globalSeen[pos] = true;
-			if (module[songOffset + (pos << posShift)] == 0xfe) {
-				pos = module[songOffset + (pos << posShift) + 1];
-				continue;
-			}
-			for (int ch = 0; ch < 1 << posShift; ch++) {
-				int p = module[songOffset + (pos << posShift) + ch];
-				if (p == 0xff)
-					blankRows[ch] = 256;
-				else {
-					patternOffset[ch] = patternBegin[ch] = module[patternLoOffset + p]
-						+ (module[patternHiOffset + p] << 8) - addrToOffset;
-					if (patternOffset[ch] < 0)
-						return; // badly ripped alien.rmt
-					blankRows[ch] = 0;
-				}
-			}
-			for (int i = 0; i < songLen; i++)
-				if (seen[i] == SeenThisCall)
-					seen[i] = SeenBefore;
-			for (int patternRows = module[0xa]; --patternRows >= 0; ) {
-				for (int ch = 0; ch < 1 << posShift; ch++) {
-					if (--blankRows[ch] > 0)
-						continue;
-					for (;;) {
-						int i = module[patternOffset[ch]++];
-						if ((i & 0x3f) < 62) {
-							i += module[patternOffset[ch]++] << 8;
-							if ((i & 0x3f) != 61) {
-								instrumentNo[ch] = i >> 10;
-								instrumentFrame[ch] = frames;
-							}
-							volumeValue[ch] = (i >> 6) & 0xf;
-							volumeFrame[ch] = frames;
-							break;
-						}
-						if (i == 62) {
-							blankRows[ch] = module[patternOffset[ch]++];
-							break;
-						}
-						if ((i & 0x3f) == 62) {
-							blankRows[ch] = i >> 6;
-							break;
-						}
-						if ((i & 0xbf) == 63) {
-							tempo = module[patternOffset[ch]++];
-							continue;
-						}
-						if (i == 0xbf) {
-							patternOffset[ch] = patternBegin[ch] + module[patternOffset[ch]];
-							continue;
-						}
-						// assert(i == 0xff);
-						patternRows = -1;
-						break;
-					}
-					if (patternRows < 0)
-						break;
-				}
-				if (patternRows >= 0)
-					frames += tempo;
-			}
-			pos++;
-		}
-		int instrumentFrames = 0;
-		for (int ch = 0; ch < 1 << posShift; ch++) {
-			int frame = instrumentFrame[ch];
-			frame += GetRmtInstrumentFrames(module, instrumentNo[ch], volumeValue[ch], volumeFrame[ch] - frame, ch >= 4);
-			if (instrumentFrames < frame)
-				instrumentFrames = frame;
-		}
-		if (frames > instrumentFrames) {
-			if (frames - instrumentFrames > 100)
-				Loops[Songs] = false;
-			frames = instrumentFrames;
-		}
-		if (frames > 0)
-			AddSong(frames);
-	}
-
-	static bool ValidateRmt(byte[] module, int moduleLen)
-	{
-		if (moduleLen < 0x30)
-			return false;
-		if (module[6] != 'R' || module[7] != 'M' || module[8] != 'T' || module[0xd] != 1)
-			return false;
-		return true;
-	}
-
-	void ParseRmt(byte[] module, int moduleLen)
-	{
-		if (!ValidateRmt(module, moduleLen))
-			throw "Invalid RMT file";
-		int posShift;
-		switch (module[9]) {
-		case '4':
-			posShift = 2;
-			break;
-		case '8':
-			Channels = 2;
-			posShift = 3;
-			break;
-		default:
-			throw "Unsupported number of channels";
-		}
-		int perFrame = module[0xc];
-		if (perFrame < 1 || perFrame > 4)
-			throw "Unsupported player call rate";
-		Type = ASAPModuleType.Rmt;
-		ParseModule(module, moduleLen);
-		int blockLen = GetWord(module, 4) + 1 - Music;
-		int songLen = GetWord(module, 4) + 1 - GetWord(module, 0x14);
-		if (posShift == 3 && (songLen & 4) != 0 && module[6 + blockLen - 4] == 0xfe)
-			songLen += 4;
-		songLen >>= posShift;
-		if (songLen >= 0x100)
-			throw "Song too long";
-		bool[256] globalSeen = false;
-		Songs = 0;
-		for (int pos = 0; pos < songLen && Songs < MaxSongs; pos++) {
-			if (!globalSeen[pos]) {
-				SongPos[Songs] = pos;
-				ParseRmtSong(module, globalSeen, songLen, posShift, pos);
-			}
-		}
-		// must set Fastplay after song durations calculations, so they assume 312
-		Fastplay = 312 / perFrame;
-		Player = 0x600;
-		if (Songs == 0)
-			throw "No songs found";
-		byte[MaxTextLength] title;
-		int titleLen;
-		for (titleLen = 0; titleLen < MaxTextLength && 10 + blockLen + titleLen < moduleLen; titleLen++) {
-			byte c = module[10 + blockLen + titleLen];
-			if (c == 0)
-				break;
-			// RMT only allows entering characters we consider valid, but let's check just in case
-			title[titleLen] = IsValidChar(c) ? c : ' ';
-		}
-		Title = title.ToString(0, titleLen);
-	}
-
-	void ParseTmcSong(byte[] module, int pos)
-	{
-		int addrToOffset = GetWord(module, 2) - 6;
-		int tempo = module[0x24] + 1;
-		int frames = 0;
-		int[8] patternOffset;
-		int[8] blankRows;
-		while (module[0x1a6 + 15 + pos] < 0x80) {
-			for (int ch = 7; ch >= 0; ch--) {
-				int pat = module[0x1a6 + 15 + pos - 2 * ch];
-				patternOffset[ch] = module[0xa6 + pat] + (module[0x126 + pat] << 8) - addrToOffset;
-				blankRows[ch] = 0;
-			}
-			for (int patternRows = 64; --patternRows >= 0; ) {
-				for (int ch = 7; ch >= 0; ch--) {
-					if (--blankRows[ch] >= 0)
-						continue;
-					for (;;) {
-						int i = module[patternOffset[ch]++];
-						if (i < 0x40) {
-							patternOffset[ch]++;
-							break;
-						}
-						if (i == 0x40) {
-							i = module[patternOffset[ch]++];
-							if ((i & 0x7f) == 0)
-								patternRows = 0;
-							else
-								tempo = (i & 0x7f) + 1;
-							if (i >= 0x80)
-								patternOffset[ch]++;
-							break;
-						}
-						if (i < 0x80) {
-							i = module[patternOffset[ch]++] & 0x7f;
-							if (i == 0)
-								patternRows = 0;
-							else
-								tempo = i + 1;
-							patternOffset[ch]++;
-							break;
-						}
-						if (i < 0xc0)
-							continue;
-						blankRows[ch] = i - 0xbf;
-						break;
-					}
-				}
-				frames += tempo;
-			}
-			pos += 16;
-		}
-		if (module[0x1a6 + 14 + pos] < 0x80)
-			Loops[Songs] = true;
-		AddSong(frames);
-	}
-
-	static int ParseTmcTitle(byte[] title, int titleLen, byte[] module, int moduleOffset)
-	{
-		int lastOffset = moduleOffset + 29;
-		while (module[lastOffset] == ' ') {
-			if (--lastOffset < moduleOffset)
-				return titleLen;
-		}
-		if (titleLen > 0) {
-			title[titleLen++] = ' ';
-			title[titleLen++] = '|';
-			title[titleLen++] = ' ';
-		}
-		while (moduleOffset <= lastOffset) {
-			int c = module[moduleOffset++] & 0x7f;
-			switch (c) {
-			case 't' - 96:
-				c = '*';
-				break;
-			// Replace Polish letters with their English equivalents.
-			// This is common practice when Polish letters are unavailable.
-			case 'a' - 96:
-			case 'c' - 96:
-			case 'e' - 96:
-			case 'l' - 96:
-			case 'n' - 96:
-			case 'o' - 96:
-			case 's' - 96:
-				c += 96;
-				break;
-			case 'x' - 96:
-			case 'z' - 96:
-				c = 'z';
-				break;
-			default:
-				if (!IsValidChar(c))
-					c = ' ';
-				break;
-			}
-			title[titleLen++] = c;
-		}
-		return titleLen;
-	}
-
-	void ParseTmc(byte[] module, int moduleLen)
-	{
-		if (moduleLen < 0x1d0)
-			throw "Module too short";
-		Type = ASAPModuleType.Tmc;
-		ParseModule(module, moduleLen);
-		Channels = 2;
-		int i = 0;
-		// find first instrument
-		while (module[0x66 + i] == 0) {
-			if (++i >= 64)
-				throw "No instruments";
-		}
-		int lastPos = (module[0x66 + i] << 8) + module[0x26 + i] - GetWord(module, 2) - 0x1b0;
-		if (0x1b5 + lastPos >= moduleLen)
-			throw "Module too short";
-		// skip trailing jumps
-		do {
-			if (lastPos <= 0)
-				throw "No songs found";
-			lastPos -= 16;
-		} while (module[0x1b5 + lastPos] >= 0x80);
-		Songs = 0;
-		ParseTmcSong(module, 0);
-		for (i = 0; i < lastPos && Songs < MaxSongs; i += 16)
-			if (module[0x1b5 + i] >= 0x80)
-				ParseTmcSong(module, i + 16);
-		// must set fastplay after song durations calculations, so they assume 312
-		i = module[0x25];
-		if (i < 1 || i > 4)
-			throw "Unsupported player call rate";
-		Fastplay = 312 / i;
-		byte[MaxTextLength] title;
-		int titleLen = ParseTmcTitle(title, 0, module, 6);
-		Title = title.ToString(0, titleLen);
-	}
-
-	void ParseTm2Song(byte[] module, int pos)
-	{
-		int addrToOffset = GetWord(module, 2) - 6;
-		int tempo = module[0x24] + 1;
-		int playerCalls = 0;
-		int[8] patternOffset;
-		int[8] blankRows;
-		for (;;) {
-			int patternRows = module[0x386 + 16 + pos];
-			if (patternRows == 0)
-				break;
-			if (patternRows >= 0x80) {
-				Loops[Songs] = true;
-				break;
-			}
-			for (int ch = 7; ch >= 0; ch--) {
-				int pat = module[0x386 + 15 + pos - 2 * ch];
-				patternOffset[ch] = module[0x106 + pat] + (module[0x206 + pat] << 8) - addrToOffset;
-				blankRows[ch] = 0;
-			}
-			while (--patternRows >= 0) {
-				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;
-						}
-						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)
-	{
-		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);
-		}
-		byte[MaxTextLength] title;
-		int titleLen = ParseTmcTitle(title, 0, module, 0x27);
-		titleLen = ParseTmcTitle(title, titleLen, module, 0x47);
-		titleLen = ParseTmcTitle(title, titleLen, module, 0x67);
-		Title = title.ToString(0, titleLen);
-	}
-
-	static int AfterFF(byte[] module, int moduleLen, int currentOffset)
-	{
-		while (currentOffset < moduleLen) {
-			if (module[currentOffset++] == 0xff)
-				return currentOffset;
-		}
-		throw "Module too short";
-	}
-
-	macro FC_TRKCMD(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 (FC_TRKCMD(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)
-	{
-		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 = FC_TRKCMD(n);
-					if (trackCmd != 0xff && patternDelay[n]-- <= 0) { //"<" for junks in track
-						while (trackPos[n] < 0x100) {
-							trackCmd = FC_TRKCMD(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))
-					break;
-				playerCalls += module[2];
-			}
-
-			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);
-		}
-	}
-
-	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 ParseText(byte[] module, int moduleIndex)
-	{
-		if (module[moduleIndex] != '"')
-			throw "Missing quote";
-		if (HasStringAt(module, moduleIndex + 1, "<?>\"\r"))
-			return 0;
-		for (int len = 0; ; len++) {
-			int c = module[moduleIndex + 1 + len];
-			if (c == '"' && module[moduleIndex + 2 + len] == '\r')
-				return len;
-			CheckValidChar(c);
-		}
-	}
-
-	static int ParseDec(byte[] module, int moduleIndex, int maxVal)
-	{
-		if (module[moduleIndex] == '\r')
-			throw "Missing number";
-		for (int r = 0;;) {
-			int c = module[moduleIndex++];
-			if (c == '\r')
-				return r;
-			if (c < '0' || c > '9')
-				throw "Invalid number";
-			r = 10 * r + c - '0';
-			if (r > maxVal)
-				throw "Number too big";
-		}
-	}
-
-	static int ParseHex(byte[] module, int moduleIndex)
-	{
-		if (module[moduleIndex] == '\r')
-			throw "Missing number";
-		for (int r = 0;;) {
-			int c = module[moduleIndex++];
-			if (c == '\r')
-				return r;
-			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";
-		}
-	}
-
-	/// Returns the number of milliseconds represented by the given string.
-	public static int ParseDuration(
-		/// Time in the `"mm:ss.xxx"` format.
-		string s)
-	{
-		int i = 0;
-		int n = s.Length;
-		int d;
-		macro NEED_DIGIT() { if (i >= n) throw "Invalid duration"; }
-		macro PARSE_DIGIT(maxdig) {
-			d = s[i] - '0';
-			if (d < 0 || d > maxdig)
-				throw "Invalid duration";
-			i++;
-		}
-		NEED_DIGIT();
-		PARSE_DIGIT(9);
-		int r = d;
-		if (i < n) {
-			d = s[i] - '0';
-			if (d >= 0 && d <= 9) {
-				i++;
-				r = 10 * r + d;
-			}
-			if (i < n && s[i] == ':') {
-				i++;
-				NEED_DIGIT();
-				PARSE_DIGIT(5);
-				r = (6 * r + d) * 10;
-				NEED_DIGIT();
-				PARSE_DIGIT(9);
-				r += d;
-			}
-		}
-		r *= 1000;
-		if (i >= n) return r;
-		if (s[i] != '.') throw "Invalid duration";
-		i++;
-		NEED_DIGIT();
-		PARSE_DIGIT(9);
-		r += 100 * d;
-		if (i >= n) return r;
-		PARSE_DIGIT(9);
-		r += 10 * d;
-		if (i >= n) return r;
-		PARSE_DIGIT(9);
-		r += d;
-		return r;
-	}
-
-	static bool ValidateSap(byte[] module, int moduleLen)
-	{
-		return moduleLen >= 30 && HasStringAt(module, 0, "SAP\r\n");
-	}
-
-	void ParseSap(byte[] module, int moduleLen)
-	{
-		if (!ValidateSap(module, moduleLen))
-			throw "Invalid SAP file";
-		Fastplay = -1;
-		int type = 0;
-		int moduleIndex = 5;
-		int durationIndex = 0;
-		while (module[moduleIndex] != 0xff) {
-			if (moduleIndex + 8 >= moduleLen)
-				throw "Missing binary part";
-			macro TAG_IS(s)               ( HasStringAt(module, moduleIndex, s) )
-			macro SET_TEXT(v, i) {
-				int len = ParseText(module, moduleIndex + i);
-				if (len > 0)
-					v = module.ToString(moduleIndex + i + 1, len);
-			}
-			macro SET_DEC(v, i, min, max) { v = ParseDec(module, moduleIndex + i, max); if (v < min) throw "Number too small"; }
-			macro SET_HEX(v, i)           { v = ParseHex(module, moduleIndex + i); }
-			if (TAG_IS("AUTHOR ")) {
-				SET_TEXT(Author, 7);
-			}
-			else if (TAG_IS("NAME ")) {
-				SET_TEXT(Title, 5);
-			}
-			else if (TAG_IS("DATE ")) {
-				SET_TEXT(Date, 5);
-			}
-			else if (TAG_IS("SONGS ")) {
-				SET_DEC(Songs, 6, 1, MaxSongs);
-			}
-			else if (TAG_IS("DEFSONG ")) {
-				SET_DEC(DefaultSong, 8, 0, MaxSongs - 1);
-			}
-			else if (TAG_IS("STEREO\r"))
-				Channels = 2;
-			else if (TAG_IS("NTSC\r"))
-				Ntsc = true;
-			else if (TAG_IS("TIME ")) {
-				if (durationIndex >= MaxSongs)
-					throw "Too many TIME tags";
-				moduleIndex += 5;
-				int len;
-				for (len = 0; module[moduleIndex + len] != '\r'; len++) { }
-				if (len > 5 && HasStringAt(module, moduleIndex + len - 5, " LOOP")) {
-					Loops[durationIndex] = true;
-					len -= 5;
-				}
-				if (len > 9)
-					throw "Invalid TIME tag";
-				string(9) s = module.ToString(moduleIndex, len);
-				int duration = ParseDuration(s);
-				Durations[durationIndex++] = duration;
-			}
-			else if (TAG_IS("TYPE "))
-				type = module[moduleIndex + 5];
-			else if (TAG_IS("FASTPLAY ")) {
-				SET_DEC(Fastplay, 9, 1, 32767);
-			}
-			else if (TAG_IS("MUSIC ")) {
-				SET_HEX(Music, 6);
-			}
-			else if (TAG_IS("INIT ")) {
-				SET_HEX(Init, 5);
-			}
-			else if (TAG_IS("PLAYER ")) {
-				SET_HEX(Player, 7);
-			}
-			else if (TAG_IS("COVOX ")) {
-				SET_HEX(CovoxAddr, 6);
-				if (CovoxAddr != 0xd600)
-					throw "COVOX should be D600";
-				Channels = 2;
-			}
-
-			while (module[moduleIndex++] != '\r') {
-				if (moduleIndex >= moduleLen)
-					throw "Malformed SAP header";
-			}
-			if (module[moduleIndex++] != '\n')
-				throw "Malformed SAP header";
-		}
-		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;
-	}
-
-	macro ASAP_EXT(s) ( s.Length >> 1 == 1 ? s[0] + (s[1] << 8) + (s.Length == 3 ? s[2] << 16 : 0) | 0x202020 : 0 )
-
-	static int GetPackedExt(string filename)
-	{
-		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;
-	}
-
-	static bool IsOurPackedExt(int ext)
-	{
-		switch (ext) {
-		case ASAP_EXT("SAP"):
-#if !ASAP_ONLY_SAP
-		case ASAP_EXT("CMC"):
-		case ASAP_EXT("CM3"):
-		case ASAP_EXT("CMR"):
-		case ASAP_EXT("CMS"):
-		case ASAP_EXT("DMC"):
-		case ASAP_EXT("DLT"):
-		case ASAP_EXT("MPT"):
-		case ASAP_EXT("MPD"):
-		case ASAP_EXT("RMT"):
-		case ASAP_EXT("TMC"):
-		case ASAP_EXT("TM8"):
-		case ASAP_EXT("TM2"):
-		case ASAP_EXT("FC"):
-#if EXPERIMENTAL_XEX
-		case ASAP_EXT("XEX"):
-#endif
-#endif
-			return true;
-		default:
-			return false;
-		}
-	}
-
-	/// 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)
-	{
-		return 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)
-	{
-		return IsOurPackedExt(ASAP_EXT(ext));
-	}
-
-	static int GuessPackedExt(byte[] module, int moduleLen)
-	{
-		if (ValidateSap(module, moduleLen))
-			return ASAP_EXT("SAP");
-		if (ValidateFc(module, moduleLen))
-			return ASAP_EXT("FC");
-		if (ValidateRmt(module, moduleLen))
-			return ASAP_EXT("RMT");
-		throw "Unknown format";
-	}
-
-	/// 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)
-	{
-		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 ASAP_EXT("SAP"):
-			ParseSap(module, moduleLen);
-			return;
-#if !ASAP_ONLY_SAP
-		case ASAP_EXT("CMC"):
-			ParseCmc(module, moduleLen, ASAPModuleType.Cmc);
-			return;
-		case ASAP_EXT("CM3"):
-			ParseCmc(module, moduleLen, ASAPModuleType.Cm3);
-			return;
-		case ASAP_EXT("CMR"):
-			ParseCmc(module, moduleLen, ASAPModuleType.Cmr);
-			return;
-		case ASAP_EXT("CMS"):
-			Channels = 2;
-			ParseCmc(module, moduleLen, ASAPModuleType.Cms);
-			return;
-		case ASAP_EXT("DMC"):
-			Fastplay = 156;
-			ParseCmc(module, moduleLen, ASAPModuleType.Cmc);
-			return;
-		case ASAP_EXT("DLT"):
-			ParseDlt(module, moduleLen);
-			return;
-		case ASAP_EXT("MPT"):
-			ParseMpt(module, moduleLen);
-			return;
-		case ASAP_EXT("MPD"):
-			Fastplay = 156;
-			ParseMpt(module, moduleLen);
-			return;
-		case ASAP_EXT("RMT"):
-			ParseRmt(module, moduleLen);
-			return;
-		case ASAP_EXT("TMC"):
-		case ASAP_EXT("TM8"):
-			ParseTmc(module, moduleLen);
-			return;
-		case ASAP_EXT("TM2"):
-			ParseTm2(module, moduleLen);
-			return;
-		case ASAP_EXT("FC"):
-			ParseFc(module, moduleLen);
-			return;
-#if EXPERIMENTAL_XEX
-		case ASAP_EXT("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 !ASAP_ONLY_SAP
-
-	/// Returns human-readable description of the filename extension.
-	public static string GetExtDescription(
-		/// Filename extension without the leading dot.
-		string ext)
-	{
-		switch (ASAP_EXT(ext)) {
-		case ASAP_EXT("SAP"): return "Slight Atari Player";
-		case ASAP_EXT("CMC"): return "Chaos Music Composer";
-		case ASAP_EXT("CM3"): return "CMC \"3/4\"";
-		case ASAP_EXT("CMR"): return "CMC \"Rzog\"";
-		case ASAP_EXT("CMS"): return "Stereo Double CMC";
-		case ASAP_EXT("DMC"): return "DoublePlay CMC";
-		case ASAP_EXT("DLT"): return "Delta Music Composer";
-		case ASAP_EXT("MPT"): return "Music ProTracker";
-		case ASAP_EXT("MPD"): return "MPT DoublePlay";
-		case ASAP_EXT("RMT"): return "Raster Music Tracker";
-		case ASAP_EXT("TMC"):
-		case ASAP_EXT("TM8"): return "Theta Music Composer 1.x";
-		case ASAP_EXT("TM2"): return "Theta Music Composer 2.x";
-		case ASAP_EXT("FC"): return "Future Composer";
-		case ASAP_EXT("XEX"): return "Atari 8-bit executable";
-		default: throw "Unknown extension";
-		}
-	}
-
-	const int RmtInit = 0xc80;
-
-	int GetRmtSapOffset(byte[] module, int moduleLen)
-	{
-		if (Player != 0x3403)
-			return -1;
-		int offset = HeaderLen + GetWord(module, HeaderLen + 4) - GetWord(module, HeaderLen + 2) + 7;
-		if (offset + 6 >= moduleLen || module[offset + 4] != 'R' || module[offset + 5] != 'M' || module[offset + 6] != 'T')
-			return -1;
-		return offset;
-	}
-
-	/// Returns the extension of the original module format.
-	/// For native modules it simply returns their extension.
-	/// For the SAP format it attempts to detect the original module format.
-	public string GetOriginalModuleExt(
-		/// Contents of the file.
-		byte[] module,
-		/// Length of the file.
-		int moduleLen)
-	{
-		switch (Type) {
-		case ASAPModuleType.SapB:
-			if ((Init == 0x3fb || Init == 0x3f9) && Player == 0x503)
-				return "dlt";
-			if (((Init == 0x4f3 || Init == 0x4ef) && Player == 0x503) || (Init == 0xf4f3 && Player == 0xf503))
-				return Fastplay == 156 ? "mpd" : "mpt";
-			if (Init == RmtInit || GetRmtSapOffset(module, moduleLen) > 0)
-				return "rmt";
-			if ((Init == 0x4f5 || Init == 0xf4f5 || Init == 0x4f2)
-			 || ((Init == 0x4e7 || Init == 0xf4e7 || Init == 0x4e4) && Fastplay == 156)
-			 || ((Init == 0x4e5 || Init == 0xf4e5 || Init == 0x4e2) && (Fastplay == 104 || Fastplay == 78)))
-				return "tmc";
-			if ((Init == 0x1080 && Player == 0x503) || (Init == 0x1380 && Player == 0x803))
-				return "tm2";
-			if (Init == 0x400 && Player == 0x403)
-				return "fc";
-			return null;
-		case ASAPModuleType.SapC:
-			if ((Player == 0x500 || Player == 0xf500) && moduleLen >= 1024) {
-				if (Fastplay == 156)
-					return "dmc";
-				if (Channels > 1)
-					return "cms";
-				if (module[moduleLen - 170] == 0x1e)
-					return "cmr";
-				if (module[moduleLen - 909] == 0x30)
-					return "cm3";
-				return "cmc";
-			}
-			return null;
-		case ASAPModuleType.Cmc:
-			return Fastplay == 156 ? "dmc" : "cmc";
-		case ASAPModuleType.Cm3:
-			return "cm3";
-		case ASAPModuleType.Cmr:
-			return "cmr";
-		case ASAPModuleType.Cms:
-			return "cms";
-		case ASAPModuleType.Dlt:
-			return "dlt";
-		case ASAPModuleType.Mpt:
-			return Fastplay == 156 ? "mpd" : "mpt";
-		case ASAPModuleType.Rmt:
-			return "rmt";
-		case ASAPModuleType.Tmc:
-			return "tmc";
-		case ASAPModuleType.Tm2:
-			return "tm2";
-		case ASAPModuleType.Fc:
-			return "fc";
-		default:
-			return null;
-		}
-	}
-
-#endif
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapscan.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapscan.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapscan.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapscan.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,595 +0,0 @@
-/*
- * asapscan.c - Atari 8-bit music analyzer
- *
- * Copyright (C) 2007-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "asap-asapscan.h"
-
-static cibool detect_time = FALSE;
-static int scan_frames;
-static int silence_frames;
-static int loop_check_frames;
-static int loop_min_frames;
-static int frame;
-static unsigned char *registers_dump;
-#define HASH_BITS  8
-static int hash_first[1 << HASH_BITS];
-static int *hash_next;
-static int hash_last[1 << HASH_BITS];
-
-static ASAP *asap;
-static cibool dump = FALSE;
-static cibool fingerprint = FALSE;
-static cibool long_fingerprint = FALSE;
-
-#define FEATURE_CHECK          1
-#define FEATURE_15_KHZ         2
-#define FEATURE_HIPASS_FILTER  4
-#define FEATURE_LOW_OF_16_BIT  8
-#define FEATURE_9_BIT_POLY     16
-#define FEATURE_ULTRASOUND     32
-static int features = 0;
-
-#define CPU_TRACE_PRINT        1
-#define CPU_TRACE_UNOFFICIAL   2
-#define CPU_TRACE_PC_TIME      4
-static int cpu_trace = 0;
-static void trace_cpu(const ASAP *asap, int pc, int a, int x, int y, int s, int nz, int vdi, int c);
-
-static int print_time_at_pc = -1;
-
-static cibool acid = FALSE;
-static int exit_code = 0;
-
-#include "asap-asapscan.c"
-
-#define CYCLES_PER_FRAME (asap->moduleInfo.ntsc ? 262 * 114 : 312 * 114)
-#define MAIN_CLOCK (asap->moduleInfo.ntsc ? 1789772 : 1773447)
-
-static int seconds_to_frames(int seconds)
-{
-	return (int) ((double) seconds * MAIN_CLOCK / CYCLES_PER_FRAME);
-}
-
-static int frames_to_milliseconds(int frames)
-{
-	return (int) ceil(frames * 1000.0 * CYCLES_PER_FRAME / MAIN_CLOCK);
-}
-
-static void print_time(int frames, cibool loop)
-{
-	int duration = frames_to_milliseconds(frames);
-	printf("TIME %02d:%02d.%02d%s\n", duration / 60000, duration / 1000 % 60, duration / 10 % 100, loop ? " LOOP" : "");
-}
-
-static const char cpu_mnemonics[256][10] = {
-	"BRK", "ORA (1,X)", "CIM", "ASO (1,X)", "NOP 1", "ORA 1", "ASL 1", "ASO 1",
-	"PHP", "ORA #1", "ASL", "ANC #1", "NOP 2", "ORA 2", "ASL 2", "ASO 2",
-	"BPL 0", "ORA (1),Y", "CIM", "ASO (1),Y", "NOP 1,X", "ORA 1,X", "ASL 1,X", "ASO 1,X",
-	"CLC", "ORA 2,Y", "NOP !", "ASO 2,Y", "NOP 2,X", "ORA 2,X", "ASL 2,X", "ASO 2,X",
-	"JSR 2", "AND (1,X)", "CIM", "RLA (1,X)", "BIT 1", "AND 1", "ROL 1", "RLA 1",
-	"PLP", "AND #1", "ROL", "ANC #1", "BIT 2", "AND 2", "ROL 2", "RLA 2",
-	"BMI 0", "AND (1),Y", "CIM", "RLA (1),Y", "NOP 1,X", "AND 1,X", "ROL 1,X", "RLA 1,X",
-	"SEC", "AND 2,Y", "NOP !", "RLA 2,Y", "NOP 2,X", "AND 2,X", "ROL 2,X", "RLA 2,X",
-
-	"RTI", "EOR (1,X)", "CIM", "LSE (1,X)", "NOP 1", "EOR 1", "LSR 1", "LSE 1",
-	"PHA", "EOR #1", "LSR", "ALR #1", "JMP 2", "EOR 2", "LSR 2", "LSE 2",
-	"BVC 0", "EOR (1),Y", "CIM", "LSE (1),Y", "NOP 1,X", "EOR 1,X", "LSR 1,X", "LSE 1,X",
-	"CLI", "EOR 2,Y", "NOP !", "LSE 2,Y", "NOP 2,X", "EOR 2,X", "LSR 2,X", "LSE 2,X",
-	"RTS", "ADC (1,X)", "CIM", "RRA (1,X)", "NOP 1", "ADC 1", "ROR 1", "RRA 1",
-	"PLA", "ADC #1", "ROR", "ARR #1", "JMP (2)", "ADC 2", "ROR 2", "RRA 2",
-	"BVS 0", "ADC (1),Y", "CIM", "RRA (1),Y", "NOP 1,X", "ADC 1,X", "ROR 1,X", "RRA 1,X",
-	"SEI", "ADC 2,Y", "NOP !", "RRA 2,Y", "NOP 2,X", "ADC 2,X", "ROR 2,X", "RRA 2,X",
-
-	"NOP #1", "STA (1,X)", "NOP #1", "SAX (1,X)", "STY 1", "STA 1", "STX 1", "SAX 1",
-	"DEY", "NOP #1", "TXA", "ANE #1", "STY 2", "STA 2", "STX 2", "SAX 2",
-	"BCC 0", "STA (1),Y", "CIM", "SHA (1),Y", "STY 1,X", "STA 1,X", "STX 1,Y", "SAX 1,Y",
-	"TYA", "STA 2,Y", "TXS", "SHS 2,Y", "SHY 2,X", "STA 2,X", "SHX 2,Y", "SHA 2,Y",
-	"LDY #1", "LDA (1,X)", "LDX #1", "LAX (1,X)", "LDY 1", "LDA 1", "LDX 1", "LAX 1",
-	"TAY", "LDA #1", "TAX", "ANX #1", "LDY 2", "LDA 2", "LDX 2", "LAX 2",
-	"BCS 0", "LDA (1),Y", "CIM", "LAX (1),Y", "LDY 1,X", "LDA 1,X", "LDX 1,Y", "LAX 1,X",
-	"CLV", "LDA 2,Y", "TSX", "LAS 2,Y", "LDY 2,X", "LDA 2,X", "LDX 2,Y", "LAX 2,Y",
-
-	"CPY #1", "CMP (1,X)", "NOP #1", "DCM (1,X)", "CPY 1", "CMP 1", "DEC 1", "DCM 1",
-	"INY", "CMP #1", "DEX", "SBX #1", "CPY 2", "CMP 2", "DEC 2", "DCM 2",
-	"BNE 0", "CMP (1),Y", "CIM", "DCM (1),Y", "NOP 1,X", "CMP 1,X", "DEC 1,X", "DCM 1,X",
-	"CLD", "CMP 2,Y", "NOP !", "DCM 2,Y", "NOP 2,X", "CMP 2,X", "DEC 2,X", "DCM 2,X",
-
-	"CPX #1", "SBC (1,X)", "NOP #1", "INS (1,X)", "CPX 1", "SBC 1", "INC 1", "INS 1",
-	"INX", "SBC #1", "NOP", "SBC #1 !", "CPX 2", "SBC 2", "INC 2", "INS 2",
-	"BEQ 0", "SBC (1),Y", "CIM", "INS (1),Y", "NOP 1,X", "SBC 1,X", "INC 1,X", "INS 1,X",
-	"SED", "SBC 2,Y", "NOP !", "INS 2,Y", "NOP 2,X", "SBC 2,X", "INC 2,X", "INS 2,X"
-};
-
-#define CPU_OPCODE_UNOFFICIAL  1
-#define CPU_OPCODE_USED        2
-static char cpu_opcodes[256] = {
-	1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
-	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
-	1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1,
-	0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
-	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
-	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1
-};
-
-static void show_instruction(const ASAP *asap, int pc)
-{
-	int addr = pc;
-	int opcode;
-	const char *mnemonic;
-	const char *p;
-
-	opcode = asap->memory[pc++];
-	mnemonic = cpu_mnemonics[opcode];
-	for (p = mnemonic + 3; *p != '\0'; p++) {
-		if (*p == '1') {
-			int value = asap->memory[pc];
-			printf("%04X: %02X %02X     %.*s$%02X%s\n",
-			       addr, opcode, value, (int) (p - mnemonic), mnemonic, value, p + 1);
-			return;
-		}
-		if (*p == '2') {
-			int lo = asap->memory[pc];
-			int hi = asap->memory[pc + 1];
-			printf("%04X: %02X %02X %02X  %.*s$%02X%02X%s\n",
-			       addr, opcode, lo, hi, (int) (p - mnemonic), mnemonic, hi, lo, p + 1);
-			return;
-		}
-		if (*p == '0') {
-			int offset = asap->memory[pc++];
-			int target = (pc + (signed char) offset) & 0xffff;
-			printf("%04X: %02X %02X     %.4s$%04X\n", addr, opcode, offset, mnemonic, target);
-			return;
-		}
-	}
-	printf("%04X: %02X        %s\n", addr, opcode, mnemonic);
-}
-
-static void trace_cpu(const ASAP *asap, int pc, int a, int x, int y, int s, int nz, int vdi, int c)
-{
-	if ((cpu_trace & CPU_TRACE_PRINT) != 0) {
-		printf("%3d %3d A=%02X X=%02X Y=%02X S=%02X P=%c%c*-%c%c%c%c PC=",
-			asap->cycle / 114, asap->cycle % 114, a, x, y, s,
-			nz >= 0x80 ? 'N' : '-', (vdi & 0x40) != 0 ? 'V' : '-', (vdi & 8) != 0 ? 'D' : '-',
-			(vdi & 4) != 0 ? 'I' : '-', (nz & 0xff) == 0 ? 'Z' : '-', c != 0 ? 'C' : '-');
-		show_instruction(asap, pc);
-	}
-	if (pc == print_time_at_pc)
-		print_time(frame, TRUE);
-	if (pc != 0xd200 && pc != 0xd203) /* don't count 0xd2 used by Do6502Init() and Call6502() */
-		cpu_opcodes[asap->memory[pc]] |= CPU_OPCODE_USED;
-}
-
-static void print_unofficial_mnemonic(int opcode)
-{
-	const char *mnemonic = cpu_mnemonics[opcode];
-	const char *p;
-	for (p = mnemonic + 3; *p != '\0'; p++) {
-		if (*p == '1') {
-			printf("%02X: %.*s$xx%s\n", opcode, (int) (p - mnemonic), mnemonic, p + 1);
-			return;
-		}
-		if (*p == '2') {
-			printf("%02X: %.*s$xxxx%s\n", opcode, (int) (p - mnemonic), mnemonic, p + 1);
-			return;
-		}
-		/* there are no undocumented branches ('0') */
-	}
-	printf("%02X: %s\n", opcode, mnemonic);
-}
-
-static void print_help(void)
-{
-	printf(
-		"Usage: asapscan COMMAND [OPTIONS] INPUTFILE\n"
-		"Commands:\n"
-		"-d          Dump POKEY registers\n"
-		"-f          List POKEY features used\n"
-		"-t          Detect silence and loops\n"
-		"-p          Calculate fingerprint\n"
-		"-l          Calculate hash representation (fingerprint is a substring of this)\n"
-		"-c          Dump 6502 trace\n"
-		"-u          List used unofficial 6502 instructions and BRK\n"
-		"-b HEXADDR  Print time the given instruction reached\n"
-		"-a          Run Acid800 test\n"
-		"-v          Display version information\n"
-		"Options:\n"
-		"-s SONG     Process the specified subsong (zero-based)\n"
-	);
-}
-
-static cibool store_pokey(unsigned char *p, Pokey *pokey)
-{
-	cibool is_silence = TRUE;
-#define STORE_CHANNEL(ch) \
-	if ((pokey->audc##ch & 0xf) != 0) { \
-		is_silence = FALSE; \
-		p[ch * 2 - 2] = pokey->audf##ch; \
-		p[ch * 2 - 1] = pokey->audc##ch; \
-	} \
-	else { \
-		p[ch * 2 - 2] = 0; \
-		p[ch * 2 - 1] = 0; \
-	}
-	STORE_CHANNEL(1)
-	STORE_CHANNEL(2)
-	STORE_CHANNEL(3)
-	STORE_CHANNEL(4)
-	p[8] = pokey->audctl;
-	return is_silence;
-}
-
-static cibool store_pokeys(int frame)
-{
-	unsigned char *p = registers_dump + 18 * frame;
-	cibool is_silence = store_pokey(p, &asap->pokeys.basePokey);
-	is_silence &= store_pokey(p + 9, &asap->pokeys.extraPokey);
-	return is_silence;
-}
-
-static cibool has_loop_at(int first_frame, int second_frame)
-{
-	return memcmp(registers_dump + 18 * first_frame, registers_dump + 18 * second_frame, 18 * loop_check_frames) == 0;
-}
-
-static int get_hash(int player_call)
-{
-	int hash = 0;
-	int i;
-	for (i = 1; i < 9; i += 2) {
-		if ((registers_dump[18 * player_call + i] & 0xe0) == 0xe0)
-			registers_dump[18 * player_call + i] &= 0xbf;
-		if ((registers_dump[18 * player_call + i + 9] & 0xe0) == 0xe0)
-			registers_dump[18 * player_call + i + 9] &= 0xbf;
-	}
-	for (i = 0; i < 18; i++)
-		hash += registers_dump[18 * player_call + i];
-	return hash;
-}
-
-static int get_byte_hash(int frame)
-{
-	int res = get_hash(frame);
-	res = (res & 0xff) + (res >> 8);
-	res = (res & 0xff) + (res >> 8);
-	return res;
-}
-
-static void compute_entrophy(int frames)
-{
-	int entrophy_counters[256];
-#define ENTROPHY_LEN 32
-	int emaxvalue = 0;
-	int emaxframe = 0;
-	int evalue = 0;
-	int i;
-	int v;
-
-	for (i = 0; i < 256; i++)
-		entrophy_counters[i] = 0;
-
-	if (long_fingerprint) {
-		for (i = 0; i < frame; i++) {
-			v = get_byte_hash(i);
-			printf("%02x", v);
-		}
-		printf("\n");
-	}
-	else {
-		for (i = 0; i < frames; i++) {
-			v = get_byte_hash(i);
-			if (entrophy_counters[v] == 0)
-				evalue++;
-			entrophy_counters[v]++;
-
-			if (i >= ENTROPHY_LEN) {
-				v = get_byte_hash(i - ENTROPHY_LEN);
-				entrophy_counters[v]--;
-				if (entrophy_counters[v] == 0)
-					evalue--;
-
-				if (emaxvalue < evalue) {
-					emaxvalue = evalue;
-					emaxframe = i - ENTROPHY_LEN;
-				}
-			}
-		}
-
-		for (i = 0; i < ENTROPHY_LEN; i++) {
-			v = get_byte_hash(i + emaxframe);
-			printf("%02x", v);
-		}
-		printf("\n");
-	}
-}
-
-static void print_pokey(const Pokey *pokey)
-{
-	printf(
-		"%02X %02X  %02X %02X  %02X %02X  %02X %02X  %02X",
-		pokey->audf1, pokey->audc1, pokey->audf2, pokey->audc2,
-		pokey->audf3, pokey->audc3, pokey->audf4, pokey->audc4, pokey->audctl
-	);
-}
-
-static cibool is_ultrasound(int period_cycles, int audc)
-{
-	if (period_cycles > 112)
-		return FALSE;
-	if ((audc & 0xf) == 0)
-		return FALSE;
-	audc >>= 4;
-	return audc == 10 || audc == 14;
-}
-
-static void scan_song(int song)
-{
-	int silence_run = 0;
-	int running_hash = 0;
-	int i;
-	if (!ASAP_PlaySong(asap, song, -1)) {
-		fprintf(stderr, "asapscan: PlaySong failed\n");
-		return;
-	}
-	if (acid)
-		scan_frames = seconds_to_frames(ASAPInfo_GetDuration(&asap->moduleInfo, song) / 1000);
-	for (i = 0; i < 1 << HASH_BITS; i++)
-		hash_first[i] = -1;
-	for (frame = 0; frame < scan_frames; frame++) {
-		ASAP_Do6502Frame(asap);
-		if (dump) {
-			printf("%6.2f: ", (double) frame * CYCLES_PER_FRAME / MAIN_CLOCK);
-			print_pokey(&asap->pokeys.basePokey);
-			if (asap->moduleInfo.channels == 2) {
-				printf("  |  ");
-				print_pokey(&asap->pokeys.extraPokey);
-			}
-			printf("\n");
-		}
-		if (features != 0) {
-			int c1 = asap->pokeys.basePokey.audctl;
-			int c2 = asap->pokeys.extraPokey.audctl;
-			if (((c1 | c2) & 1) != 0)
-				features |= FEATURE_15_KHZ;
-			if (((c1 | c2) & 6) != 0)
-				features |= FEATURE_HIPASS_FILTER;
-			if (((c1 & 0x40) != 0 && (asap->pokeys.basePokey.audc1 & 0xf) != 0)
-			|| ((c1 & 0x20) != 0 && (asap->pokeys.basePokey.audc3 & 0xf) != 0))
-				features |= FEATURE_LOW_OF_16_BIT;
-			if (((c1 | c2) & 0x80) != 0)
-				features |= FEATURE_9_BIT_POLY;
-			if (is_ultrasound(asap->pokeys.basePokey.periodCycles1, asap->pokeys.basePokey.audc1)
-			 || is_ultrasound(asap->pokeys.basePokey.periodCycles2, asap->pokeys.basePokey.audc2)
-			 || is_ultrasound(asap->pokeys.basePokey.periodCycles3, asap->pokeys.basePokey.audc3)
-			 || is_ultrasound(asap->pokeys.basePokey.periodCycles4, asap->pokeys.basePokey.audc4))
-				features |= FEATURE_ULTRASOUND;
-		}
-		if (detect_time) {
-			if (store_pokeys(frame)) {
-				silence_run++;
-				if (silence_run >= silence_frames && /* do not trigger at the initial silence */ silence_run < frame) {
-					if (fingerprint)
-						compute_entrophy(frame + 1 - silence_run);
-					else
-						print_time(frame + 1 - silence_run, FALSE);
-					return;
-				}
-			}
-			else
-				silence_run = 0;
-			if (frame >= loop_check_frames) {
-				int first_frame;
-				int second_frame = frame - loop_check_frames;
-				running_hash &= (1 << HASH_BITS) - 1;
-				/* Now running_hash is for the last loop_check_player_calls player calls before player_call. */
-				for (first_frame = hash_first[running_hash]; first_frame >= 0; first_frame = hash_next[first_frame]) {
-					if (has_loop_at(first_frame, second_frame)) {
-						int loop_len = second_frame - first_frame;
-						if (loop_len >= loop_min_frames) {
-							if (fingerprint)
-								compute_entrophy(second_frame);
-							else
-								print_time(second_frame, TRUE);
-							return;
-						}
-						if (loop_len == 1) {
-							/* POKEY registers do not change - probably an ultrasound */
-							if (fingerprint)
-								compute_entrophy(first_frame);
-							else
-								print_time(first_frame, FALSE);
-							return;
-						}
-					}
-				}
-				/* Insert into hashtable. */
-				if (hash_first[running_hash] >= 0)
-					hash_next[hash_last[running_hash]] = second_frame;
-				else
-					hash_first[running_hash] = second_frame;
-				hash_next[second_frame] = -1;
-				hash_last[running_hash] = second_frame;
-				/* Update running_hash. */
-				running_hash -= get_hash(second_frame);
-			}
-			running_hash += get_hash(frame);
-		}
-	}
-	if (detect_time) {
-		if (fingerprint)
-			compute_entrophy(loop_check_frames);
-		else
-			printf("No silence or loop detected in song %d\n", song);
-	}
-	if (acid) {
-#ifdef _WIN32
-		HANDLE so = GetStdHandle(STD_OUTPUT_HANDLE);
-		CONSOLE_SCREEN_BUFFER_INFO csbi;
-		GetConsoleScreenBufferInfo(so, &csbi);
-#define set_color(x) SetConsoleTextAttribute(so, x)
-#else
-#define set_color(x)
-#endif
-		for (i = 0x1000; i <= 0x17ff; i++) {
-			unsigned char c = asap->memory[i];
-			if (c == 0)
-				break;
-			if (memcmp(asap->memory + i, "Pass", 4) == 0)
-				set_color((csbi.wAttributes & ~0xf) | 10);
-			else if (memcmp(asap->memory + i, "FAIL", 4) == 0) {
-				exit_code = 1;
-				set_color((csbi.wAttributes & ~0xf) | 12);
-			}
-			else if (memcmp(asap->memory + i, "Skipped", 7) == 0) {
-				exit_code = 1;
-				set_color((csbi.wAttributes & ~0xf) | 14);
-			}
-			if (c == 0x9b)
-				c = '\n';
-			putchar(c);
-		}
-		if (asap->memory[i - 1] != 0x9b) {
-			set_color((csbi.wAttributes & ~0xf) | 13);
-			printf("NO RESPONSE\n");
-			exit_code = 1;
-		}
-		set_color(csbi.wAttributes);
-	}
-}
-
-int main(int argc, char **argv)
-{
-	int i;
-	const char *input_file = NULL;
-	int song = -1;
-	int scan_seconds = 15 * 60;
-	int silence_seconds = 5;
-	int loop_check_seconds = 3 * 60;
-	int loop_min_seconds = 5;
-	FILE *fp;
-	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-
-	for (i = 1; i < argc; i++) {
-		if (strcmp(argv[i], "-d") == 0)
-			dump = TRUE;
-		else if (strcmp(argv[i], "-p") == 0)
-			detect_time = fingerprint = TRUE;
-		else if (strcmp(argv[i], "-l") == 0)
-			detect_time = fingerprint = long_fingerprint = TRUE;
-		else if (strcmp(argv[i], "-f") == 0)
-			features = FEATURE_CHECK;
-		else if (strcmp(argv[i], "-t") == 0)
-			detect_time = TRUE;
-		else if (strcmp(argv[i], "-c") == 0)
-			cpu_trace |= CPU_TRACE_PRINT;
-		else if (strcmp(argv[i], "-u") == 0)
-			cpu_trace |= CPU_TRACE_UNOFFICIAL;
-		else if (strcmp(argv[i], "-b") == 0) {
-			print_time_at_pc = (int) strtol(argv[++i], NULL, 16);
-			cpu_trace |= CPU_TRACE_PC_TIME;
-		}
-		else if (strcmp(argv[i], "-s") == 0)
-			song = atoi(argv[++i]);
-		else if (strcmp(argv[i], "-a") == 0)
-			acid = TRUE;
-		else if (strcmp(argv[i], "-v") == 0) {
-			printf("asapscan " ASAPInfo_VERSION "\n");
-			return 0;
-		}
-		else {
-			if (input_file != NULL) {
-				print_help();
-				return 1;
-			}
-			input_file = argv[i];
-		}
-	}
-	if (dump + features + detect_time + cpu_trace + acid == 0 || input_file == NULL) {
-		print_help();
-		return 1;
-	}
-	fp = fopen(input_file, "rb");
-	if (fp == NULL) {
-		fprintf(stderr, "asapscan: cannot open %s\n", input_file);
-		return 1;
-	}
-	module_len = fread(module, 1, sizeof(module), fp);
-	fclose(fp);
-	asap = ASAP_New();
-	if (!ASAP_Load(asap, input_file, module, module_len)) {
-		fprintf(stderr, "asapscan: %s: format not supported\n", input_file);
-		return 1;
-	}
-	scan_frames = seconds_to_frames(scan_seconds);
-	silence_frames = seconds_to_frames(silence_seconds);
-	loop_check_frames = seconds_to_frames(loop_check_seconds);
-	loop_min_frames = seconds_to_frames(loop_min_seconds);
-	registers_dump = malloc(scan_frames * 18);
-	hash_next = malloc(scan_frames * sizeof(hash_next[0]));
-	if (registers_dump == NULL || hash_next == NULL) {
-		fprintf(stderr, "asapscan: out of memory\n");
-		return 1;
-	}
-	if (song >= 0)
-		scan_song(song);
-	else
-		for (song = 0; song < asap->moduleInfo.songs; song++)
-			scan_song(song);
-	free(registers_dump);
-	if (features != 0) {
-		if ((features & FEATURE_15_KHZ) != 0)
-			printf("15 kHz clock\n");
-		if ((features & FEATURE_HIPASS_FILTER) != 0)
-			printf("Hi-pass filter\n");
-		if ((features & FEATURE_LOW_OF_16_BIT) != 0)
-			printf("Low byte of 16-bit counter\n");
-		if ((features & FEATURE_9_BIT_POLY) != 0)
-			printf("9-bit poly\n");
-		if ((features & FEATURE_ULTRASOUND) != 0)
-			printf("Ultrasound\n");
-	}
-	if ((cpu_trace & CPU_TRACE_UNOFFICIAL) != 0) {
-		for (i = 0; i < 256; i++) {
-			if (cpu_opcodes[i] == (CPU_OPCODE_UNOFFICIAL | CPU_OPCODE_USED))
-				print_unofficial_mnemonic(i);
-		}
-	}
-	return exit_code;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap-sdl.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap-sdl.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap-sdl.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap-sdl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-/*
- * asap-sdl.c - simple SDL ASAP player
- *
- * Copyright (C) 2010-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <SDL.h>
-
-#include "asap.h"
-
-static int song = -1;
-
-static void print_help(void)
-{
-	printf(
-		"Usage: asap-sdl [OPTIONS] INPUTFILE\n"
-		"INPUTFILE must be in a supported format:\n"
-		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n"
-		"Options:\n"
-		"-s SONG     --song=SONG        Select subsong number (zero-based)\n"
-		"-h          --help             Display this information\n"
-		"-v          --version          Display version information\n"
-	);
-}
-
-static void fatal_error(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	fprintf(stderr, "asap-sdl: ");
-	vfprintf(stderr, format, args);
-	fputc('\n', stderr);
-	va_end(args);
-	exit(1);
-}
-
-static void sdl_error(const char *fun)
-{
-	fatal_error("%s failed: %s", fun, SDL_GetError());
-}
-
-static void set_song(const char *s)
-{
-	song = 0;
-	do {
-		if (*s < '0' || *s > '9')
-			fatal_error("subsong number must be an integer");
-		song = 10 * song + *s++ - '0';
-		if (song >= ASAPInfo_MAX_SONGS)
-			fatal_error("maximum subsong number is %d", ASAPInfo_MAX_SONGS - 1);
-	} while (*s != '\0');
-}
-
-static void print_header(const char *name, const char *value)
-{
-	if (value[0] != '\0')
-		printf("%s: %s\n", name, value);
-}
-
-static void audio_callback(void *userdata, Uint8 *stream, int len)
-{
-	ASAP_Generate((ASAP *) userdata, stream, len, ASAPSampleFormat_S16_L_E);
-}
-
-static void process_file(const char *input_file)
-{
-	FILE *fp;
-	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAP *asap;
-	const ASAPInfo *info;
-	SDL_AudioSpec desired;
-
-	fp = fopen(input_file, "rb");
-	if (fp == NULL)
-		fatal_error("cannot open %s", input_file);
-	module_len = fread(module, 1, sizeof(module), fp);
-	fclose(fp);
-
-	asap = ASAP_New();
-	if (!ASAP_Load(asap, input_file, module, module_len))
-		fatal_error("%s: unsupported file", input_file);
-	info = ASAP_GetInfo(asap);
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(info);
-	if (!ASAP_PlaySong(asap, song, -1))
-		fatal_error("%s: PlaySong failed", input_file);
-	print_header("Name", ASAPInfo_GetTitle(info));
-	print_header("Author", ASAPInfo_GetAuthor(info));
-	print_header("Date", ASAPInfo_GetDate(info));
-
-	if (SDL_Init(SDL_INIT_AUDIO) != 0)
-		sdl_error("SDL_Init");
-	desired.freq = ASAP_SAMPLE_RATE;
-	desired.format = AUDIO_S16LSB;
-	desired.channels = ASAPInfo_GetChannels(info);
-	desired.samples = 4096;
-	desired.callback = audio_callback;
-	desired.userdata = asap;
-	if (SDL_OpenAudio(&desired, NULL) != 0)
-		sdl_error("SDL_OpenAudio");
-	SDL_PauseAudio(0);
-	printf(" playing - press Enter to quit\n");
-	getchar();
-	SDL_Quit();
-}
-
-int main(int argc, char *argv[])
-{
-	const char *options_error = "no input file";
-	int i;
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
-		if (arg[0] != '-') {
-			process_file(arg);
-			options_error = NULL;
-			continue;
-		}
-		options_error = "options must be specified before the input file";
-#define is_opt(c)  (arg[1] == c && arg[2] == '\0')
-		if (is_opt('s'))
-			set_song(argv[++i]);
-		else if (strncmp(arg, "--song=", 7) == 0)
-			set_song(arg + 7);
-		else if (is_opt('h') || strcmp(arg, "--help") == 0) {
-			print_help();
-			options_error = NULL;
-		}
-		else if (is_opt('v') || strcmp(arg, "--version") == 0) {
-			printf("asap-sdl " ASAPInfo_VERSION "\n");
-			options_error = NULL;
-		}
-		else
-			fatal_error("unknown option: %s", arg);
-	}
-	if (options_error != NULL) {
-		fprintf(stderr, "asap-sdl: %s\n", options_error);
-		print_help();
-		return 1;
-	}
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.spec kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.spec
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asap.spec	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asap.spec	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-Name: asap
-Version: 3.1.5
-Release: 1
-Summary: Player of Atari 8-bit music
-License: GPLv2+
-Group: Applications/Multimedia
-Source: http://prdownloads.sourceforge.net/asap/asap-%{version}.tar.gz
-URL: http://asap.sourceforge.net/
-BuildRoot: %{_tmppath}/asap-root
-
-%description
-ASAP is a player of Atari 8-bit music for modern computers.
-It emulates the POKEY sound chip and the 6502 processor.
-ASAP supports the following file formats:
-SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
-
-%package devel
-Summary: Development library providing Atari 8-bit music emulation
-Group: Development/Libraries
-
-%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 gstreamer0.10
-Summary: ASAP plugin for GStreamer 0.10
-Group: Applications/Multimedia
-Requires: gstreamer >= 0.10.36
-Requires: gstreamer < 0.11
-BuildRequires: gstreamer-devel
-# 0.10.36 is the first version to properly recognize SAP files. This isn't required for the build.
-
-%description gstreamer0.10
-Provides playback of Atari 8-bit music in the SAP format in GStreamer-based players.
-
-%package vlc
-Summary: ASAP plugin for VLC
-Group: Applications/Multimedia
-Requires: vlc
-BuildRequires: vlc-devel
-
-%description vlc
-Provides playback of Atari 8-bit music in VLC.
-Supports the following file formats: SAP, RMT, FC.
-
-%prep
-%setup -q
-
-%build
-make asapconv libasap.a asap-xmms asap-gstreamer asap-vlc
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install install-xmms install-gstreamer install-vlc
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc README.html
-%{_bindir}/asapconv
-
-%files devel
-%defattr(-,root,root)
-%{_includedir}/asap.h
-%{_libdir}/libasap.a
-
-%files xmms
-%defattr(-,root,root)
-%{_libdir}/xmms/Input/libasap-xmms.so
-
-%files gstreamer0.10
-%defattr(-,root,root)
-%{_libdir}/gstreamer-0.10/libgstasapdec.so
-
-%files vlc
-%defattr(-,root,root)
-%{_libdir}/vlc/plugins/demux/libasap_plugin.so
-
-%changelog
-* Fri Aug 16 2013 Piotr Fusik <fox@scene.pl>
-- 3.1.5-1
-- Corrected descriptions of GStreamer and VLC plugins - they don't support all the formats
-
-* Mon Apr 29 2013 Piotr Fusik <fox@scene.pl>
-- 3.1.4-1
-- lib64 compatibility
-- Removed the Audacious subpackage
-
-* Tue Dec 4 2012 Piotr Fusik <fox@scene.pl>
-- 3.1.3-1
-- Added subpackages with GStreamer and VLC plugins
-
-* Mon Jun 25 2012 Piotr Fusik <fox@scene.pl>
-- 3.1.2-1
-
-* Wed Oct 26 2011 Piotr Fusik <fox@scene.pl>
-- 3.1.1-1
-
-* Sat Sep 24 2011 Piotr Fusik <fox@scene.pl>
-- 3.1.0-1
-
-* Fri Jul 15 2011 Piotr Fusik <fox@scene.pl>
-- 3.0.1-1
-
-* Thu May 19 2011 Piotr Fusik <fox@scene.pl>
-- 3.0.0-1
-- Added subpackages with Audacious and XMMS plugins
-
-* Wed Nov 3 2010 Piotr Fusik <fox@scene.pl>
-- 2.1.2-1
-- Initial packaging
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapwriter.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapwriter.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/asapwriter.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/asapwriter.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,811 +0,0 @@
-// asapwriter.ci - format conversions
-//
-// Copyright (C) 2011-2012  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-public delegate void StringConsumer(string s);
-
-public delegate void ByteWriter(int data);
-
-/// Static methods for writing modules in different formats.
-public class ASAPWriter
-{
-	/// Enumerates possible file types the given module can be written as.
-	public static void EnumSaveExts(
-		/// Receives filename extensions without the leading dot.
-		StringConsumer output,
-		/// File information.
-		ASAPInfo info,
-		/// Contents of the file.
-		byte[] module,
-		/// Length of the file.
-		int moduleLen)
-	{
-		switch (info.Type) {
-		case ASAPModuleType.SapB:
-		case ASAPModuleType.SapC:
-			output("sap");
-			string ext = info.GetOriginalModuleExt(module, moduleLen);
-			if (ext != null)
-				output(ext);
-			output("xex");
-			break;
-		case ASAPModuleType.SapD:
-			output("sap");
-			if (info.Fastplay == 312)
-				output("xex");
-			break;
-		case ASAPModuleType.SapS:
-			output("sap");
-			break;
-		default:
-			output(info.GetOriginalModuleExt(module, moduleLen));
-			output("sap");
-			output("xex");
-			break;
-		}
-	}
-
-	static void TwoDigitsToString(byte[] result, int offset, int value)
-	{
-		result[offset] = '0' + value / 10;
-		result[offset + 1] = '0' + value % 10;
-	}
-
-	static bool SecondsToString(byte[] result, int offset, int value)
-	{
-		if (value < 0 || value >= 100 * 60 * 1000)
-			return false;
-		value /= 1000;
-		TwoDigitsToString(result, offset, value / 60);
-		result[offset + 2] = ':';
-		TwoDigitsToString(result, offset + 3, value % 60);
-		return true;
-	}
-
-	/// Maximum length of text representation of a duration.
-	/// Corresponds to the longest format which is `"mm:ss.xxx"`.
-	public const int MaxDurationLength = 9;
-
-	/// Writes text representation of the given duration.
-	/// Returns the number of bytes written to `result`.
-	public static int DurationToString(
-		/// The output buffer.
-		byte[] result,
-		/// Number of milliseconds.
-		int value)
-	{
-		if (!SecondsToString(result, 0, value))
-			return 0;
-		value %= 1000;
-		if (value == 0)
-			return 5;
-		result[5] = '.';
-		TwoDigitsToString(result, 6, value / 10);
-		value %= 10;
-		if (value == 0)
-			return 8;
-		result[8] = '0' + value;
-		return 9;
-	}
-
-	static void WriteWord(ByteWriter w, int value)
-	{
-		w(value & 0xff);
-		w((value >> 8) & 0xff);
-	}
-
-	static void WriteBytes(ByteWriter w, byte[] array, int startIndex, int endIndex)
-	{
-		while (startIndex < endIndex)
-			w(array[startIndex++]);
-	}
-
-	static void WriteString(ByteWriter w, string s)
-	{
-		int n = s.Length;
-		for (int i = 0; i < n; i++)
-			w(s[i]);
-	}
-
-	static void WriteDec(ByteWriter w, int value)
-	{
-		if (value >= 10) {
-			WriteDec(w, value / 10);
-			value %= 10;
-		}
-		w('0' + value);
-	}
-
-	static void WriteTextSapTag(ByteWriter w, string tag, string value)
-	{
-		WriteString(w, tag);
-		w('"');
-		if (value.Length == 0)
-			value = "<?>";
-		WriteString(w, value);
-		w('"');
-		w('\r');
-		w('\n');
-	}
-
-	static void WriteDecSapTag(ByteWriter w, string tag, int value)
-	{
-		WriteString(w, tag);
-		WriteDec(w, value);
-		w('\r');
-		w('\n');
-	}
-
-	static void WriteHexSapTag(ByteWriter w, string tag, int value)
-	{
-		if (value < 0)
-			return;
-		WriteString(w, tag);
-		for (int i = 12; i >= 0; i -= 4) {
-			int digit = (value >> i) & 0xf;
-			w(digit + (digit < 10 ? '0' : 'A' - 10));
-		}
-		w('\r');
-		w('\n');
-	}
-
-	static void WriteSapHeader(ByteWriter w, ASAPInfo info, int type, int init, int player)
-	{
-		WriteString(w, "SAP\r\n");
-		WriteTextSapTag(w, "AUTHOR ", info.Author);
-		WriteTextSapTag(w, "NAME ", info.Title);
-		WriteTextSapTag(w, "DATE ", info.Date);
-		if (info.Songs > 1) {
-			WriteDecSapTag(w, "SONGS ", info.Songs);
-			if (info.DefaultSong > 0)
-				WriteDecSapTag(w, "DEFSONG ", info.DefaultSong);
-		}
-		if (info.Channels > 1)
-			WriteString(w, "STEREO\r\n");
-		if (info.Ntsc)
-			WriteString(w, "NTSC\r\n");
-		WriteString(w, "TYPE ");
-		w(type);
-		w('\r');
-		w('\n');
-		if (info.Fastplay != 312 || info.Ntsc)
-			WriteDecSapTag(w, "FASTPLAY ", info.Fastplay);
-		if (type == 'C')
-			WriteHexSapTag(w, "MUSIC ", info.Music);
-		WriteHexSapTag(w, "INIT ", init);
-		WriteHexSapTag(w, "PLAYER ", player);
-		WriteHexSapTag(w, "COVOX ", info.CovoxAddr);
-		for (int song = 0; song < info.Songs; song++) {
-			if (info.Durations[song] < 0)
-				break;
-			WriteString(w, "TIME ");
-			byte[MaxDurationLength] s;
-			WriteBytes(w, s, 0, DurationToString(s, info.Durations[song]));
-			if (info.Loops[song])
-				WriteString(w, " LOOP");
-			w('\r');
-			w('\n');
-		}
-	}
-
-	static void WriteExecutableHeader(ByteWriter w, int[] initAndPlayer, ASAPInfo info, int type, int init, int player)
-	{
-		if (initAndPlayer == null)
-			WriteSapHeader(w, info, type, init, player);
-		else {
-			initAndPlayer[0] = init;
-			initAndPlayer[1] = player;
-		}
-	}
-
-	static void WritePlaTaxLda0(ByteWriter w)
-	{
-		w(0x68);
-		w(0xaa);
-		w(0xa9);
-		w(0);
-	}
-
-	static void WriteCmcInit(ByteWriter w, int[] initAndPlayer, ASAPInfo info)
-	{
-		if (initAndPlayer == null)
-			return; // to SAP
-		const int initCmc = 0xfe0; // cms.obx ends at 0xfba
-		WriteWord(w, initCmc);
-		WriteWord(w, initCmc + 16);
-		w(0x48); // PHA
-		w(0xa2); w(info.Music & 0xff); // LDX #<MUSIC
-		w(0xa0); w(info.Music >> 8); // LDY #>MUSIC
-		w(0xa9); w(0x70); // LDA #$70
-		w(0x20); WriteWord(w, initAndPlayer[1] + 3); // JSR PLAYER+3
-		WritePlaTaxLda0(w); // PLA; TAX; LDA #0
-		w(0x4c); WriteWord(w, initAndPlayer[1] + 3); // JMP PLAYER+3
-		initAndPlayer[0] = initCmc;
-		initAndPlayer[1] += 6;
-	}
-
-	static void WriteExecutableFromSap(ByteWriter w, int[] initAndPlayer, ASAPInfo info, int type, byte[] module, int moduleLen)
-	{
-		WriteExecutableHeader(w, initAndPlayer, info, type, info.Init, info.Player);
-		WriteBytes(w, module, info.HeaderLen, moduleLen);
-	}
-
-	static int WriteExecutableHeaderForSongPos(ByteWriter w, int[] initAndPlayer, ASAPInfo info, int player, int codeForOneSong, int codeForManySongs, int playerOffset)
-	{
-		if (info.Songs != 1) {
-			WriteExecutableHeader(w, initAndPlayer, info, 'B', player - codeForManySongs, player + playerOffset);
-			return player - codeForManySongs - info.Songs;
-		}
-		WriteExecutableHeader(w, initAndPlayer, info, 'B', player - codeForOneSong, player + playerOffset);
-		return player - codeForOneSong;
-	}
-
-	internal static void WriteExecutable(ByteWriter w, int[] initAndPlayer, ASAPInfo info, byte[] module, int moduleLen)
-	{
-		byte[] playerRoutine = ASAP6502.GetPlayerRoutine(info);
-		int player = -1;
-		int playerLastByte = -1;
-		if (playerRoutine != null) {
-			player = ASAPInfo.GetWord(playerRoutine, 2);
-			playerLastByte = ASAPInfo.GetWord(playerRoutine, 4);
-			if (info.Music <= playerLastByte)
-				throw "Module address conflicts with the player routine";
-		}
-		int startAddr;
-		switch (info.Type) {
-		case ASAPModuleType.SapB:
-			WriteExecutableFromSap(w, initAndPlayer, info, 'B', module, moduleLen);
-			break;
-		case ASAPModuleType.SapC:
-			WriteExecutableFromSap(w, initAndPlayer, info, 'C', module, moduleLen);
-			WriteCmcInit(w, initAndPlayer, info);
-			break;
-		case ASAPModuleType.SapD:
-			WriteExecutableFromSap(w, initAndPlayer, info, 'D', module, moduleLen);
-			break;
-		case ASAPModuleType.SapS:
-			WriteExecutableFromSap(w, initAndPlayer, info, 'S', module, moduleLen);
-			break;
-		case ASAPModuleType.Cmc:
-		case ASAPModuleType.Cm3:
-		case ASAPModuleType.Cmr:
-		case ASAPModuleType.Cms:
-			WriteExecutableHeader(w, initAndPlayer, info, 'C', -1, player);
-			w(0xff); // some modules start with zeros
-			w(0xff);
-			WriteBytes(w, module, 2, moduleLen);
-			WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-			WriteCmcInit(w, initAndPlayer, info);
-			break;
-		case ASAPModuleType.Dlt:
-			startAddr = WriteExecutableHeaderForSongPos(w, initAndPlayer, info, player, 5, 7, 0x103);
-			if (moduleLen == 0x2c06) {
-				// append zero to the module
-				WriteBytes(w, module, 0, 4);
-				WriteWord(w, 0x4c00);
-				WriteBytes(w, module, 6, moduleLen);
-				w(0);
-			}
-			else
-				WriteBytes(w, module, 0, moduleLen);
-			WriteWord(w, startAddr);
-			WriteWord(w, playerLastByte);
-			if (info.Songs != 1) {
-				WriteBytes(w, info.SongPos, 0, info.Songs);
-				w(0xaa); // TAX
-				w(0xbc); WriteWord(w, startAddr); // LDY SONG2POS,X
-			}
-			else {
-				w(0xa0); w(0); // LDY #0
-			}
-			w(0x4c); WriteWord(w, player + 0x100); // JMP PLAYER+$100
-			WriteBytes(w, playerRoutine, 6, playerLastByte - player + 7);
-			break;
-		case ASAPModuleType.Mpt:
-			startAddr = WriteExecutableHeaderForSongPos(w, initAndPlayer, info, player, 13, 17, 3);
-			WriteBytes(w, module, 0, moduleLen);
-			WriteWord(w, startAddr);
-			WriteWord(w, playerLastByte);
-			if (info.Songs != 1) {
-				WriteBytes(w, info.SongPos, 0, info.Songs);
-				w(0x48); // PHA
-			}
-			w(0xa0); w(info.Music & 0xff); // LDY #<MUSIC
-			w(0xa2); w(info.Music >> 8); // LDX #>MUSIC
-			w(0xa9); w(0); // LDA #0
-			w(0x20); WriteWord(w, player); // JSR PLAYER
-			if (info.Songs != 1) {
-				w(0x68); w(0xa8); // PLA; TAY
-				w(0xbe); WriteWord(w, startAddr); // LDX SONG2POS,Y
-			}
-			else {
-				w(0xa2); w(0); // LDX #0
-			}
-			w(0xa9); w(2); // LDA #2
-			WriteBytes(w, playerRoutine, 6, playerLastByte - player + 7);
-			break;
-		case ASAPModuleType.Rmt:
-			WriteExecutableHeader(w, initAndPlayer, info, 'B', ASAPInfo.RmtInit, 0x603);
-			WriteBytes(w, module, 0, ASAPInfo.GetWord(module, 4) - info.Music + 7);
-			WriteWord(w, ASAPInfo.RmtInit);
-			if (info.Songs != 1) {
-				WriteWord(w, ASAPInfo.RmtInit + 10 + info.Songs);
-				w(0xa8); // TAY
-				w(0xb9); WriteWord(w, ASAPInfo.RmtInit + 11); // LDA SONG2POS,Y
-			}
-			else {
-				WriteWord(w, ASAPInfo.RmtInit + 8);
-				w(0xa9); w(0); // LDA #0
-			}
-			w(0xa2); w(info.Music & 0xff); // LDX #<MUSIC
-			w(0xa0); w(info.Music >> 8); // LDY #>MUSIC
-			w(0x4c); WriteWord(w, 0x600); // JMP PLAYER
-			if (info.Songs != 1)
-				WriteBytes(w, info.SongPos, 0, info.Songs);
-			WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-			break;
-		case ASAPModuleType.Tmc:
-			const int[4] tmcPlayerOffset = { 3, -9, -10, -10 };
-			int player2 = player + tmcPlayerOffset[module[0x25] - 1];
-			const int[4] tmcInitOffset = { -14, -16, -17, -17 };
-			startAddr = player2 + tmcInitOffset[module[0x25] - 1];
-			if (info.Songs != 1)
-				startAddr -= 3;
-			WriteExecutableHeader(w, initAndPlayer, info, 'B', startAddr, player2);
-			WriteBytes(w, module, 0, moduleLen);
-			WriteWord(w, startAddr);
-			WriteWord(w, playerLastByte);
-			if (info.Songs != 1)
-				w(0x48); // PHA
-			w(0xa0); w(info.Music & 0xff); // LDY #<MUSIC
-			w(0xa2); w(info.Music >> 8); // LDX #>MUSIC
-			w(0xa9); w(0x70); // LDA #$70
-			w(0x20); WriteWord(w, player); // JSR PLAYER
-			if (info.Songs != 1)
-				WritePlaTaxLda0(w); // PLA; TAX; LDA #0
-			else {
-				w(0xa9); w(0x60); // LDA #$60
-			}
-			switch (module[0x25]) {
-			case 2:
-				w(0x06); w(0); // ASL 0
-				w(0x4c); WriteWord(w, player); // JMP PLAYER
-				w(0xa5); w(0); // LDA 0
-				w(0xe6); w(0); // INC 0
-				w(0x4a); // LSR @
-				w(0x90); w(5); // BCC PLAYER+3
-				w(0xb0); w(6); // BCS PLAYER+6
-				break;
-			case 3:
-			case 4:
-				w(0xa0); w(1); // LDY #1
-				w(0x84); w(0); // STY 0
-				w(0xd0); w(10); // BNE PLAYER
-				w(0xc6); w(0); // DEC 0
-				w(0xd0); w(12); // BNE PLAYER+6
-				w(0xa0); w(module[0x25]); // LDY #3
-				w(0x84); w(0); // STY 0
-				w(0xd0); w(3); // BNE PLAYER+3
-				break;
-			}
-			WriteBytes(w, playerRoutine, 6, playerLastByte - player + 7);
-			break;
-		case ASAPModuleType.Tm2:
-			const int tm2Init = 0x1380;
-			WriteExecutableHeader(w, initAndPlayer, info, 'B', tm2Init, 0x803);
-			WriteBytes(w, module, 0, moduleLen);
-			WriteWord(w, tm2Init);
-			if (info.Songs != 1) {
-				WriteWord(w, tm2Init + 16);
-				w(0x48); // PHA
-			}
-			else
-				WriteWord(w, tm2Init + 14);
-			w(0xa0); w(info.Music & 0xff); // LDY #<MUSIC
-			w(0xa2); w(info.Music >> 8); // LDX #>MUSIC
-			w(0xa9); w(0x70); // LDA #$70
-			w(0x20); WriteWord(w, 0x800); // JSR PLAYER
-			if (info.Songs != 1)
-				WritePlaTaxLda0(w); // PLA; TAX; LDA #0
-			else {
-				w(0xa9); w(0); // LDA #0
-				w(0xaa); // TAX
-			}
-			w(0x4c); WriteWord(w, 0x800); // JMP PLAYER
-			WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-			break;
-		case ASAPModuleType.Fc:
-			WriteExecutableHeader(w, initAndPlayer, info, 'B', player, player + 3);
-			WriteWord(w, 0xffff);
-			WriteWord(w, info.Music);
-			WriteWord(w, info.Music + moduleLen - 1);
-			WriteBytes(w, module, 0, moduleLen);
-			WriteBytes(w, playerRoutine, 2, playerLastByte - player + 7);
-			break;
-		}
-	}
-
-	const int XexInfoCharactersPerLine = 32;
-
-	static int PadXexInfo(byte[] dest, int offset, int endColumn)
-	{
-		while (offset % XexInfoCharactersPerLine != endColumn)
-			dest[offset++] = ' ';
-		return offset;
-	}
-
-	static int FormatXexInfoText(byte[] dest, int destLen, int endColumn, string src, bool author)
-	{
-		int srcLen = src.Length;
-		for (int srcOffset = 0; srcOffset < srcLen; ) {
-			int c = src[srcOffset++];
-			if (c == ' ') {
-				if (author && srcOffset < srcLen && src[srcOffset] == '&') {
-					int authorLen;
-					for (authorLen = 1; srcOffset + authorLen < srcLen; authorLen++) {
-						if (src[srcOffset + authorLen] == ' ' && srcOffset + authorLen + 1 < srcLen && src[srcOffset + authorLen + 1] == '&')
-							break;
-					}
-					if (authorLen <= XexInfoCharactersPerLine && destLen % XexInfoCharactersPerLine + 1 + authorLen > XexInfoCharactersPerLine) {
-						destLen = PadXexInfo(dest, destLen, 1); // align author names after "by" and "&"
-						continue;
-					}
-				}
-				int wordLen;
-				for (wordLen = 0; srcOffset + wordLen < srcLen && src[srcOffset + wordLen] != ' '; wordLen++) {
-				}
-				if (wordLen <= XexInfoCharactersPerLine && destLen % XexInfoCharactersPerLine + 1 + wordLen > XexInfoCharactersPerLine) {
-					destLen = PadXexInfo(dest, destLen, 0);
-					continue;
-				}
-			}
-			dest[destLen++] = c;
-		}
-		return PadXexInfo(dest, destLen, endColumn);
-	}
-
-	static void WriteXexInfoTextDl(ByteWriter w, int address, int len, int verticalScrollAt)
-	{
-		w(verticalScrollAt == 0 ? 0x62 : 0x42);
-		WriteWord(w, address);
-		for (int i = XexInfoCharactersPerLine; i < len; i += XexInfoCharactersPerLine)
-			w(i == verticalScrollAt ? 0x22 : 2);
-	}
-
-	static void WriteXexInfo(ByteWriter w, ASAPInfo info)
-	{
-		byte[256] title;
-		int titleLen = FormatXexInfoText(title, 0, 0, info.Title.Length == 0 ? "(untitled)" : info.Title, false);
-		byte[256] author;
-		int authorLen;
-		if (info.Author.Length > 0) {
-			author[0] = 'b';
-			author[1] = 'y';
-			author[2] = ' ';
-			authorLen = FormatXexInfoText(author, 3, 0, info.Author, true);
-		}
-		else
-			authorLen = 0;
-		byte[256] other;
-		int otherLen = FormatXexInfoText(other, 0, XexInfoCharactersPerLine - 13, info.Date, false);
-		otherLen = FormatXexInfoText(other, otherLen, XexInfoCharactersPerLine - 5, info.Channels > 1 ? " STEREO" : "   MONO", false);
-		int duration = info.Durations[info.DefaultSong];
-		if (duration > 0 && SecondsToString(other, otherLen, duration + 999)) // round up to full seconds
-			otherLen += 5;
-		else
-			otherLen = PadXexInfo(other, otherLen, 0);
-
-		const int xexInfoDl = 0xfc50; // must match xexinfo.asx
-		int totalCharacters = titleLen + authorLen + otherLen;
-		int totalLines = totalCharacters / XexInfoCharactersPerLine;
-		int otherAddress = xexInfoDl - otherLen;
-#if HIDE_AUTHOR
-		int authorAddress = otherAddress - authorLen;
-		int hiddenAddress = authorAddress - authorLen;
-		int titleAddress = hiddenAddress - 8 - titleLen;
-#else
-		int titleAddress = otherAddress - authorLen - 8 - titleLen;
-#endif
-		WriteWord(w, titleAddress);
-		WriteBytes(w, BinaryResource("xexinfo.obx"), 4, 6);
-		WriteBytes(w, title, 0, titleLen);
-		for (int i = 0; i < 8; i++)
-			w(0x55);
-#if HIDE_AUTHOR
-		if (authorLen > 0) {
-			WriteString(w, "(press space to show author)");
-			for (int i = 28; i < authorLen; i++)
-				w(' ');
-			WriteBytes(w, author, 0, authorLen);
-		}
-#else
-		WriteBytes(w, author, 0, authorLen);
-#endif
-		WriteBytes(w, other, 0, otherLen);
-		for (int i = totalLines; i < 26; i++)
-			w(0x70);
-		w(0x30);
-		WriteXexInfoTextDl(w, titleAddress, titleLen, titleLen - XexInfoCharactersPerLine);
-		w(8);
-		w(0);
-#if HIDE_AUTHOR
-		if (authorLen > 0)
-			WriteXexInfoTextDl(w, hiddenAddress, authorLen, -1);
-		w(0x10);
-		WriteXexInfoTextDl(w, otherAddress, otherLen, -1);
-		w(0x41);
-		WriteWord(w, xexInfoDl);
-		if (authorLen > 0) {
-			int dlAuthor = xexInfoDl + 32 - totalLines + titleLen / XexInfoCharactersPerLine;
-			w(0xa9); w(authorAddress & 0xff); // LDA #<author
-			w(0x8d); WriteWord(w, dlAuthor); // STA dl_author
-			w(0xa9); w(authorAddress >> 8); // LDA #>author
-			w(0x8d); WriteWord(w, dlAuthor + 1); // STA dl_author+1
-		}
-		else {
-			// pad two bytes because DL is shorter due to no LMS for author
-			// show_author is just RTS, pad with more RTSes
-			for (int i = 0; i < 12; i++)
-				w(0x60);
-		}
-#else
-		for (int i = 0; i < authorLen; i += XexInfoCharactersPerLine)
-			w(2);
-		w(0x10);
-		for (int i = 0; i < otherLen; i += XexInfoCharactersPerLine)
-			w(2);
-#endif
-		WriteBytes(w, BinaryResource("xexinfo.obx"), 6, BinaryResource("xexinfo.obx").Length);
-	}
-
-	static int WriteNativeHeader(ByteWriter w, ASAPInfo info, byte[] module)
-	{
-		int diff = info.Music - ASAPInfo.GetWord(module, 2);
-		int last = ASAPInfo.GetWord(module, 4) + diff;
-		if (last > 0xffff)
-			throw "Address set too high";
-		w(0xff);
-		w(0xff);
-		WriteWord(w, info.Music);
-		WriteWord(w, last);
-		return diff;
-	}
-
-	static void WriteRelocatedBytes(ByteWriter w, int diff, byte[] module, int lowOffset, int highOffset, int len, int shift)
-	{
-		for (int i = 0; i < len; i++) {
-			int address = module[lowOffset + i] + (module[highOffset + i] << 8);
-			if (address != 0 && address != 0xffff)
-				address += diff;
-			w((address >> shift) & 0xff);
-		}
-	}
-
-	static void WriteRelocatedLowHigh(ByteWriter w, int diff, byte[] module, int lowOffset, int len)
-	{
-		WriteRelocatedBytes(w, diff, module, lowOffset, lowOffset + len, len, 0);
-		WriteRelocatedBytes(w, diff, module, lowOffset, lowOffset + len, len, 8);
-	}
-
-	static void WriteRelocatedWords(ByteWriter w, int diff, byte[] module, int offset, int len)
-	{
-		for (int i = 0; i < len; i += 2) {
-			int address = module[offset + i] + (module[offset + i + 1] << 8);
-			if (address != 0 && address != 0xffff)
-				address += diff;
-			WriteWord(w, address);
-		}
-	}
-
-	static void WriteNative(ByteWriter w, ASAPInfo info, byte[] module, int moduleLen)
-	{
-		int diff;
-		switch (info.Type) {
-		case ASAPModuleType.SapB:
-		case ASAPModuleType.SapC:
-			// SAP -> native
-			int offset = info.GetRmtSapOffset(module, moduleLen);
-			if (offset > 0) {
-				w(0xff);
-				w(0xff);
-				WriteBytes(w, module, offset, moduleLen);
-				break;
-			}
-			int blockLen = ASAPInfo.GetWord(module, info.HeaderLen + 4) - ASAPInfo.GetWord(module, info.HeaderLen + 2) + 7;
-			if (blockLen < 7 || info.HeaderLen + blockLen >= moduleLen)
-				throw "Cannot extract module from SAP";
-			if (info.Init == 0x400 && info.Player == 0x403)
-				WriteBytes(w, module, info.HeaderLen + 6, info.HeaderLen + blockLen); // SAP -> FC
-			else
-				WriteBytes(w, module, info.HeaderLen, info.HeaderLen + blockLen);
-			break;
-		case ASAPModuleType.Cmc:
-		case ASAPModuleType.Cm3:
-		case ASAPModuleType.Cmr:
-		case ASAPModuleType.Cms:
-			// CMC -> CMC
-			diff = WriteNativeHeader(w, info, module);
-			WriteBytes(w, module, 6, 6 + 0x14);
-			WriteRelocatedLowHigh(w, diff, module, 6 + 0x14, 64);
-			WriteBytes(w, module, 6 + 0x14 + 128, moduleLen);
-			break;
-		case ASAPModuleType.Dlt:
-			// DLT -> DLT
-			diff = WriteNativeHeader(w, info, module);
-			WriteBytes(w, module, 6, moduleLen);
-			break;
-		case ASAPModuleType.Mpt:
-			// MPT -> MPT
-			diff = WriteNativeHeader(w, info, module);
-			WriteRelocatedWords(w, diff, module, 6, 64 + 128);
-			WriteBytes(w, module, 6 + 64 + 128, 6 + 64 + 128 + 256);
-			WriteRelocatedLowHigh(w, diff, module, 6 + 64 + 128 + 256, 4);
-			WriteBytes(w, module, 6 + 64 + 128 + 256 + 8, moduleLen);
-			break;
-		case ASAPModuleType.Rmt:
-			// RMT -> RMT
-			diff = WriteNativeHeader(w, info, module);
-			WriteBytes(w, module, 6, 6 + 8);
-			int music = ASAPInfo.GetWord(module, 2);
-			int patternLowAddress = ASAPInfo.GetWord(module, 0x10);
-			int pointersAndInstrumentsLen = patternLowAddress - music - 8;
-			WriteRelocatedWords(w, diff, module, 6 + 8, pointersAndInstrumentsLen);
-			int patterns = ASAPInfo.GetWord(module, 0x12) - patternLowAddress;
-			WriteRelocatedLowHigh(w, diff, module, 6 + 8 + pointersAndInstrumentsLen, patterns);
-			int songOffset = 6 + ASAPInfo.GetWord(module, 0x14) - music;
-			WriteBytes(w, module, 6 + 8 + pointersAndInstrumentsLen + (patterns << 1), songOffset);
-			int songEnd = 7 + ASAPInfo.GetWord(module, 4) - music;
-			while (songOffset + 3 < songEnd) {
-				int nextSongOffset = songOffset + module[9] - '0';
-				if (module[songOffset] == 0xfe) {
-					w(0xfe);
-					w(module[songOffset + 1]);
-					WriteWord(w, ASAPInfo.GetWord(module, songOffset + 2) + diff);
-					songOffset += 4;
-				}
-				if (nextSongOffset > songEnd)
-					nextSongOffset = songEnd;
-				WriteBytes(w, module, songOffset, nextSongOffset);
-				songOffset = nextSongOffset;
-			}
-			WriteBytes(w, module, songOffset, songEnd);
-			if (moduleLen >= songEnd + 5) {
-				WriteRelocatedWords(w, diff, module, songEnd, 4);
-				WriteBytes(w, module, songEnd + 4, moduleLen);
-			}
-			break;
-		case ASAPModuleType.Tmc:
-			// TMC -> TMC
-			diff = WriteNativeHeader(w, info, module);
-			WriteBytes(w, module, 6, 6 + 32);
-			WriteRelocatedLowHigh(w, diff, module, 6 + 32, 64);
-			WriteRelocatedLowHigh(w, diff, module, 6 + 32 + 128, 128);
-			WriteBytes(w, module, 6 + 32 + 128 + 256, moduleLen);
-			break;
-		case ASAPModuleType.Tm2:
-			// TM2 -> TM2
-			diff = WriteNativeHeader(w, info, module);
-			WriteBytes(w, module, 6, 6 + 128);
-			WriteRelocatedBytes(w, diff, module, 6 + 128, 6 + 128 + 128 + 512, 128, 0);
-			WriteRelocatedLowHigh(w, diff, module, 6 + 128 + 128, 256);
-			WriteRelocatedBytes(w, diff, module, 6 + 128, 6 + 128 + 128 + 512, 128, 8);
-			WriteBytes(w, module, 6 + 128 + 128 + 512 + 128, moduleLen);
-			break;
-		case ASAPModuleType.Fc:
-			// FC -> FC
-			WriteBytes(w, module, 0, moduleLen);
-			break;
-		default:
-			throw "Impossible conversion";
-		}
-	}
-
-	/// Writes the given module in a possibly different file format.
-	public static void Write(
-		/// Output filename, used to determine the format.
-		string targetFilename,
-		/// Receives output file contents.
-		ByteWriter w,
-		/// File information got from the source file with data updated for the output file.
-		ASAPInfo info,
-		/// Contents of the source file.
-		byte[] module,
-		/// Length of the source file.
-		int moduleLen,
-		/// Display information (xex output only).
-		bool tag)
-	{
-		macro ASAP_EXT(s) ( s[0] + (s[1] << 8) + (s[2] << 16) | 0x202020 )
-		int destExt = ASAPInfo.GetPackedExt(targetFilename);
-		switch (destExt) {
-		case ASAP_EXT("SAP"):
-			// * -> SAP
-			WriteExecutable(w, null, info, module, moduleLen);
-			return;
-		case ASAP_EXT("XEX"):
-			// * -> XEX
-			{
-#if FLASHPACK
-				FlashPack() flashPack;
-				ByteWriter resultWriter = w;
-				native {
-					w.obj = &flashPack;
-					w.func = (void (*)(void *, int)) FlashPack_LoadByte;
-				}
-#endif
-				int[2] initAndPlayer;
-				WriteExecutable(w, initAndPlayer, info, module, moduleLen);
-				switch (info.Type) {
-				case ASAPModuleType.SapD:
-					if (info.Fastplay != 312)
-						throw "Impossible conversion";
-					WriteBytes(w, BinaryResource("xexd.obx"), 2, BinaryResource("xexd.obx").Length);
-					WriteWord(w, initAndPlayer[0]);
-					if (initAndPlayer[1] < 0) {
-						w(0x60); // RTS
-						w(0x60); // don't care
-						w(0x60); // don't care
-					}
-					else {
-						w(0x4c); // JMP
-						WriteWord(w, initAndPlayer[1]);
-					}
-					w(info.DefaultSong);
-					break;
-				case ASAPModuleType.SapS:
-					throw "Impossible conversion";
-				default:
-					WriteBytes(w, BinaryResource("xexb.obx"), 2, BinaryResource("xexb.obx").Length);
-					WriteWord(w, initAndPlayer[0]);
-					w(0x4c); // JMP
-					WriteWord(w, initAndPlayer[1]);
-					w(info.DefaultSong);
-					w(info.Fastplay & 1);
-					w((info.Fastplay >> 1) % 156);
-					w((info.Fastplay >> 1) % 131);
-					w(info.Fastplay / 312);
-					w(info.Fastplay / 262);
-					break;
-				}
-				if (tag)
-					WriteXexInfo(w, info);
-				WriteWord(w, 0x2e0);
-				WriteWord(w, 0x2e1);
-				WriteWord(w, tag ? 0x100 : 0x124); // must match xexinfo.asx, xexb.asx, xexd.asx
-#if FLASHPACK
-				flashPack.Compress(resultWriter);
-#endif
-				return;
-			}
-		default:
-			string possibleExt = info.GetOriginalModuleExt(module, moduleLen);
-			if (possibleExt != null) {
-				int packedPossibleExt = ASAP_EXT(possibleExt);
-				if (destExt == packedPossibleExt
-				 || (destExt == ASAP_EXT("tm8") && packedPossibleExt == ASAP_EXT("tmc"))) {
-					// * -> native
-					WriteNative(w, info, module, moduleLen);
-					return;
-				}
-			}
-			throw "Impossible conversion";
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/astil.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/astil.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/astil.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/astil.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,361 +0,0 @@
-/*
- * astil.c - another SID/SAP Tune Information List parser
- *
- * Copyright (C) 2011-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "astil.h"
-
-#define ASTIL_MAX_TEXT_LENGTH  100
-#define ASTIL_MAX_COMMENT_LENGTH  1000
-#define ASTIL_MAX_COVERS  10
-
-struct ASTILCover
-{
-	int startSeconds;
-	int endSeconds;
-	char titleAndSource[ASTIL_MAX_TEXT_LENGTH + 1];
-	char artist[ASTIL_MAX_TEXT_LENGTH + 1];
-	char comment[ASTIL_MAX_COMMENT_LENGTH + 1];
-};
-
-struct ASTIL
-{
-	int nCovers;
-	cibool isUTF8;
-	char stilFilename[FILENAME_MAX];
-	char title[ASTIL_MAX_TEXT_LENGTH + 1];
-	char author[ASTIL_MAX_TEXT_LENGTH + 1];
-	char directoryComment[ASTIL_MAX_COMMENT_LENGTH + 1];
-	char fileComment[ASTIL_MAX_COMMENT_LENGTH + 1];
-	char songComment[ASTIL_MAX_COMMENT_LENGTH + 1];
-	ASTILCover covers[ASTIL_MAX_COVERS];
-};
-
-ASTIL *ASTIL_New(void)
-{
-	ASTIL *self = (ASTIL *) malloc(sizeof(ASTIL));
-	return self;
-}
-
-void ASTIL_Delete(ASTIL *self)
-{
-	free(self);
-}
-
-static int ASTIL_FindPreviousSlash(const char *filename, int pos)
-{
-	while (pos > 0) {
-		pos--;
-		if (filename[pos] == '/' || filename[pos] == '\\')
-			return pos;
-	}
-	return -1;
-}
-
-static cibool ASTIL_ReadUTF8BOM(FILE *fp)
-{
-	if (getc(fp) == 0xef && getc(fp) == 0xbb && getc(fp) == 0xbf)
-		return TRUE;
-	fseek(fp, 0, SEEK_SET);
-	return FALSE;
-}
-
-static int ASTIL_ReadLine(FILE *fp, char *result)
-{
-	int len = 0;
-	for (;;) {
-		int c = getc(fp);
-		switch (c) {
-		case EOF:
-			result[0] = '\0';
-			return -1;
-		case '\n':
-			while (len > 0 && (result[len - 1] == ' ' || result[len - 1] == '\t'))
-				len--;
-			result[len] = '\0';
-			return len;
-		case '\r':
-			break;
-		default:
-			if (len < ASTIL_MAX_TEXT_LENGTH)
-				result[len++] = c;
-			break;
-		}
-	}
-}
-
-static int ASTIL_MatchFilename(const char *line, const char *filename)
-{
-	int len = 0;
-	for (;; len++) {
-		int c = line[len];
-		if (c == filename[len]) {
-			if (c == '\0')
-				return -1;
-		}
-		else if (c == '/' && filename[len] == '\\') {
-		}
-		else
-			return len;
-	}
-}
-
-static void ASTIL_ReadComment(FILE *fp, char *line, char *comment)
-{
-	int len = ASTIL_ReadLine(fp, line);
-	if (len >= 9 && memcmp(line, "COMMENT: ", 9) == 0) {
-		len -= 9;
-		memcpy(comment, line + 9, len + 1);
-		for (;;) {
-			int len2 = ASTIL_ReadLine(fp, line);
-			if (len2 >= 9 && memcmp(line, "         ", 9) == 0) {
-				if (len < ASTIL_MAX_COMMENT_LENGTH - ASTIL_MAX_TEXT_LENGTH) {
-					comment[len++] = '\n';
-					len2 -= 9;
-					memcpy(comment + len, line + 9, len2 + 1);
-					len += len2;
-				}
-			}
-			else
-				break;
-		}
-	}
-}
-
-static int ASTIL_ParseInt(const char *s, int *pos)
-{
-	int result = 0;
-	int i = *pos;
-	while (s[i] >= '0' && s[i] <= '9') {
-		if (result >= 10)
-			return -1;
-		result = 10 * result + s[i++] - '0';
-	}
-	if (i == *pos)
-		return -1;
-	*pos = i;
-	return result;
-}
-
-static cibool ASTIL_ReadUntilSongNo(FILE *fp, char *line)
-{
-	while (ASTIL_ReadLine(fp, line) > 0) {
-		if (line[0] == '(' && line[1] == '#')
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static int ASTILCover_ParseTimestamp(const char *s, int *pos)
-{
-	int minutes = ASTIL_ParseInt(s, pos);
-	if (minutes >= 0 && s[(*pos)++] == ':') {
-		int seconds = ASTIL_ParseInt(s, pos);
-		if (seconds >= 0)
-			return 60 * minutes + seconds;
-	}
-	return -1;
-}
-
-static void ASTILCover_SetText(char *result, const char *src)
-{
-	if (strcmp(src, "<?>") == 0)
-		result[0] = '\0';
-	else
-		strcpy(result, src);
-}
-
-static void ASTILCover_Load(ASTILCover *self, FILE *fp, char *line)
-{
-	const char *ts;
-	self->startSeconds = -1;
-	self->endSeconds = -1;
-	ts = strrchr(line, '(');
-	if (ts != NULL) {
-		int i = ts - line + 1;
-		int startSeconds = ASTILCover_ParseTimestamp(line, &i);
-		int endSeconds = -1;
-		if (startSeconds >= 0 && line[i] == '-') {
-			i++;
-			endSeconds = ASTILCover_ParseTimestamp(line, &i);
-		}
-		if (line[i] == ')' && line[i + 1] == '\0') {
-			int len = ts - line;
-			if (line[len - 1] == ' ')
-				len--;
-			line[len] = '\0';
-			self->startSeconds = startSeconds;
-			self->endSeconds = endSeconds;
-		}
-	}
-	ASTILCover_SetText(self->titleAndSource, line + 9);
-	self->artist[0] = '\0';
-	self->comment[0] = '\0';
-	if (ASTIL_ReadLine(fp, line) >= 9 && memcmp(line, " ARTIST: ", 9) == 0) {
-		ASTILCover_SetText(self->artist, line + 9);
-		ASTIL_ReadComment(fp, line, self->comment);
-	}
-}
-
-static void ASTIL_ReadStilBlock(ASTIL *self, FILE *fp, char *line)
-{
-	for (;;) {
-		if (memcmp(line, "   NAME: ", 9) == 0)
-			strcpy(self->title, line + 9);
-		else if (memcmp(line, " AUTHOR: ", 9) == 0)
-			strcpy(self->author, line + 9);
-		else
-			break;
-		if (ASTIL_ReadLine(fp, line) < 9)
-			return;
-	}
-	while (self->nCovers < ASTIL_MAX_COVERS && memcmp(line, "  TITLE: ", 9) == 0) {
-		ASTILCover *cover = self->covers + self->nCovers++;
-		ASTILCover_Load(cover, fp, line);
-	}
-}
-
-cibool ASTIL_Load(ASTIL *self, const char *filename, int song)
-{
-	int lastSlash = ASTIL_FindPreviousSlash(filename, strlen(filename));
-	int rootSlash;
-	FILE *fp;
-	char line[ASTIL_MAX_TEXT_LENGTH + 1];
-	self->nCovers = 0;
-	self->stilFilename[0] = '\0';
-	self->title[0] = '\0';
-	self->author[0] = '\0';
-	self->directoryComment[0] = '\0';
-	self->fileComment[0] = '\0';
-	self->songComment[0] = '\0';
-	if (lastSlash < 0 || lastSlash >= FILENAME_MAX - 14) /* strlen("/Docs/STIL.txt") */
-		return FALSE;
-	memcpy(self->stilFilename, filename, lastSlash + 1);
-	for (rootSlash = lastSlash; ; rootSlash = ASTIL_FindPreviousSlash(filename, rootSlash)) {
-		if (rootSlash < 0) {
-			self->stilFilename[0] = '\0';
-			return FALSE;
-		}
-		strcpy(self->stilFilename + rootSlash + 1, "Docs/STIL.txt");
-		self->stilFilename[rootSlash + 5] = self->stilFilename[rootSlash]; /* copy dir separator - slash or backslash */
-		fp = fopen(self->stilFilename, "rb");
-		if (fp != NULL)
-			break;
-		strcpy(self->stilFilename + rootSlash + 1, "STIL.txt");
-		fp = fopen(self->stilFilename, "rb");
-		if (fp != NULL)
-			break;
-	}
-	self->isUTF8 = ASTIL_ReadUTF8BOM(fp);
-	while (ASTIL_ReadLine(fp, line) >= 0) {
-		int len = ASTIL_MatchFilename(line, filename + rootSlash);
-		if (len == -1) {
-			ASTIL_ReadComment(fp, line, self->fileComment);
-			if (line[0] == '(' && line[1] == '#') {
-				do {
-					int i = 2;
-					if (ASTIL_ParseInt(line, &i) - 1 == song && line[i] == ')' && line[i + 1] == '\0') {
-						ASTIL_ReadComment(fp, line, self->songComment);
-						ASTIL_ReadStilBlock(self, fp, line);
-						break;
-					}
-				} while (ASTIL_ReadUntilSongNo(fp, line));
-			}
-			else
-				ASTIL_ReadStilBlock(self, fp, line);
-			break;
-		}
-		if (len == lastSlash - rootSlash + 1 && line[len] == '\0')
-			ASTIL_ReadComment(fp, line, self->directoryComment);
-	}
-	fclose(fp);
-	return TRUE;
-}
-
-const char *ASTIL_GetStilFilename(const ASTIL *self)
-{
-	return self->stilFilename;
-}
-
-cibool ASTIL_IsUTF8(const ASTIL *self)
-{
-	return self->isUTF8;
-}
-
-const char *ASTIL_GetTitle(const ASTIL *self)
-{
-	return self->title;
-}
-
-const char *ASTIL_GetAuthor(const ASTIL *self)
-{
-	return self->author;
-}
-
-const char *ASTIL_GetDirectoryComment(const ASTIL *self)
-{
-	return self->directoryComment;
-}
-
-const char *ASTIL_GetFileComment(const ASTIL *self)
-{
-	return self->fileComment;
-}
-
-const char *ASTIL_GetSongComment(const ASTIL *self)
-{
-	return self->songComment;
-}
-
-const ASTILCover *ASTIL_GetCover(const ASTIL *self, int i)
-{
-	if (i < 0 || i >= self->nCovers)
-		return NULL;
-	return &self->covers[i];
-}
-
-int ASTILCover_GetStartSeconds(const ASTILCover *self)
-{
-	return self->startSeconds;
-}
-
-int ASTILCover_GetEndSeconds(const ASTILCover *self)
-{
-	return self->endSeconds;
-}
-
-const char *ASTILCover_GetTitleAndSource(const ASTILCover *self)
-{
-	return self->titleAndSource;
-}
-
-const char *ASTILCover_GetArtist(const ASTILCover *self)
-{
-	return self->artist;
-}
-
-const char *ASTILCover_GetComment(const ASTILCover *self)
-{
-	return self->comment;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/astil.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/astil.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/astil.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/astil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * astil.h - another SID/SAP Tune Information List parser
- *
- * Copyright (C) 2011-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef _ASTIL_H_
-#define _ASTIL_H_
-#ifndef _ASAP_H_ /* FIXME */
-typedef int cibool;
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ASTIL ASTIL;
-typedef struct ASTILCover ASTILCover;
-
-ASTIL *ASTIL_New(void);
-void ASTIL_Delete(ASTIL *self);
-cibool ASTIL_Load(ASTIL *self, const char *filename, int song);
-const char *ASTIL_GetStilFilename(const ASTIL *self);
-/* If TRUE, the following strings are expected to be UTF-8 encoded,
-   otherwise it's an old STIL.txt, ASCII or Windows-1250 maybe? */
-cibool ASTIL_IsUTF8(const ASTIL *self);
-const char *ASTIL_GetTitle(const ASTIL *self);
-const char *ASTIL_GetAuthor(const ASTIL *self);
-const char *ASTIL_GetDirectoryComment(const ASTIL *self);
-const char *ASTIL_GetFileComment(const ASTIL *self);
-const char *ASTIL_GetSongComment(const ASTIL *self);
-const ASTILCover *ASTIL_GetCover(const ASTIL *self, int i);
-
-int ASTILCover_GetStartSeconds(const ASTILCover *self);
-int ASTILCover_GetEndSeconds(const ASTILCover *self);
-const char *ASTILCover_GetTitleAndSource(const ASTILCover *self);
-const char *ASTILCover_GetArtist(const ASTILCover *self);
-const char *ASTILCover_GetComment(const ASTILCover *self);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/audacious/asapplug.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/audacious/asapplug.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/audacious/asapplug.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/audacious/asapplug.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,466 +0,0 @@
-/*
- * asapplug.c - ASAP plugin for Audacious
- *
- * Copyright (C) 2010-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <pthread.h>
-#include <glib.h>
-#include <audacious/plugin.h>
-#include <libaudcore/audstrings.h>
-
-#if !defined(_AUD_PLUGIN_VERSION) && defined(__AUDACIOUS_PLUGIN_API__)
-#define _AUD_PLUGIN_VERSION  __AUDACIOUS_PLUGIN_API__
-#define _AUD_PLUGIN_VERSION_MIN  __AUDACIOUS_PLUGIN_API__
-#endif
-#if _AUD_PLUGIN_VERSION_MIN < 40
-#include <gtk/gtk.h>
-#endif
-
-#include "asap.h"
-
-#define BITS_PER_SAMPLE  16
-
-static pthread_mutex_t control_mutex = PTHREAD_MUTEX_INITIALIZER;
-static ASAP *asap;
-
-#if _AUD_PLUGIN_VERSION >= 18
-static gboolean playing;
-#else
-#define playing playback->playing
-#endif
-
-static
-#if _AUD_PLUGIN_VERSION >= 18
-	gboolean
-#else
-	void
-#endif
-	plugin_init(void)
-{
-	asap = ASAP_New();
-#if _AUD_PLUGIN_VERSION >= 18
-	return asap != NULL;
-#endif
-}
-
-static void plugin_cleanup(void)
-{
-	ASAP_Delete(asap);
-}
-
-#if _AUD_PLUGIN_VERSION_MIN < 40
-static void plugin_about(void)
-{
-	static GtkWidget *aboutbox = NULL;
-	if (aboutbox == NULL) {
-		aboutbox = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s",
-			ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT);
-		gtk_window_set_title((GtkWindow *) aboutbox, "About ASAP plugin " ASAPInfo_VERSION);
-		g_signal_connect(aboutbox, "response", (GCallback) gtk_widget_destroy, NULL);
-		g_signal_connect(aboutbox, "destroy", (GCallback) gtk_widget_destroyed, &aboutbox);
-	}
-	gtk_window_present((GtkWindow *) aboutbox);
-}
-#endif
-
-static gboolean is_our_file_from_vfs(const char *filename, VFSFile *file)
-{
-	return ASAPInfo_IsOurFile(filename);
-}
-
-static int load_module(const char *filename, VFSFile *file, unsigned char *module)
-{
-	int module_len;
-	if (file != NULL)
-		return vfs_fread(module, 1, ASAPInfo_MAX_MODULE_LENGTH, file);
-	file = vfs_fopen(filename, "rb");
-	if (file == NULL)
-		return -1;
-	module_len = vfs_fread(module, 1, ASAPInfo_MAX_MODULE_LENGTH, file);
-	vfs_fclose(file);
-	return module_len;
-}
-
-#if _AUD_PLUGIN_VERSION >= 37
-static char *filename_split_subtune(const char *filename, int *song)
-{
-	const char *sub;
-	uri_parse(filename, NULL, NULL, &sub, song);
-	return g_strndup(filename, sub - filename);
-}
-#else
-#define tuple_set_int  tuple_associate_int
-#define tuple_set_str  tuple_associate_string
-#endif
-
-static void tuple_set_nonblank(Tuple *tuple, int nfield, const char *value)
-{
-	if (value[0] != '\0')
-		tuple_set_str(tuple, nfield, NULL, value);
-}
-
-static Tuple *probe_for_tuple(const char *filename, VFSFile *file)
-{
-	int song = -1;
-	unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAPInfo *info = NULL;
-	Tuple *tuple = NULL;
-	int songs;
-	int duration;
-	int year;
-
-#if _AUD_PLUGIN_VERSION >= 10
-	char *real_filename = filename_split_subtune(filename, &song);
-	if (real_filename != NULL)
-		filename = real_filename;
-#endif
-	module_len = load_module(filename, file, module);
-	if (module_len > 0) {
-		info = ASAPInfo_New();
-		if (info != NULL && ASAPInfo_Load(info, filename, module, module_len))
-			tuple = tuple_new_from_filename(filename);
-	}
-#if _AUD_PLUGIN_VERSION >= 10
-	g_free(real_filename);
-#endif
-	if (tuple == NULL) {
-		ASAPInfo_Delete(info);
-		return NULL;
-	}
-
-	tuple_set_nonblank(tuple, FIELD_ARTIST, ASAPInfo_GetAuthor(info));
-	tuple_set_nonblank(tuple, FIELD_TITLE, ASAPInfo_GetTitleOrFilename(info));
-	tuple_set_nonblank(tuple, FIELD_DATE, ASAPInfo_GetDate(info));
-	tuple_set_str(tuple, FIELD_CODEC, NULL, "ASAP");
-	songs = ASAPInfo_GetSongs(info);
-	if (song > 0) {
-		tuple_set_int(tuple, FIELD_SUBSONG_ID, NULL, song);
-		tuple_set_int(tuple, FIELD_SUBSONG_NUM, NULL, songs);
-		song--;
-	}
-	else {
-		if (songs > 1) {
-#if _AUD_PLUGIN_VERSION >= 37
-			tuple_set_subtunes(tuple, songs, NULL);
-#else
-			tuple->nsubtunes = songs;
-#endif
-		}
-		song = ASAPInfo_GetDefaultSong(info);
-	}
-	duration = ASAPInfo_GetDuration(info, song);
-	if (duration > 0)
-		tuple_set_int(tuple, FIELD_LENGTH, NULL, duration);
-	year = ASAPInfo_GetYear(info);
-	if (year > 0)
-		tuple_set_int(tuple, FIELD_YEAR, NULL, year);
-	ASAPInfo_Delete(info);
-	return tuple;
-}
-
-#if _AUD_PLUGIN_VERSION < 18
-static Tuple *get_song_tuple(const char *filename)
-{
-	return probe_for_tuple(filename, NULL);
-}
-#endif
-
-static gboolean play_start(InputPlayback *playback, const char *filename, VFSFile *file, int start_time, int stop_time, gboolean pause)
-{
-	int song = -1;
-	unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	gboolean ok;
-	const ASAPInfo *info;
-	int channels;
-
-#if _AUD_PLUGIN_VERSION >= 10
-	char *real_filename = filename_split_subtune(filename, &song);
-	if (real_filename != NULL)
-		filename = real_filename;
-#endif
-	module_len = load_module(filename, file, module);
-	ok = module_len > 0 && ASAP_Load(asap, filename, module, module_len);
-#if _AUD_PLUGIN_VERSION >= 10
-	g_free(real_filename);
-#endif
-	if (!ok)
-		return FALSE;
-
-	info = ASAP_GetInfo(asap);
-	channels = ASAPInfo_GetChannels(info);
-	if (song > 0)
-		song--;
-	else
-		song = ASAPInfo_GetDefaultSong(info);
-	if (stop_time < 0)
-		stop_time = ASAPInfo_GetDuration(info, song);
-	if (!ASAP_PlaySong(asap, song, stop_time))
-		return FALSE;
-	if (start_time > 0)
-		ASAP_Seek(asap, start_time);
-
-	if (!playback->output->open_audio(BITS_PER_SAMPLE == 8 ? FMT_U8 : FMT_S16_LE, ASAP_SAMPLE_RATE, channels))
-		return FALSE;
-	playback->set_params(playback,
-#if _AUD_PLUGIN_VERSION < 18
-		NULL, 0,
-#endif
-		0, ASAP_SAMPLE_RATE, channels);
-	if (pause)
-		playback->output->pause(TRUE);
-	playing = TRUE;
-	playback->set_pb_ready(playback);
-
-	for (;;) {
-		static unsigned char buffer[4096];
-		int len;
-		pthread_mutex_lock(&control_mutex);
-		if (!playing) {
-			pthread_mutex_unlock(&control_mutex);
-			break;
-		}
-		len = ASAP_Generate(asap, buffer, sizeof(buffer), BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-		pthread_mutex_unlock(&control_mutex);
-		if (len <= 0) {
-#if _AUD_PLUGIN_VERSION < 18
-			playback->eof = TRUE;
-#endif
-			break;
-		}
-#if _AUD_PLUGIN_VERSION >= 14
-		playback->output->write_audio(buffer, len);
-#else
-		playback->pass_audio(playback, BITS_PER_SAMPLE == 8 ? FMT_U8 : FMT_S16_LE, channels, len, buffer, NULL);
-#endif
-	}
-
-#if _AUD_PLUGIN_VERSION_MIN < 40
-	while (playing && playback->output->buffer_playing())
-		g_usleep(10000);
-#endif
-	pthread_mutex_lock(&control_mutex);
-	playing = FALSE;
-	pthread_mutex_unlock(&control_mutex);
-#if _AUD_PLUGIN_VERSION_MIN < 40
-	playback->output->close_audio();
-#endif
-	return TRUE;
-}
-
-#if _AUD_PLUGIN_VERSION < 18
-static void play_file(InputPlayback *playback)
-{
-	play_start(playback, playback->filename, NULL, 0, -1, FALSE);
-}
-#endif
-
-static void play_pause(InputPlayback *playback,
-#if _AUD_PLUGIN_VERSION >= 18
-	gboolean
-#else
-	gshort
-#endif
-	pause)
-{
-	pthread_mutex_lock(&control_mutex);
-	if (playing)
-		playback->output->pause(pause);
-	pthread_mutex_unlock(&control_mutex);
-}
-
-static void play_mseek(InputPlayback *playback,
-#if _AUD_PLUGIN_VERSION >= 18
-	int
-#else
-	gulong
-#endif
-	time)
-{
-	pthread_mutex_lock(&control_mutex);
-	if (playing) {
-		ASAP_Seek(asap, time);
-#if _AUD_PLUGIN_VERSION >= 15
-		playback->output->abort_write();
-#endif
-	}
-	pthread_mutex_unlock(&control_mutex);
-}
-
-static void play_stop(InputPlayback *playback)
-{
-	pthread_mutex_lock(&control_mutex);
-	if (playing) {
-#if _AUD_PLUGIN_VERSION >= 15
-		playback->output->abort_write();
-#endif
-		playing = FALSE;
-	}
-	pthread_mutex_unlock(&control_mutex);
-}
-
-#pragma GCC diagnostic ignored "-Wunused-result"
-static void write_byte(void *obj, int data)
-{
-	VFSFile *file = (VFSFile *) obj;
-	const char buf[1] = { data };
-	vfs_fwrite(buf, 1, 1, file);
-}
-
-static gboolean update_song_tuple(const Tuple * tuple, VFSFile *file)
-{
-#if _AUD_PLUGIN_VERSION < 38
-#define vfs_get_filename(file)  g_filename_from_uri(file->uri, NULL, NULL)
-#define tuple_get_str  tuple_get_string
-#define str_unref(s)
-	const char *s;
-#else
-	char *s;
-#endif
-	/* read file */
-	const char *filename = vfs_get_filename(file);
-	unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len = load_module(filename, file, module);
-	ASAPInfo *info;
-	int year;
-	ByteWriter bw;
-	gboolean ok;
-	if (module_len <= 0)
-		return FALSE;
-	info = ASAPInfo_New();
-	if (info == NULL)
-		return FALSE;
-	if (!ASAPInfo_Load(info, filename, module, module_len)) {
-		ASAPInfo_Delete(info);
-		return FALSE;
-	}
-
-	/* apply new tags */
-	s = tuple_get_str(tuple, FIELD_ARTIST, NULL);
-	if (s != NULL) {
-		if (!ASAPInfo_SetAuthor(info, s)) {
-			str_unref(s);
-			ASAPInfo_Delete(info);
-			return FALSE;
-		}
-		str_unref(s);
-	}
-	else
-		ASAPInfo_SetAuthor(info, "");
-	s = tuple_get_str(tuple, FIELD_TITLE, NULL);
-	if (s != NULL) {
-		if (!ASAPInfo_SetTitle(info, s)) {
-			str_unref(s);
-			ASAPInfo_Delete(info);
-			return FALSE;
-		}
-		str_unref(s);
-	}
-	else
-		ASAPInfo_SetTitle(info, "");
-	year = tuple_get_int(tuple, FIELD_YEAR, NULL);
-	if (year == 0)
-		year = -1;
-	/* check if year changed so that we don't lose other date parts */
-	if (year != ASAPInfo_GetYear(info)) {
-		if (year <= 0)
-			ASAPInfo_SetDate(info, "");
-		else {
-			char d[16];
-			sprintf(d, "%d", year);
-			ASAPInfo_SetDate(info, d);
-		}
-	}
-
-	/* write file */
-	vfs_rewind(file);
-	bw.obj = file;
-	bw.func = write_byte;
-	ok = ASAPWriter_Write(filename, bw, info, module, module_len, TRUE) && vfs_ftruncate(file, vfs_ftell(file)) == 0;
-	ASAPInfo_Delete(info);
-	return ok;
-}
-
-static
-#if _AUD_PLUGIN_VERSION >= 16
-	const
-#endif
-	char *exts[] = { "sap", "cmc", "cm3", "cmr", "cms", "dmc", "dlt", "mpt", "mpd", "rmt", "tmc", "tm8", "tm2", "fc", NULL };
-
-#ifdef _WIN32
-/* For some strange reason, it doesn't get exported without it. It wasn't necessary for Audacious 3.2... */
-__declspec(dllexport) InputPlugin *get_plugin_info(AudAPITable *);
-#endif
-
-#if _AUD_PLUGIN_VERSION >= 30
-
-AUD_INPUT_PLUGIN
-(
-	.name = "ASAP",
-	.init = plugin_init,
-	.cleanup = plugin_cleanup,
-#if _AUD_PLUGIN_VERSION_MIN >= 40
-	.about_text = "ASAP " ASAPInfo_VERSION "\n" ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT,
-#else
-	.about = plugin_about,
-#endif
-	.have_subtune = TRUE,
-	.extensions = exts,
-	.is_our_file_from_vfs = is_our_file_from_vfs,
-	.probe_for_tuple = probe_for_tuple,
-	.play = play_start,
-	.pause = play_pause,
-	.mseek = play_mseek,
-	.stop = play_stop,
-	.update_song_tuple = update_song_tuple
-);
-
-#else
-
-static InputPlugin asap_ip = {
-	.description = "ASAP Plugin",
-	.init = plugin_init,
-	.cleanup = plugin_cleanup,
-	.about = plugin_about,
-	.have_subtune = TRUE,
-	.vfs_extensions = exts,
-	.is_our_file_from_vfs = is_our_file_from_vfs,
-#if _AUD_PLUGIN_VERSION >= 16
-	.probe_for_tuple = probe_for_tuple,
-	.play = play_start,
-#endif
-#if _AUD_PLUGIN_VERSION < 18
-	.get_song_tuple = get_song_tuple,
-	.play_file = play_file,
-#endif
-	.pause = play_pause,
-	.mseek = play_mseek,
-	.stop = play_stop,
-	.update_song_tuple = update_song_tuple
-};
-
-static InputPlugin *asap_iplist[] = { &asap_ip, NULL };
-
-SIMPLE_INPUT_PLUGIN(ASAP, asap_iplist)
-
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/audacious/audacious.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/audacious/audacious.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/audacious/audacious.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/audacious/audacious.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-AUDACIOUS_VERSION := $(shell pkg-config --modversion audacious 2>/dev/null)
-AUDACIOUS_CFLAGS = `pkg-config --cflags $(if $(filter 2.%,$(AUDACIOUS_VERSION)),gtk+-2.0 libmowgli,gtk+-3.0)`
-AUDACIOUS_INPUT_PLUGIN_DIR = `pkg-config --variable=input_plugin_dir audacious`
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "audacious.mk")
-endif
-
-asap-audacious: asapplug-$(AUDACIOUS_VERSION).so
-.PHONY: asap-audacious
-
-asapplug-$(AUDACIOUS_VERSION).so: $(call src,audacious/asapplug.c asap.[ch])
-ifndef AUDACIOUS_VERSION
-	$(error Please install audacious-dev or audacious-devel)
-endif
-	$(CC) $(AUDACIOUS_CFLAGS)
-CLEAN += asapplug-*.so
-
-install-audacious: asapplug-$(AUDACIOUS_VERSION).so
-	$(call INSTALL_PROGRAM,asapplug-$(AUDACIOUS_VERSION).so,$(AUDACIOUS_INPUT_PLUGIN_DIR),asapplug.so)
-.PHONY: install-audacious
-
-uninstall-audacious:
-	$(RM) $(DESTDIR)$(AUDACIOUS_INPUT_PLUGIN_DIR)/asapplug.so
-.PHONY: uninstall-audacious
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/chksap.pl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/chksap.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/chksap.pl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/chksap.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,714 +0,0 @@
-#!/usr/bin/perl
-
-=head1 NAME
-
-chksap - check, fix or calculate statistics for *.sap files
-
-=head1 SYNOPSIS
-
-  perl chksap.pl option... file...
-
-=head1 DESCRIPTION
-
-I<chksap> processes SAP (Slight Atari Player) files.
-It can operate in one of three modes: check file format conformance,
-fix errors automatically, compute statistics.
-
-You must select a mode using one of the options described below
-and pass names of files or directories to be processed.
-Directories are processed recursively, but only C<*.sap> files
-are analyzed.
-
-=head1 OPTIONS
-
-Exactly one of the following options should be used to select
-the operation:
-
-=over 4
-
-=item B<-c>, B<--check>
-
-Display the errors found for each file.  Does not display anything
-for correct files.
-
-=item B<-f>, B<--fix>
-
-Try to automatically fix errors.  Shows descriptions for the fixed
-errors and the errors that cannot be fixed automatically.
-
-B<Warning:> files are modified in-place and no backup copies are made.
-Make backups yourself before using this option!
-
-=item B<-s>, B<--statistics>
-
-Compute and display statistics.
-
-=back
-
-The following options are available in any mode:
-
-=over 4
-
-=item B<-p>, B<--progress>
-
-Print name of the currently processed file.
-
-=back
-
-In the fix mode the following options are available:
-
-=over 4
-
-=item B<-t>, B<--time>
-
-For files that have no TIME tag detects playback time using an external
-program "asapscan" and stores it in TIME tags.
-
-=item B<-T>, B<--overwrite-time>
-
-Detects playback time using an external program "asapscan" and stores it
-in TIME tags, possibly overwriting the current values.
-
-=back
-
-In the statistics mode the following options are available:
-
-=over 4
-
-=item B<-t>, B<--time>
-
-Lists files with no TIME tags.
-
-=item B<-u>, B<--features>
-
-Lists files with rarely used POKEY and 6502 features.
-
-=back
-
-The following options display some text and terminate the program
-without file operations:
-
-=over 4
-
-=item B<-h>, B<--help>
-
-Display usage summary.
-
-=item B<-v>, B<--version>
-
-Display program version.
-
-=back
-
-=head1 ERRORS FIXED AUTOMATICALLY
-
-=over 4
-
-=item B<line terminators within header are not CRLF>
-
-The lines of the header should be separated with CR/LF pairs
-and not just LF or CR characters.
-
-=item B<header not terminated with CRLF>
-
-The last line of the header is not terminated with CR/LF.
-
-=item B<extra whitespace within header>
-
-There should be exactly one space between the tag name
-and its argument. There should be no spaces after the argument.
-
-=item B<missing AUTHOR, NAME or DATE tag>
-
-Although AUTHOR, NAME and DATE have no meaning to SAP players,
-they should always appear in the file.  If the value is unknown,
-C<<"<?>">> should be used.
-
-=item B<blank AUTHOR, NAME or DATE argument>
-
-If the value is unknown, it should not be empty or consist
-of only question marks - use C<<"<?>">> instead.
-
-=item B<SONGS 1 is superfluous>
-
-C<SONGS> tag with the argument of 1 is meaningless
-because the number of songs defaults to 1.
-
-=item B<DEFSONG 0 is superfluous>
-
-C<DEFSONG> tag with the argument of 0 is meaningless
-because the default song defaults to 0.
-
-=item B<hexadecimal values should be 4-digit>
-
-The arguments of INIT, PLAYER, MUSIC and COVOX should specify all 4 digits.
-
-=item B<hexadecimal values should be uppercase>
-
-The arguments of INIT, PLAYER, MUSIC and COVOX should use C<A-F> letters
-rather than C<a-f>.
-
-=item B<non-standard order of tags>
-
-The order of tags is of little importance, but making some assumptions
-about it makes it easier to create new tools that process SAP files.
-The canonical order is: first SAP, then AUTHOR, then NAME, then DATE.
-After DATE, the following tags should be used in any order: SONGS, TYPE,
-FASTPLAY, STEREO and NTSC.  DEFSONG must appear after SONGS.
-The tags that should appear last are: INIT, PLAYER, MUSIC and COVOX,
-in any order.
-
-=item B<FFFF inside binary part>
-
-Two C<0xFF> bytes start the binary part but are redundant
-inside it.
-
-=item B<garbage bytes at the end>
-
-There are extra bytes after the last binary block, but less than 4 necessary
-to form a new block header.
-
-=item B<truncated binary block>
-
-There are not enough bytes in the file to fill the last binary block.
-
-=back
-
-=head1 ERRORS THAT CANNOT BE FIXED AUTOMATICALLY
-
-=over 4
-
-=item B<filename too long>
-
-For portability, filenames should be limited to 26 characters
-(plus C<.sap>).
-
-=item B<illegal characters in filename>
-
-Filenames should consist of letters (C<A-Z> and C<a-z>),
-digits (C<0-9>) and underscore characters (C<_>).
-
-=item B<file too long>
-
-File should not exceed 63 KB (64512 bytes).  This is because only 62 KB
-base RAM is available for use in Atari XL/XE machines (2 KB is reserved
-for I/O area) and the SAP header should be no longer than 1 KB.
-
-=item B<missing SAP header>
-
-The file does not begin with C<SAP>.
-
-=item B<missing binary part>
-
-Two C<0xFF> bytes were not found in the file.
-
-=item B<unknown header line: ...>
-
-A line of the header does not start with an uppercase tag name.
-
-=item B<unexpected argument of SAP, STEREO or NTSC>
-
-SAP, STEREO and NTSC tags should have no argument.
-
-=item B<invalid argument of AUTHOR, NAME or DATE>
-
-The arguments of these tags should be wrapped in double quotes
-and should consist of ASCII characters between space and lowercase 'z',
-except for the double quote and backtick (0x60) characters.
-Moreover, no argument should be longer than 122 characters
-(including quotes).
-
-=item B<invalid argument of SONGS>
-
-The argument of SONGS must be an integer within the range 2-255.
-
-=item B<invalid argument of DEFSONG>
-
-The argument of DEFSONG must be an integer greater than zero
-and less than the argument of SONGS.
-
-=item B<missing TYPE tag>
-
-This tag is mandatory.
-
-=item B<invalid argument of TYPE>
-
-The currently defined types are: B, C, D, S.
-
-=item B<invalid argument of FASTPLAY>
-
-The argument of FASTPLAY must be an integer within the range 1-32767.
-
-=item B<INIT is meaningless with TYPE C>
-
-C<TYPE C> uses PLAYER and MUSIC tags, but not INIT.
-
-=item B<MUSIC is meaningful only with TYPE C>
-
-The MUSIC tag should be used only with C<TYPE C>.
-
-=item B<missing PLAYER tag>
-
-The PLAYER tag is mandatory for C<TYPE B> and C<TYPE C>.
-
-=item B<invalid argument of INIT, PLAYER, MUSIC or COVOX>
-
-The argument of these tags must be 4-digit hexadecimal number.
-
-=item B<duplicate tag: ...>
-
-The same tag appears several times within the header.
-
-=item B<unknown tag: ...>
-
-Known tags are: SAP, AUTHOR, NAME, DATE, SONGS, DEFSONG, TYPE, FASTPLAY,
-STEREO, NTSC, INIT, PLAYER, MUSIC, COVOX.
-
-=item B<duplicate FFFF in the binary part>
-
-A binary block starts with four C<0xFF> bytes.
-
-=item B<block end address less than start address>
-
-Each binary block begins with a header that specifies the addresses
-of the first and the last byte in the block. The end address must not
-be less than the start address.
-
-=back
-
-=head1 BUGS
-
-The checks are more strict than necessary, which is a good thing.
-
-=head1 AUTHOR
-
-Piotr Fusik C<fox@scene.pl>.
-
-=cut
-
-use File::Find;
-use File::Spec;
-use Getopt::Long;
-use Pod::Usage;
-use strict;
-
-my $VERSION = '3.1.5';
-my $asapscan = File::Spec->rel2abs('asapscan');
-my ($check, $fix, $stat) = (0, 0, 0);
-my ($progress, $time, $overwrite_time, $features, $help, $version) = (0, 0, 0, 0, 0, 0);
-my ($total_files, $sap_files, $stereo_files, $ntsc_files) = (0, 0, 0, 0);
-my ($total_length, $min_length, $max_length) = (0, 100_000, 0);
-my ($min_filename, $max_filename);
-my ($time_files, $total_millis) = (0, 0);
-my (@fixed_messages, @notfixed_messages, @fatal_messages, @no_time_files);
-my (%stat, %types, %features);
-
-sub process($$) {
-	my ($filename, $fullpath) = @_;
-	my (%fixed, %fatal);
-	my $sap;
-	print STDERR "$fullpath\n" if $progress;
-	open F, '<', $filename and binmode F and read F, $sap, 64513 and close F
-		or die "$filename: $!\n";
-	{
-		++$total_files;
-		my $len = length($sap);
-		if ($len > 64512) {
-			$fatal{'file too long'} = 1;
-			last;
-		}
-		$fatal{'filename too long'} = 1 if length($filename) > 30;
-		if ($filename !~ /^\w+\.sap$/is) {
-			$fatal{'illegal characters in filename'} = 1;
-		}
-		if ($sap !~ /^SAP\W/s) {
-			$fatal{'missing SAP header'} = 1;
-			last;
-		}
-		if ($sap !~ /^(.+?)\xFF\xFF(.{5,})$/s) {
-			$fatal{'missing binary part'} = 1;
-			last;
-		}
-		++$sap_files;
-		$total_length += $len;
-		if ($min_length > $len) {
-			$min_length = $len;
-			$min_filename = $filename;
-		}
-		if ($max_length < $len) {
-			$max_length = $len;
-			$max_filename = $filename;
-		}
-		my ($hdr, $bin) = ($1, $2);
-		if ($hdr =~ /\x0D[^\x0A]|[^\x0D]\x0A/) {
-			$fixed{'line terminators within header are not CRLF'} = 1;
-		}
-		if ($hdr !~ s/\x0D\x0A$//s) {
-			$fixed{'header not terminated with CRLF'} = 1;
-		}
-		my %tags;
-		my @times;
-		for (split /[\x0D\x0A]+/, $hdr) {
-			my ($tag, $spaces1, $arg, $spaces2);
-			unless (($tag, $spaces1, $arg, $spaces2) =
-				/^([A-Z]+)(?:( +)(.+?))?( *)$/s) {
-				$fatal{"unknown header line: $_"} = 1;
-				next;
-			}
-			if (length($spaces1) > 1 || $spaces2) {
-				$fixed{'extra whitespace within header'} = 1;
-			}
-			if (exists($tags{$tag})) {
-				$fatal{"duplicate tag: $tag"} = 1;
-				next;
-			}
-			if ($tag eq 'SAP') {
-				$fatal{'unexpected argument of SAP'} = 1 if $arg ne '';
-			}
-			elsif ($tag eq 'AUTHOR') {
-				++$stat{'AUTHOR'}{$arg};
-				if ($arg !~ /^"[ -_a-z|]{0,120}"$/s) {
-					$fatal{'invalid argument of AUTHOR'} = 1;
-				}
-				elsif ($arg =~ /^"\?*"$/s) {
-					$fixed{'blank AUTHOR argument'} = 1;
-					$arg = '"<?>"';
-				}
-			}
-			elsif ($tag eq 'NAME') {
-				++$stat{'NAME'}{$arg};
-				exists($tags{'AUTHOR'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg !~ /^"[ -_a-z|]{0,120}"$/s) {
-					$fatal{'invalid argument of NAME'} = 1;
-				}
-				elsif ($arg =~ /^"\?*"$/s) {
-					$fixed{'blank NAME argument'} = 1;
-					$arg = '"<?>"';
-				}
-			}
-			elsif ($tag eq 'DATE') {
-				++$stat{'DATE'}{$arg};
-				exists($tags{'NAME'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg !~ /^"[ -_a-z|]{0,120}"$/s) {
-					$fatal{'invalid argument of DATE'} = 1;
-				}
-				elsif ($arg =~ /^"\?*"$/s) {
-					$fixed{'blank DATE argument'} = 1;
-					$arg = '"<?>"';
-				}
-			}
-			elsif ($tag eq 'SONGS') {
-				++$stat{'SONGS'}{$arg};
-				exists($tags{'DATE'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg !~ /^[1-9]\d*$/s || $arg > 255) {
-					$fatal{'invalid argument of SONGS'} = 1;
-				}
-				elsif ($arg eq '1') {
-					$fixed{'SONGS 1 is superfluous'} = 1;
-					next;
-				}
-			}
-			elsif ($tag eq 'DEFSONG') {
-				exists($tags{'SONGS'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg eq '0') {
-					$fixed{'DEFSONG 0 is superfluous'} = 1;
-					next;
-				}
-				if ($arg !~ /^[1-9]\d*$/s) {
-					$fatal{'invalid argument of DEFSONG'} = 1;
-				}
-			}
-			elsif ($tag eq 'TYPE') {
-				exists($tags{'DATE'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg !~ /^[BCDS]$/s) {
-					$fatal{'invalid argument of TYPE'} = 1;
-				}
-			}
-			elsif ($tag eq 'FASTPLAY') {
-				++$stat{'FASTPLAY'}{$arg};
-				exists($tags{'DATE'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg !~ /^[1-9]\d*$/s || $arg > 32767) {
-					$fatal{'invalid argument of FASTPLAY'} = 1;
-				}
-			}
-			elsif ($tag eq 'STEREO') {
-				++$stereo_files;
-				exists($tags{'DATE'})
-					or $fixed{'non-standard order of tags'} = 1;
-				$fatal{'unexpected argument of STEREO'} = 1 if $arg ne '';
-			}
-			elsif ($tag eq 'NTSC') {
-				++$ntsc_files;
-				exists($tags{'DATE'})
-					or $fixed{'non-standard order of tags'} = 1;
-				$fatal{'unexpected argument of NTSC'} = 1 if $arg ne '';
-			}
-			elsif ($tag eq 'INIT' || $tag eq 'PLAYER' || $tag eq 'MUSIC' || $tag eq 'COVOX') {
-				exists($tags{'TYPE'})
-					or $fixed{'non-standard order of tags'} = 1;
-				if ($arg !~ /^[0-9A-Fa-f]{1,4}$/s) {
-					$fatal{"invalid argument of $tag"} = 1;
-				}
-				elsif (length($arg) != 4) {
-					$arg = sprintf('%04X', hex($arg));
-					$fixed{'hexadecimal values should be 4-digit'} = 1;
-				}
-				elsif ($arg =~ y/a-f/A-F/) {
-					$fixed{'hexadecimal values should be uppercase'} = 1;
-				}
-			}
-			elsif ($tag eq 'TIME') {
-				if ($arg !~ /^\d?\d:\d\d(?:\.\d\d\d?)?(?: LOOP)?$/s) {
-					$fatal{'invalid argument of TIME'} = 1;
-				}
-				push @times, $arg;
-				next;
-			}
-			else {
-				$fatal{"unknown tag: $tag"} = 1;
-				next;
-			}
-			$tags{$tag} = $arg;
-		}
-		$fatal{'invalid argument of DEFSONG'} = 1
-			if exists($tags{'SONGS'}) && $tags{'DEFSONG'} >= $tags{'SONGS'};
-		if (exists($tags{'TYPE'})) {
-			my $type = $tags{'TYPE'};
-			$fatal{'INIT is meaningless with TYPE C'} = 1
-				if $type eq 'C' && exists($tags{'INIT'});
-			$fatal{'MUSIC is meaningful only with TYPE C'} = 1
-				if $type ne 'C' && exists($tags{'MUSIC'});
-			$fatal{'missing PLAYER tag'} = 1
-				if ($type eq 'B' || $type eq 'C') && !exists($tags{'PLAYER'});
-		}
-		else {
-			$fatal{'missing TYPE tag'} = 1;
-		}
-		++$types{$tags{'TYPE'}}{exists($tags{'STEREO'})?'stereo':'mono'};
-		my $i = 0;
-		for (;;) {
-			my $bh = substr($bin, $i, 5);
-			if (length($bh) < 5) {
-				if ($bh ne '') {
-					substr($bin, $i) = '';
-					$fixed{'garbage bytes at the end'} = 1;
-				}
-				last;
-			}
-			my ($start, $end) = unpack('vv', $bh);
-			if ($start == 0xffff) {
-				$fatal{'duplicate FFFF in the binary part'} = 1;
-				last;
-			}
-			if ($end < $start) {
-				$fatal{'block end address less than start address'} = 1;
-				last;
-			}
-			my $ni = $i + 5 + $end - $start;
-			if ($ni > length($bin)) {
-				substr($bin, $i + 2, 2) =
-					pack('v', $start + length($bin) - $i - 5);
-				$fixed{'truncated binary block'} = 1;
-				last;
-			}
-			$i = $ni;
-			if (substr($bin, $i, 2) eq "\xFF\xFF") {
-				substr($bin, $i, 2) = '';
-				$fixed{'FFFF inside binary part'} = 1;
-			}
-		}
-		if (%fixed || ($fix && $time && !@times) || $overwrite_time) {
-			if (%fatal) {
-				push @notfixed_messages,
-					"$fullpath (" . join('; ', sort(keys(%fixed))) . ")\n";
-			}
-			else {
-				if ($fix) {
-					if (($time && !@times) || $overwrite_time) {
-						my $times = `$asapscan -t $filename`;
-						if (!$times) {
-							$fatal{'error running asapscan'} = 1;
-						}
-						elsif ($times =~ /^(?:TIME \d?\d:\d\d(?:\.\d\d\d?)?(?: LOOP)?\r?\n)+$/s) {
-							my @new_times = $times =~ /\d?\d:\d\d(?:\.\d\d\d?)?(?: LOOP)?/gs;
-							if (!@times) {
-								@times = @new_times;
-								$fixed{'added TIME tags'} = 1;
-							}
-							elsif ("@new_times" ne "@times") {
-								@times = @new_times;
-								$fixed{'changed TIME tags'} = 1;
-							}
-						}
-						else {
-							$fatal{'cannot detect TIME'} = 1;
-						}
-					}
-					if (%fixed) {
-						open F, '>', $filename and binmode F
-							or die "$filename: $!\n";
-						print F "SAP\x0D\x0A";
-						for ('AUTHOR', 'NAME', 'DATE') {
-							if (exists($tags{$_})) {
-								print F "$_ $tags{$_}\x0D\x0A";
-							}
-							else {
-								$fixed{"missing $_ tag"} = 1;
-								print F "$_ \"<?>\"\x0D\x0A";
-							}
-						}
-						print F "SONGS $tags{'SONGS'}\x0D\x0A"
-							if exists($tags{'SONGS'});
-						print F "DEFSONG $tags{'DEFSONG'}\x0D\x0A"
-							if exists($tags{'DEFSONG'});
-						print F "STEREO\x0D\x0A" if exists($tags{'STEREO'});
-						print F "NTSC\x0D\x0A" if exists($tags{'NTSC'});
-						for ('TYPE', 'FASTPLAY', 'INIT', 'MUSIC', 'PLAYER', 'COVOX') {
-							print F "$_ $tags{$_}\x0D\x0A" if exists($tags{$_});
-						}
-						for (@times) {
-							print F "TIME $_\x0D\x0A";
-						}
-						print F "\xFF\xFF", $bin;
-						close F or die "$filename: $!\n";
-					}
-				}
-				if (%fixed) {
-					push @fixed_messages,
-						"$fullpath (" . join('; ', sort(keys(%fixed))) . ")\n";
-				}
-			}
-		}
-		if (@times) {
-			++$time_files;
-			for (@times) {
-				my ($minutes, $seconds, $hundredths, $millis) = /(\d?\d):(\d\d)(?:\.(\d\d)(\d?))?/;
-				$total_millis += 60_000 * $minutes + 1000 * $seconds + $hundredths * 10 + $millis;
-			}
-		}
-		elsif ($stat && $time) {
-			push @no_time_files, $fullpath
-		}
-	}
-	if ($features) {
-		my @features = `$asapscan -f -u $filename`;
-		if ($?) {
-			$fatal{'error running asapscan'} = 1;
-		}
-		else {
-			s/\s+$//, push @{$features{$_}}, $fullpath for @features;
-		}
-	}
-	if (%fatal) {
-		push @fatal_messages,
-			"$fullpath (" . join('; ', sort(keys(%fatal))) . ")\n";
-	}
-}
-
-sub wanted() {
-	process($_, $File::Find::name) if /\.sap$/is;
-}
-
-Getopt::Long::Configure('bundling');
-GetOptions(
-	'check|c' => \$check,
-	'fix|f' => \$fix,
-	'statistics|s' => \$stat,
-	'progress|p' => \$progress,
-	'time|t' => \$time,
-	'overwrite-time|T' => \$overwrite_time,
-	'features|u' => \$features,
-	'help|h' => \$help,
-	'version|v' => \$version,
-) or pod2usage(2);
-
-pod2usage({ -verbose => 1, -exitval => 0 }) if $help;
-if ($version) {
-	print "chksap $VERSION\n";
-	exit 0;
-}
-
-pod2usage(2) if $check + $fix + $stat != 1 || $time > $fix +$stat || $overwrite_time > $fix || @ARGV == 0;
-
-find(\&wanted, @ARGV);
-
-print "Files processed:              $total_files\n";
-print "Not recognized as valid SAP:  ",
-	$total_files - $sap_files, "\n" if $sap_files != $total_files;
-if ($check) {
-	print "Bad files that can be fixed automatically:    ",
-		scalar(@fixed_messages), "\n";
-	print "Bad files that cannot be fixed automatically: ",
-		scalar(@fatal_messages), "\n";
-	print "\nPossible automatic fixes:\n",
-		@fixed_messages if @fixed_messages;
-	print "\nAutomatic fix not possible:\n",
-		@fatal_messages if @fatal_messages;
-	print "\nCan fix automatically after correcting previous errors:\n",
-		@notfixed_messages if @notfixed_messages;
-}
-elsif ($fix) {
-	print "Bad files fixed automatically:                ",
-		scalar(@fixed_messages), "\n";
-	print "Bad files that cannot be fixed automatically: ",
-		scalar(@fatal_messages), "\n";
-	print "\nFixed:\n",
-		@fixed_messages if @fixed_messages;
-	print "\nCannot fix automatically:\n",
-		@fatal_messages if @fatal_messages;
-	print "\nCan fix after correcting previous errors:\n",
-		@notfixed_messages if @notfixed_messages;
-}
-elsif ($stat) {
-	print "Total file size:              $total_length bytes\n";
-	printf "Average file size:            %.0f bytes\n", $total_length / $sap_files if $sap_files;
-	print "Smallest SAP file:            $min_filename ($min_length bytes)\n" if $min_filename;
-	print "Biggest SAP file:             $max_filename ($max_length bytes)\n" if $max_filename;
-	my $ref = $stat{'SONGS'};
-	if ($ref) {
-		print "\nFiles with subsongs:\n";
-		my ($files_with_subsongs, $extra_subsongs);
-		for (sort { $a <=> $b } keys(%$ref)) {
-			next if $_ == 1;
-			my $files = $ref->{$_};
-			printf "%3s subsongs:%4d file%s\n", $_, $files, $files != 1 ? 's' : '';
-			$files_with_subsongs += $files;
-			$extra_subsongs += $files * ($_ - 1);
-		}
-		print "Total: $extra_subsongs extra subsongs in $files_with_subsongs files\n";
-	}
-	printf "\nFiles tagged with TIME:       $time_files (%d days %d hours %d minutes %g seconds)\n",
-		$total_millis / 86_400_000, $total_millis / 3600_000 % 24,
-		$total_millis / 60_000 % 60, $total_millis / 1000 % 60;
-	print "\nStereo SAP files:             $stereo_files\n";
-	print "NTSC SAP files:               $ntsc_files\n";
-	for (sort keys %types) {
-		printf "Type %s:    mono:%5d    stereo:%5d    total:%5d\n", $_,
-			$types{$_}{'mono'}, $types{$_}{'stereo'}, $types{$_}{'mono'} + $types{$_}{'stereo'};
-	}
-	for ('FASTPLAY', 'AUTHOR', 'DATE', 'NAME') {
-		$ref = $stat{$_};
-		if ($ref) {
-			print "\n$_ values:\n";
-			for (sort keys(%$ref)) {
-				printf "%4dx: %s\n", $ref->{$_}, $_;
-			}
-		}
-	}
-	if (@no_time_files) {
-		print "\nFiles with no TIME tags:\n";
-		print "$_\n" for sort @no_time_files;
-	}
-	if ($features) {
-		for (sort keys %features) {
-			print "\nFiles which use $_:\n";
-			print "$_\n" for sort @{$features{$_}};
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/COPYING kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/COPYING
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/COPYING	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/COPYING	1970-01-01 00:00:00.000000000 +0000
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/cpu6502.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/cpu6502.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/cpu6502.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/cpu6502.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,1281 +0,0 @@
-// cpu6502.ci - 6502 CPU emulator
-//
-// Copyright (C) 2010-2011  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// How 6502 registers are stored in this emulator:
-// All variables are int, because modern processors (and Java bytecode)
-// tend to operate more effectively on these type than narrower ones.
-// pc is really an unsigned 16-bit integer.
-// a, x, y and s are unsigned 8-bit integers.
-// Flags are decomposed into three variables for improved performance.
-// c is either 0 or 1.
-// nz contains 6502 flags N and Z.
-// N is set if (nz >= 0x80). Z is set if ((nz & 0xff) == 0).
-// Usually nz is simply assigned the unsigned 8-bit operation result.
-// There are just a few operations (BIT, PLP and RTI) where both N and Z may
-// be set. In these cases, N is reflected by the 8th (not 7th) bit of nz.
-// vdi contains rarely used flags V, D and I, as a combination
-// of VFlag, DFlag and IFlag. Other vdi bits are clear.
-
-// "Unofficial" opcodes are those not documented as "legal" 6502 opcodes.
-// Their operation has been reverse-engineered on Atari 800XL and Atari 65XE.
-// Unofficial opcodes are identical to C64's 6510, except for 0x8b and 0xab.
-// The operation of "unstable" opcodes is partially uncertain.
-// Explanation is welcome.
-
-// Emulation of POKEY timer interrupts is included.
-
-// Two preprocessor symbols may be used to strip the size of this emulator.
-// Define ACPU_NO_DECIMAL to disable emulation of the BCD mode.
-// Define ACPU_NO_UNOFFICIAL to disable emulation of unofficial opcodes.
-
-class Cpu6502
-{
-	int Pc;
-	int A;
-	int X;
-	int Y;
-	int S;
-	int Nz;
-	int C;
-	int Vdi;
-
-	const int VFlag = 0x40;
-	const int DFlag = 0x08;
-	const int IFlag = 0x04;
-	const int ZFlag = 0x02;
-
-	/// Runs 6502 emulation for the specified number of Atari scanlines.
-	/// Each scanline is 114 cycles of which 9 is taken by ANTIC for memory refresh.
-	void DoFrame(ASAP asap, int cycleLimit)
-	{
-		// copy registers from the object to local variables for improved performance
-		int pc = Pc;
-		int nz = Nz;
-		int a = A;
-		int x = X;
-		int y = Y;
-		int c = C;
-		int s = S;
-		int vdi = Vdi;
-
-		while (asap.Cycle < cycleLimit) {
-
-			macro PEEK_MEMORY(addr)       ( asap.Memory[addr] )
-			macro POKE_MEMORY(addr, data) { asap.Memory[addr] = data; }
-
-			macro PEEK_ZPAGE(addr)        ( PEEK_MEMORY((addr) & 0xff) )
-			macro DPEEK_MEMORY(addr)      ( PEEK_MEMORY(addr) + (PEEK_MEMORY((addr) + 1) << 8) )
-
-			macro PEEK(addr)              ( ((addr) & 0xf900) == 0xd000 ? asap.PeekHardware(addr) : PEEK_MEMORY(addr) )
-			macro POKE(addr, data)        { if (((addr) & 0xf900) == 0xd000) asap.PokeHardware(addr, data); else POKE_MEMORY(addr, data); }
-
-			macro PEEK_RMW(dest, addr) {
-				if ((addr) >> 8 == 0xd2) {
-					asap.Cycle--;
-					dest = asap.PeekHardware(addr);
-					asap.PokeHardware(addr, dest);
-					asap.Cycle++;
-				}
-				else
-					dest = PEEK_MEMORY(addr);
-			}
-
-			macro PEEK_CODE()  ( PEEK_MEMORY(pc) )
-			macro FETCH()      ( PEEK_MEMORY(pc++) )
-
-			macro ABSOLUTE()   { addr = FETCH(); addr += FETCH() << 8; }
-			macro ABSOLUTE_X() { addr = FETCH(); addr = (addr + (FETCH() << 8) + x) & 0xffff; }
-			macro ABSOLUTE_Y() { addr = FETCH(); addr = (addr + (FETCH() << 8) + y) & 0xffff; }
-			macro ZPAGE()      { addr = FETCH(); }
-			macro ZPAGE_X()    { addr = (FETCH() + x) & 0xff; }
-			macro ZPAGE_Y()    { addr = (FETCH() + y) & 0xff; }
-			macro INDIRECT_X() { addr = (FETCH() + x) & 0xff; addr = PEEK_MEMORY(addr) + (PEEK_ZPAGE(addr + 1) << 8); }
-			macro INDIRECT_Y() { addr = FETCH(); addr = (PEEK_MEMORY(addr) + (PEEK_ZPAGE(addr + 1) << 8) + y) & 0xffff; }
-			macro NCYCLES_X()  { if ((addr & 0xff) < x) asap.Cycle++; }
-			macro NCYCLES_Y()  { if ((addr & 0xff) < y) asap.Cycle++; }
-
-			macro PL(dest)     { s = (s + 1) & 0xff; dest = PEEK_MEMORY(0x0100 + s); }
-			macro PLP()        { PL(vdi); nz = ((vdi & 0x80) << 1) + (~vdi & ZFlag); c = vdi & 1; vdi &= VFlag | DFlag | IFlag; }
-			macro PH(data)     { POKE_MEMORY(0x0100 + s, data); s = (s - 1) & 0xff; }
-			macro PHP(bflag)   { PH(((nz | (nz >> 1)) & 0x80) + vdi + ((nz & 0xff) == 0 ? ZFlag : 0) + c + bflag); }
-			macro PHPB0()      { PHP(0x20); }  // push flags with B flag clear (NMI, IRQ)
-			macro PHPB1()      { PHP(0x30); }  // push flags with B flag set (PHP, BRK)
-			macro PHPC()       { PH(pc >> 8); PH(pc.LowByte); }
-
-#if ACPU_NO_DECIMAL
-
-			macro DO_ADC() {{
-				// binary mode
-				int tmp = a + data + c;
-				vdi = (vdi & (DFlag | IFlag)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & VFlag);
-				c = tmp >> 8;
-				nz = a = tmp & 0xff;
-			}}
-
-			macro DO_SBC() {{
-				// binary mode
-				int tmp = a - data - 1 + c;
-				vdi = (vdi & (DFlag | IFlag)) + ((((data ^ a) & (a ^ tmp)) >> 1) & VFlag);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 0xff;
-			}}
-
-#else // ACPU_NO_DECIMAL
-
-			macro DO_ADC() {{
-				int tmp = a + data + c;
-				nz = tmp & 0xff;
-				if ((vdi & DFlag) == 0) {
-					// binary mode
-					vdi = (vdi & (DFlag | IFlag)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & VFlag);
-					c = tmp >> 8;
-					a = nz;
-				}
-				else {
-					// decimal mode
-					int al = (a & 0x0f) + (data & 0x0f) + c;
-					if (al >= 10) {
-						tmp += al < 26 ? 6 : -10;
-						// Set N from tmp, leave Z unchanged. Zero can only change to 6, this doesn't affect N.
-						if (nz != 0)
-							nz = (tmp & 0x80) + 1;
-					}
-					vdi = (vdi & (DFlag | IFlag)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & VFlag);
-					if (tmp >= 0xa0) {
-						c = 1;
-						a = (tmp + 0x60) & 0xff;
-					}
-					else {
-						c = 0;
-						a = tmp;
-					}
-				}
-			}}
-
-			macro DO_SBC() {{
-				int tmp = a - data - 1 + c;
-				int al = (a & 0x0f) - (data & 0x0f) - 1 + c;
-				vdi = (vdi & (DFlag | IFlag)) + ((((data ^ a) & (a ^ tmp)) >> 1) & VFlag);
-				c = tmp >= 0 ? 1 : 0;
-				nz = a = tmp & 0xff;
-				if ((vdi & DFlag) != 0) {
-					// decimal mode
-					if (al < 0)
-						a += al < -10 ? 10 : -6;
-					if (c == 0)
-						a = (a - 0x60) & 0xff;
-				}
-			}}
-
-#endif // ACPU_NO_DECIMAL
-
-			macro LDA()        { nz = a = PEEK(addr); }
-			macro LDA_ZP()     { nz = a = PEEK_MEMORY(addr); }
-			macro LDX()        { nz = x = PEEK(addr); }
-			macro LDX_ZP()     { nz = x = PEEK_MEMORY(addr); }
-			macro LDY()        { nz = y = PEEK(addr); }
-			macro LDY_ZP()     { nz = y = PEEK_MEMORY(addr); }
-			macro LAX()        { nz = x = a = PEEK(addr); }
-			macro LAX_ZP()     { nz = x = a = PEEK_MEMORY(addr); }
-			macro STA()        { POKE(addr, a); }
-			macro STA_ZP()     { POKE_MEMORY(addr, a); }
-			macro STX()        { POKE(addr, x); }
-			macro STX_ZP()     { POKE_MEMORY(addr, x); }
-			macro STY()        { POKE(addr, y); }
-			macro STY_ZP()     { POKE_MEMORY(addr, y); }
-			macro SAX()        { data = a & x; POKE(addr, data); }
-			macro SAX_ZP()     { data = a & x; POKE_MEMORY(addr, data); }
-			macro CMP()        { nz = PEEK(addr); c = a >= nz ? 1 : 0; nz = (a - nz) & 0xff; }
-			macro CMP_ZP()     { nz = PEEK_MEMORY(addr); c = a >= nz ? 1 : 0; nz = (a - nz) & 0xff; }
-			macro CPX()        { nz = PEEK(addr); c = x >= nz ? 1 : 0; nz = (x - nz) & 0xff; }
-			macro CPX_ZP()     { nz = PEEK_MEMORY(addr); c = x >= nz ? 1 : 0; nz = (x - nz) & 0xff; }
-			macro CPY()        { nz = PEEK(addr); c = y >= nz ? 1 : 0; nz = (y - nz) & 0xff; }
-			macro CPY_ZP()     { nz = PEEK_MEMORY(addr); c = y >= nz ? 1 : 0; nz = (y - nz) & 0xff; }
-			macro AND()        { nz = a &= PEEK(addr); }
-			macro AND_ZP()     { nz = a &= PEEK_MEMORY(addr); }
-			macro ORA()        { nz = a |= PEEK(addr); }
-			macro ORA_ZP()     { nz = a |= PEEK_MEMORY(addr); }
-			macro EOR()        { nz = a ^= PEEK(addr); }
-			macro EOR_ZP()     { nz = a ^= PEEK_MEMORY(addr); }
-			macro ADC()        { data = PEEK(addr); DO_ADC(); }
-			macro ADC_ZP()     { data = PEEK_MEMORY(addr); DO_ADC(); }
-			macro SBC()        { data = PEEK(addr); DO_SBC(); }
-			macro SBC_ZP()     { data = PEEK_MEMORY(addr); DO_SBC(); }
-
-			macro ASL()        { PEEK_RMW(nz, addr); c = nz >> 7; nz = (nz << 1) & 0xff; POKE(addr, nz); }
-			macro ASL_ZP()     { nz = PEEK_MEMORY(addr); c = nz >> 7; nz = (nz << 1) & 0xff; POKE_MEMORY(addr, nz); }
-			macro ROL()        { PEEK_RMW(nz, addr); nz = (nz << 1) + c; c = nz >> 8; nz &= 0xff; POKE(addr, nz); }
-			macro ROL_ZP()     { nz = PEEK_MEMORY(addr); nz = (nz << 1) + c; c = nz >> 8; nz &= 0xff; POKE_MEMORY(addr, nz); }
-			macro LSR()        { PEEK_RMW(nz, addr); c = nz & 1; nz >>= 1; POKE(addr, nz); }
-			macro LSR_ZP()     { nz = PEEK_MEMORY(addr); c = nz & 1; nz >>= 1; POKE_MEMORY(addr, nz); }
-			macro ROR()        { PEEK_RMW(nz, addr); nz += c << 8; c = nz & 1; nz >>= 1; POKE(addr, nz); }
-			macro ROR_ZP()     { nz = PEEK_MEMORY(addr) + (c << 8); c = nz & 1; nz >>= 1; POKE_MEMORY(addr, nz); }
-			macro DEC()        { PEEK_RMW(nz, addr); nz = (nz - 1) & 0xff; POKE(addr, nz); }
-			macro DEC_ZP()     { nz = PEEK_MEMORY(addr); nz = (nz - 1) & 0xff; POKE_MEMORY(addr, nz); }
-			macro INC()        { PEEK_RMW(nz, addr); nz = (nz + 1) & 0xff; POKE(addr, nz); }
-			macro INC_ZP()     { nz = PEEK_MEMORY(addr); nz = (nz + 1) & 0xff; POKE_MEMORY(addr, nz); }
-
-			macro ASO()        { ASL(); nz = a |= nz; }
-			macro ASO_ZP()     { ASL_ZP(); nz = a |= nz; }
-			macro RLA()        { ROL(); nz = a &= nz; }
-			macro RLA_ZP()     { ROL_ZP(); nz = a &= nz; }
-			macro LSE()        { LSR(); nz = a ^= nz; }
-			macro LSE_ZP()     { LSR_ZP(); nz = a ^= nz; }
-			macro RRA()        { ROR(); data = nz; DO_ADC(); }
-			macro RRA_ZP()     { ROR_ZP(); data = nz; DO_ADC(); }
-			macro DCM()        { DEC(); c = a >= nz ? 1 : 0; nz = (a - nz) & 0xff; }
-			macro DCM_ZP()     { DEC_ZP(); c = a >= nz ? 1 : 0; nz = (a - nz) & 0xff; }
-			macro INS()        { INC(); data = nz; DO_SBC(); }
-			macro INS_ZP()     { INC_ZP(); data = nz; DO_SBC(); }
-
-			macro SHX(val,ind) {{
-				addr = FETCH();
-				int hi = FETCH();
-				data = (hi + 1) & val;
-				addr += ind;
-				if (addr >= 0x100)
-					hi = data - 1;
-				addr += hi << 8;
-				POKE(addr, data);
-			}}
-
-			macro BRANCH(cond) {
-				if (cond) {
-					addr = PEEK_CODE().SByte;
-					pc++;
-					addr += pc;
-					if ((addr ^ pc) >> 8 != 0)
-						asap.Cycle++;
-					asap.Cycle++;
-					pc = addr;
-					break;
-				}
-				pc++;
-				break;
-			}
-
-			macro CHECK_IRQ()  {
-				if ((vdi & IFlag) == 0 && asap.Pokeys.Irqst != 0xff) {
-					PHPC();
-					PHPB0();
-					vdi |= IFlag;
-					pc = DPEEK_MEMORY(0xfffe);
-					asap.Cycle += 7;
-				}
-			}
-
-			if (asap.Cycle >= asap.NextEventCycle) {
-				Pc = pc;
-				S = s;
-				asap.HandleEvent();
-				pc = Pc;
-				s = S;
-				CHECK_IRQ();
-			}
-#if ASAPSCAN
-			native {
-				if (cpu_trace != 0)
-					trace_cpu(asap, pc, a, x, y, s, nz, vdi, c);
-			}
-#endif
-			int data = FETCH();
-			const int[256] opcodeCycles = {
-			//	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-				7, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 4, 4, 6, 6, // 0x
-				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 1x
-				6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 4, 4, 6, 6, // 2x
-				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 3x
-				6, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 3, 4, 6, 6, // 4x
-				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 5x
-				6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 5, 4, 6, 6, // 6x
-				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 7x
-				2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4, // 8x
-				2, 6, 2, 6, 4, 4, 4, 4, 2, 5, 2, 5, 5, 5, 5, 5, // 9x
-				2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4, // Ax
-				2, 5, 2, 5, 4, 4, 4, 4, 2, 4, 2, 4, 4, 4, 4, 4, // Bx
-				2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6, // Cx
-				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // Dx
-				2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6, // Ex
-				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7  // Fx
-			};
-			asap.Cycle += opcodeCycles[data];
-			int addr;
-
-			switch (data) {
-			case 0x00: // BRK
-				pc++;
-				PHPC();
-				PHPB1();
-				vdi |= IFlag;
-				pc = DPEEK_MEMORY(0xfffe);
-				break;
-			case 0x01: // ORA (ab,x)
-				INDIRECT_X();
-				ORA();
-				break;
-			case 0x02: // CIM [unofficial]
-			case 0x12:
-			case 0x22:
-			case 0x32:
-			case 0x42:
-			case 0x52:
-			case 0x62:
-			case 0x72:
-			case 0x92:
-			case 0xb2:
-			case 0xd2:
-			case 0xf2:
-				pc--;
-				asap.Cycle = asap.NextEventCycle;
-				break;
-			case 0x05: // ORA ab
-				ZPAGE();
-				ORA_ZP();
-				break;
-			case 0x06: // ASL ab
-				ZPAGE();
-				ASL_ZP();
-				break;
-			case 0x08: // PHP
-				PHPB1();
-				break;
-			case 0x09: // ORA #ab
-				nz = a |= FETCH();
-				break;
-			case 0x0a: // ASL
-				c = a >> 7;
-				nz = a = (a << 1) & 0xff;
-				break;
-			case 0x0d: // ORA abcd
-				ABSOLUTE();
-				ORA();
-				break;
-			case 0x0e: // ASL abcd
-				ABSOLUTE();
-				ASL();
-				break;
-			case 0x10: // BPL
-				BRANCH(nz < 0x80);
-			case 0x11: // ORA (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				ORA();
-				break;
-			case 0x15: // ORA ab,x
-				ZPAGE_X();
-				ORA_ZP();
-				break;
-			case 0x16: // ASL ab,x
-				ZPAGE_X();
-				ASL_ZP();
-				break;
-			case 0x18: // CLC
-				c = 0;
-				break;
-			case 0x19: // ORA abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				ORA();
-				break;
-			case 0x1d: // ORA abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				ORA();
-				break;
-			case 0x1e: // ASL abcd,x
-				ABSOLUTE_X();
-				ASL();
-				break;
-			case 0x20: // JSR abcd
-				addr = FETCH();
-				PHPC();
-				pc = addr + (PEEK_CODE() << 8);
-				break;
-			case 0x21: // AND (ab,x)
-				INDIRECT_X();
-				AND();
-				break;
-			case 0x24: // BIT ab
-				ZPAGE();
-				nz = PEEK_MEMORY(addr);
-				vdi = (vdi & (DFlag | IFlag)) + (nz & VFlag);
-				nz = ((nz & 0x80) << 1) + (nz & a);
-				break;
-			case 0x25: // AND ab
-				ZPAGE();
-				AND_ZP();
-				break;
-			case 0x26: // ROL ab
-				ZPAGE();
-				ROL_ZP();
-				break;
-			case 0x28: // PLP
-				PLP();
-				CHECK_IRQ();
-				break;
-			case 0x29: // AND #ab
-				nz = a &= FETCH();
-				break;
-			case 0x2a: // ROL
-				a = (a << 1) + c;
-				c = a >> 8;
-				nz = a &= 0xff;
-				break;
-			case 0x2c: // BIT abcd
-				ABSOLUTE();
-				nz = PEEK(addr);
-				vdi = (vdi & (DFlag | IFlag)) + (nz & VFlag);
-				nz = ((nz & 0x80) << 1) + (nz & a);
-				break;
-			case 0x2d: // AND abcd
-				ABSOLUTE();
-				AND();
-				break;
-			case 0x2e: // ROL abcd
-				ABSOLUTE();
-				ROL();
-				break;
-			case 0x30: // BMI
-				BRANCH(nz >= 0x80);
-			case 0x31: // AND (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				AND();
-				break;
-			case 0x35: // AND ab,x
-				ZPAGE_X();
-				AND_ZP();
-				break;
-			case 0x36: // ROL ab,x
-				ZPAGE_X();
-				ROL_ZP();
-				break;
-			case 0x38: // SEC
-				c = 1;
-				break;
-			case 0x39: // AND abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				AND();
-				break;
-			case 0x3d: // AND abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				AND();
-				break;
-			case 0x3e: // ROL abcd,x
-				ABSOLUTE_X();
-				ROL();
-				break;
-			case 0x40: // RTI
-				PLP();
-				PL(pc);
-				PL(addr);
-				pc += addr << 8;
-				CHECK_IRQ();
-				break;
-			case 0x41: // EOR (ab,x)
-				INDIRECT_X();
-				EOR();
-				break;
-			case 0x45: // EOR ab
-				ZPAGE();
-				EOR_ZP();
-				break;
-			case 0x46: // LSR ab
-				ZPAGE();
-				LSR_ZP();
-				break;
-			case 0x48: // PHA
-				PH(a);
-				break;
-			case 0x49: // EOR #ab
-				nz = a ^= FETCH();
-				break;
-			case 0x4a: // LSR
-				c = a & 1;
-				nz = a >>= 1;
-				break;
-			case 0x4c: // JMP abcd
-				addr = FETCH();
-				pc = addr + (PEEK_CODE() << 8);
-				break;
-			case 0x4d: // EOR abcd
-				ABSOLUTE();
-				EOR();
-				break;
-			case 0x4e: // LSR abcd
-				ABSOLUTE();
-				LSR();
-				break;
-			case 0x50: // BVC
-				BRANCH((vdi & VFlag) == 0);
-			case 0x51: // EOR (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				EOR();
-				break;
-			case 0x55: // EOR ab,x
-				ZPAGE_X();
-				EOR_ZP();
-				break;
-			case 0x56: // LSR ab,x
-				ZPAGE_X();
-				LSR_ZP();
-				break;
-			case 0x58: // CLI
-				vdi &= VFlag | DFlag;
-				CHECK_IRQ();
-				break;
-			case 0x59: // EOR abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				EOR();
-				break;
-			case 0x5d: // EOR abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				EOR();
-				break;
-			case 0x5e: // LSR abcd,x
-				ABSOLUTE_X();
-				LSR();
-				break;
-			case 0x60: // RTS
-				PL(pc);
-				PL(addr);
-				pc += (addr << 8) + 1;
-				break;
-			case 0x61: // ADC (ab,x)
-				INDIRECT_X();
-				ADC();
-				break;
-			case 0x65: // ADC ab
-				ZPAGE();
-				ADC_ZP();
-				break;
-			case 0x66: // ROR ab
-				ZPAGE();
-				ROR_ZP();
-				break;
-			case 0x68: // PLA
-				PL(a);
-				nz = a;
-				break;
-			case 0x69: // ADC #ab
-				data = FETCH();
-				DO_ADC();
-				break;
-			case 0x6a: // ROR
-				nz = (c << 7) + (a >> 1);
-				c = a & 1;
-				a = nz;
-				break;
-			case 0x6c: // JMP (abcd)
-				ABSOLUTE();
-				if ((addr & 0xff) == 0xff)
-					pc = PEEK_MEMORY(addr) + (PEEK_MEMORY(addr - 0xff) << 8);
-				else
-					pc = DPEEK_MEMORY(addr);
-				break;
-			case 0x6d: // ADC abcd
-				ABSOLUTE();
-				ADC();
-				break;
-			case 0x6e: // ROR abcd
-				ABSOLUTE();
-				ROR();
-				break;
-			case 0x70: // BVS
-				BRANCH((vdi & VFlag) != 0);
-			case 0x71: // ADC (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				ADC();
-				break;
-			case 0x75: // ADC ab,x
-				ZPAGE_X();
-				ADC_ZP();
-				break;
-			case 0x76: // ROR ab,x
-				ZPAGE_X();
-				ROR_ZP();
-				break;
-			case 0x78: // SEI
-				vdi |= IFlag;
-				break;
-			case 0x79: // ADC abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				ADC();
-				break;
-			case 0x7d: // ADC abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				ADC();
-				break;
-			case 0x7e: // ROR abcd,x
-				ABSOLUTE_X();
-				ROR();
-				break;
-			case 0x81: // STA (ab,x)
-				INDIRECT_X();
-				STA();
-				break;
-			case 0x84: // STY ab
-				ZPAGE();
-				STY_ZP();
-				break;
-			case 0x85: // STA ab
-				ZPAGE();
-				STA_ZP();
-				break;
-			case 0x86: // STX ab
-				ZPAGE();
-				STX_ZP();
-				break;
-			case 0x88: // DEY
-				nz = y = (y - 1) & 0xff;
-				break;
-			case 0x8a: // TXA
-				nz = a = x;
-				break;
-			case 0x8c: // STY abcd
-				ABSOLUTE();
-				STY();
-				break;
-			case 0x8d: // STA abcd
-				ABSOLUTE();
-				STA();
-				break;
-			case 0x8e: // STX abcd
-				ABSOLUTE();
-				STX();
-				break;
-			case 0x90: // BCC
-				BRANCH(c == 0);
-			case 0x91: // STA (ab),y
-				INDIRECT_Y();
-				STA();
-				break;
-			case 0x94: // STY ab,x
-				ZPAGE_X();
-				STY_ZP();
-				break;
-			case 0x95: // STA ab,x
-				ZPAGE_X();
-				STA_ZP();
-				break;
-			case 0x96: // STX ab,y
-				ZPAGE_Y();
-				STX_ZP();
-				break;
-			case 0x98: // TYA
-				nz = a = y;
-				break;
-			case 0x99: // STA abcd,y
-				ABSOLUTE_Y();
-				STA();
-				break;
-			case 0x9a: // TXS
-				s = x;
-				break;
-			case 0x9d: // STA abcd,x
-				ABSOLUTE_X();
-				STA();
-				break;
-			case 0xa0: // LDY #ab
-				nz = y = FETCH();
-				break;
-			case 0xa1: // LDA (ab,x)
-				INDIRECT_X();
-				LDA();
-				break;
-			case 0xa2: // LDX #ab
-				nz = x = FETCH();
-				break;
-			case 0xa4: // LDY ab
-				ZPAGE();
-				LDY_ZP();
-				break;
-			case 0xa5: // LDA ab
-				ZPAGE();
-				LDA_ZP();
-				break;
-			case 0xa6: // LDX ab
-				ZPAGE();
-				LDX_ZP();
-				break;
-			case 0xa8: // TAY
-				nz = y = a;
-				break;
-			case 0xa9: // LDA #ab
-				nz = a = FETCH();
-				break;
-			case 0xaa: // TAX
-				nz = x = a;
-				break;
-			case 0xac: // LDY abcd
-				ABSOLUTE();
-				LDY();
-				break;
-			case 0xad: // LDA abcd
-				ABSOLUTE();
-				LDA();
-				break;
-			case 0xae: // LDX abcd
-				ABSOLUTE();
-				LDX();
-				break;
-			case 0xb0: // BCS
-				BRANCH(c != 0);
-			case 0xb1: // LDA (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				LDA();
-				break;
-			case 0xb4: // LDY ab,x
-				ZPAGE_X();
-				LDY_ZP();
-				break;
-			case 0xb5: // LDA ab,x
-				ZPAGE_X();
-				LDA_ZP();
-				break;
-			case 0xb6: // LDX ab,y
-				ZPAGE_Y();
-				LDX_ZP();
-				break;
-			case 0xb8: // CLV
-				vdi &= DFlag | IFlag;
-				break;
-			case 0xb9: // LDA abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				LDA();
-				break;
-			case 0xba: // TSX
-				nz = x = s;
-				break;
-			case 0xbc: // LDY abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				LDY();
-				break;
-			case 0xbd: // LDA abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				LDA();
-				break;
-			case 0xbe: // LDX abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				LDX();
-				break;
-			case 0xc0: // CPY #ab
-				nz = FETCH();
-				c = y >= nz ? 1 : 0;
-				nz = (y - nz) & 0xff;
-				break;
-			case 0xc1: // CMP (ab,x)
-				INDIRECT_X();
-				CMP();
-				break;
-			case 0xc4: // CPY ab
-				ZPAGE();
-				CPY_ZP();
-				break;
-			case 0xc5: // CMP ab
-				ZPAGE();
-				CMP_ZP();
-				break;
-			case 0xc6: // DEC ab
-				ZPAGE();
-				DEC_ZP();
-				break;
-			case 0xc8: // INY
-				nz = y = (y + 1) & 0xff;
-				break;
-			case 0xc9: // CMP #ab
-				nz = FETCH();
-				c = a >= nz ? 1 : 0;
-				nz = (a - nz) & 0xff;
-				break;
-			case 0xca: // DEX
-				nz = x = (x - 1) & 0xff;
-				break;
-			case 0xcc: // CPY abcd
-				ABSOLUTE();
-				CPY();
-				break;
-			case 0xcd: // CMP abcd
-				ABSOLUTE();
-				CMP();
-				break;
-			case 0xce: // DEC abcd
-				ABSOLUTE();
-				DEC();
-				break;
-			case 0xd0: // BNE
-				BRANCH((nz & 0xff) != 0);
-			case 0xd1: // CMP (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				CMP();
-				break;
-			case 0xd5: // CMP ab,x
-				ZPAGE_X();
-				CMP_ZP();
-				break;
-			case 0xd6: // DEC ab,x
-				ZPAGE_X();
-				DEC_ZP();
-				break;
-			case 0xd8: // CLD
-				vdi &= VFlag | IFlag;
-				break;
-			case 0xd9: // CMP abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				CMP();
-				break;
-			case 0xdd: // CMP abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				CMP();
-				break;
-			case 0xde: // DEC abcd,x
-				ABSOLUTE_X();
-				DEC();
-				break;
-			case 0xe0: // CPX #ab
-				nz = FETCH();
-				c = x >= nz ? 1 : 0;
-				nz = (x - nz) & 0xff;
-				break;
-			case 0xe1: // SBC (ab,x)
-				INDIRECT_X();
-				SBC();
-				break;
-			case 0xe4: // CPX ab
-				ZPAGE();
-				CPX_ZP();
-				break;
-			case 0xe5: // SBC ab
-				ZPAGE();
-				SBC_ZP();
-				break;
-			case 0xe6: // INC ab
-				ZPAGE();
-				INC_ZP();
-				break;
-			case 0xe8: // INX
-				nz = x = (x + 1) & 0xff;
-				break;
-			case 0xe9: // SBC #ab
-			case 0xeb: // SBC #ab [unofficial]
-				data = FETCH();
-				DO_SBC();
-				break;
-			case 0xea: // NOP
-			case 0x1a: // NOP [unofficial]
-			case 0x3a:
-			case 0x5a:
-			case 0x7a:
-			case 0xda:
-			case 0xfa:
-				break;
-			case 0xec: // CPX abcd
-				ABSOLUTE();
-				CPX();
-				break;
-			case 0xed: // SBC abcd
-				ABSOLUTE();
-				SBC();
-				break;
-			case 0xee: // INC abcd
-				ABSOLUTE();
-				INC();
-				break;
-			case 0xf0: // BEQ
-				BRANCH((nz & 0xff) == 0);
-			case 0xf1: // SBC (ab),y
-				INDIRECT_Y();
-				NCYCLES_Y();
-				SBC();
-				break;
-			case 0xf5: // SBC ab,x
-				ZPAGE_X();
-				SBC_ZP();
-				break;
-			case 0xf6: // INC ab,x
-				ZPAGE_X();
-				INC_ZP();
-				break;
-			case 0xf8: // SED
-				vdi |= DFlag;
-				break;
-			case 0xf9: // SBC abcd,y
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				SBC();
-				break;
-			case 0xfd: // SBC abcd,x
-				ABSOLUTE_X();
-				NCYCLES_X();
-				SBC();
-				break;
-			case 0xfe: // INC abcd,x
-				ABSOLUTE_X();
-				INC();
-				break;
-
-#if !ACPU_NO_UNOFFICIAL
-			case 0x03: // ASO (ab,x) [unofficial]
-				INDIRECT_X();
-				ASO();
-				break;
-			case 0x04: // NOP ab [unofficial]
-			case 0x44:
-			case 0x64:
-			case 0x14: // NOP ab,x [unofficial]
-			case 0x34:
-			case 0x54:
-			case 0x74:
-			case 0xd4:
-			case 0xf4:
-			case 0x80: // NOP #ab [unofficial]
-			case 0x82:
-			case 0x89:
-			case 0xc2:
-			case 0xe2:
-				pc++;
-				break;
-			case 0x07: // ASO ab [unofficial]
-				ZPAGE();
-				ASO_ZP();
-				break;
-			case 0x0b: // ANC #ab [unofficial]
-			case 0x2b:
-				nz = a &= FETCH();
-				c = nz >> 7;
-				break;
-			case 0x0c: // NOP abcd [unofficial]
-				pc += 2;
-				break;
-			case 0x0f: // ASO abcd [unofficial]
-				ABSOLUTE();
-				ASO();
-				break;
-			case 0x13: // ASO (ab),y [unofficial]
-				INDIRECT_Y();
-				ASO();
-				break;
-			case 0x17: // ASO ab,x [unofficial]
-				ZPAGE_X();
-				ASO_ZP();
-				break;
-			case 0x1b: // ASO abcd,y [unofficial]
-				ABSOLUTE_Y();
-				ASO();
-				break;
-			case 0x1c: // NOP abcd,x [unofficial]
-			case 0x3c:
-			case 0x5c:
-			case 0x7c:
-			case 0xdc:
-			case 0xfc:
-				if (FETCH() + x >= 0x100)
-					asap.Cycle++;
-				pc++;
-				break;
-			case 0x1f: // ASO abcd,x [unofficial]
-				ABSOLUTE_X();
-				ASO();
-				break;
-			case 0x23: // RLA (ab,x) [unofficial]
-				INDIRECT_X();
-				RLA();
-				break;
-			case 0x27: // RLA ab [unofficial]
-				ZPAGE();
-				RLA_ZP();
-				break;
-			case 0x2f: // RLA abcd [unofficial]
-				ABSOLUTE();
-				RLA();
-				break;
-			case 0x33: // RLA (ab),y [unofficial]
-				INDIRECT_Y();
-				RLA();
-				break;
-			case 0x37: // RLA ab,x [unofficial]
-				ZPAGE_X();
-				RLA_ZP();
-				break;
-			case 0x3b: // RLA abcd,y [unofficial]
-				ABSOLUTE_Y();
-				RLA();
-				break;
-			case 0x3f: // RLA abcd,x [unofficial]
-				ABSOLUTE_X();
-				RLA();
-				break;
-			case 0x43: // LSE (ab,x) [unofficial]
-				INDIRECT_X();
-				LSE();
-				break;
-			case 0x47: // LSE ab [unofficial]
-				ZPAGE();
-				LSE_ZP();
-				break;
-			case 0x4b: // ALR #ab [unofficial]
-				a &= FETCH();
-				c = a & 1;
-				nz = a >>= 1;
-				break;
-			case 0x4f: // LSE abcd [unofficial]
-				ABSOLUTE();
-				LSE();
-				break;
-			case 0x53: // LSE (ab),y [unofficial]
-				INDIRECT_Y();
-				LSE();
-				break;
-			case 0x57: // LSE ab,x [unofficial]
-				ZPAGE_X();
-				LSE_ZP();
-				break;
-			case 0x5b: // LSE abcd,y [unofficial]
-				ABSOLUTE_Y();
-				LSE();
-				break;
-			case 0x5f: // LSE abcd,x [unofficial]
-				ABSOLUTE_X();
-				LSE();
-				break;
-			case 0x63: // RRA (ab,x) [unofficial]
-				INDIRECT_X();
-				RRA();
-				break;
-			case 0x67: // RRA ab [unofficial]
-				ZPAGE();
-				RRA_ZP();
-				break;
-			case 0x6b: // ARR #ab [unofficial]
-				data = a & FETCH();
-				nz = a = (data >> 1) + (c << 7);
-				vdi = (vdi & (DFlag | IFlag)) + ((a ^ data) & VFlag);
-#if ACPU_NO_DECIMAL
-				c = data >> 7;
-#else
-				if ((vdi & DFlag) == 0)
-					c = data >> 7;
-				else {
-					if ((data & 0xf) >= 5)
-						a = (a & 0xf0) + ((a + 6) & 0xf);
-					if (data >= 0x50) {
-						a = (a + 0x60) & 0xff;
-						c = 1;
-					}
-					else
-						c = 0;
-				}
-#endif
-				break;
-			case 0x6f: // RRA abcd [unofficial]
-				ABSOLUTE();
-				RRA();
-				break;
-			case 0x73: // RRA (ab),y [unofficial]
-				INDIRECT_Y();
-				RRA();
-				break;
-			case 0x77: // RRA ab,x [unofficial]
-				ZPAGE_X();
-				RRA_ZP();
-				break;
-			case 0x7b: // RRA abcd,y [unofficial]
-				ABSOLUTE_Y();
-				RRA();
-				break;
-			case 0x7f: // RRA abcd,x [unofficial]
-				ABSOLUTE_X();
-				RRA();
-				break;
-			case 0x83: // SAX (ab,x) [unofficial]
-				INDIRECT_X();
-				SAX();
-				break;
-			case 0x87: // SAX ab [unofficial]
-				ZPAGE();
-				SAX_ZP();
-				break;
-			case 0x8b: // ANE #ab [unofficial]
-				data = FETCH();
-				a &= (data | 0xef) & x;
-				nz = a & data;
-				break;
-			case 0x8f: // SAX abcd [unofficial]
-				ABSOLUTE();
-				SAX();
-				break;
-			case 0x93: // SHA (ab),y [unofficial, unstable]
-				{
-					addr = FETCH();
-					int hi = PEEK_ZPAGE(addr + 1);
-					addr = PEEK_MEMORY(addr);
-					data = (hi + 1) & a & x;
-					addr += y;
-					if (addr >= 0x100)
-						hi = data - 1;
-					addr += hi << 8;
-					POKE(addr, data);
-				}
-				break;
-			case 0x97: // SAX ab,y [unofficial]
-				ZPAGE_Y();
-				SAX_ZP();
-				break;
-			case 0x9b: // SHS abcd,y [unofficial, unstable]
-				// S seems to be stable, only memory values vary
-				s = a & x;
-				SHX(s, y);
-				break;
-			case 0x9c: // SHY abcd,x [unofficial]
-				SHX(y, x);
-				break;
-			case 0x9e: // SHX abcd,y [unofficial]
-				SHX(x, y);
-				break;
-			case 0x9f: // SHA abcd,y [unofficial, unstable]
-				SHX(a & x, y);
-				break;
-			case 0xa3: // LAX (ab,x) [unofficial]
-				INDIRECT_X();
-				LAX();
-				break;
-			case 0xa7: // LAX ab [unofficial]
-				ZPAGE();
-				LAX_ZP();
-				break;
-			case 0xab: // ANX #ab [unofficial]
-				nz = x = a &= FETCH();
-				break;
-			case 0xaf: // LAX abcd [unofficial]
-				ABSOLUTE();
-				LAX();
-				break;
-			case 0xb3: // LAX (ab),y [unofficial]
-				INDIRECT_Y();
-				NCYCLES_Y();
-				LAX();
-				break;
-			case 0xb7: // LAX ab,y [unofficial]
-				ZPAGE_Y();
-				LAX_ZP();
-				break;
-			case 0xbb: // LAS abcd,y [unofficial, unstable]
-				// only Z is unstable
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				nz = x = a = s &= PEEK(addr);
-				break;
-			case 0xbf: // LAX abcd,y [unofficial]
-				ABSOLUTE_Y();
-				NCYCLES_Y();
-				LAX();
-				break;
-			case 0xc3: // DCM (ab,x) [unofficial]
-				INDIRECT_X();
-				DCM();
-				break;
-			case 0xc7: // DCM ab [unofficial]
-				ZPAGE();
-				DCM_ZP();
-				break;
-			case 0xcb: // SBX #ab [unofficial]
-				nz = FETCH();
-				x &= a;
-				c = x >= nz ? 1 : 0;
-				nz = x = (x - nz) & 0xff;
-				break;
-			case 0xcf: // DCM abcd [unofficial]
-				ABSOLUTE();
-				DCM();
-				break;
-			case 0xd3: // DCM (ab),y [unofficial]
-				INDIRECT_Y();
-				DCM();
-				break;
-			case 0xd7: // DCM ab,x [unofficial]
-				ZPAGE_X();
-				DCM_ZP();
-				break;
-			case 0xdb: // DCM abcd,y [unofficial]
-				ABSOLUTE_Y();
-				DCM();
-				break;
-			case 0xdf: // DCM abcd,x [unofficial]
-				ABSOLUTE_X();
-				DCM();
-				break;
-			case 0xe3: // INS (ab,x) [unofficial]
-				INDIRECT_X();
-				INS();
-				break;
-			case 0xe7: // INS ab [unofficial]
-				ZPAGE();
-				INS_ZP();
-				break;
-			case 0xef: // INS abcd [unofficial]
-				ABSOLUTE();
-				INS();
-				break;
-			case 0xf3: // INS (ab),y [unofficial]
-				INDIRECT_Y();
-				INS();
-				break;
-			case 0xf7: // INS ab,x [unofficial]
-				ZPAGE_X();
-				INS_ZP();
-				break;
-			case 0xfb: // INS abcd,y [unofficial]
-				ABSOLUTE_Y();
-				INS();
-				break;
-			case 0xff: // INS abcd,x [unofficial]
-				ABSOLUTE_X();
-				INS();
-				break;
-#endif // ACPU_NO_UNOFFICIAL
-			}
-		}
-		Pc = pc;
-		Nz = nz;
-		A = a;
-		X = x;
-		Y = y;
-		C = c;
-		S = s;
-		Vdi = vdi;
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/CREDITS kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/CREDITS
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/CREDITS	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/CREDITS	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-Authors
--------
-
-[horizontal]
-
-Piotr Fusik {asapwww!<fox@scene.pl>}::
-Creator and main developer.
-
-Atari800 Emulator Developers {asapwww!(http://atari800.sourceforge.net)}::
-6502 and POKEY emulation used in 0.x.y versions of ASAP.
-
-Zdenek Eisenhammer {asapwww!<pg@pinknet.cz>}::
-Testing.
-
-Jakub Husak {asapwww!<jakub.husak@gmail.com>}::
-SAP fingerprint calculation. asapscan fixes.
-
-Henryk Karpowicz {asapwww!<henkar@poczta.tygrys.net>}::
-CMC routine modified for the CM3 format.
-
-Maciek Konecki {asapwww!<maciusk1@wp.pl>}::
-Porting to C#.
-
-Marek Konopka {asapwww!<konop11@poczta.onet.pl>}::
-6502 routine for playing DLT.
-
-Daniel Kozminski {asapwww!<daniel.kozminski@gmail.com>}::
-Ideas.
-
-Jerzy Kut {asapwww!<mono@atari.pl>}::
-FC format.
-
-Marcin Lewandowski {asapwww!<jaskier@atari8.info>}::
-6502 routines for playing CMC, MPT, TMC and TM2.
-
-Ian Luck {asapwww!<il@un4seen.com>}::
-Guided development of XMPlay and BASS plugins.
-
-Adrian Matoga {asapwww!<epi@atari8.info>}::
-COVOX information and test files. Testing. Porting to D.
-
-Perry McFarlane {asapwww!<perry_m@fastmail.fm>}::
-POKEY reverse-engineering.
-
-Kostas Nakos {asapwww!<knakos@gmail.com>}::
-Windows CE testing.
-
-Mariusz Rozwadowski {asapwww!<ramosc64@o2.pl>}::
-Suggested CMS, CM3, DLT and STIL format support.
-
-Slawomir Sledz {asapwww!<slaves@scene.pl>}::
-Windows Mobile setup. Thorough testing.
-
-David Spilka::
-6502 routine for playing CMS.
-
-Radek Sterba::
-6502 routine for playing RMT.
-Testing.
-
-Lukasz Sychowicz {asapwww!<xray@scene.pl>}::
-Windows icons.
-Testing.
-
-Pawel Szewczyk {asapwww!<ripek@op.pl>}::
-Windows setup graphics.
-
-Michal Szpilowski {asapwww!<miker@atari.pl>}::
-Testing.
-
-Grzegorz Zyla {asapwww!<gsunr@poczta.onet.pl>}::
-XBMC plugin testing.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/AppManifest.xaml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/AppManifest.xaml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/AppManifest.xaml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/AppManifest.xaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
-	EntryPointAssembly="SilverASAP" EntryPointType="SilverASAP" RuntimeVersion="4.0">
-	<Deployment.Parts>
-		<AssemblyPart Source="SilverASAP.dll" />
-	</Deployment.Parts>
-</Deployment>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/asap2wav.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/asap2wav.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/asap2wav.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/asap2wav.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-/*
- * asap2wav.cs - converter of ASAP-supported formats to WAV files
- *
- * Copyright (C) 2008-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using System;
-using System.IO;
-
-using Sf.Asap;
-
-public class Asap2Wav
-{
-	static string OutputFilename = null;
-	static bool OutputHeader = true;
-	static int Song = -1;
-	static ASAPSampleFormat Format = ASAPSampleFormat.S16LE;
-	static int Duration = -1;
-	static int MuteMask = 0;
-
-	static void PrintHelp()
-	{
-		Console.Write(
-			"Usage: asap2wav [OPTIONS] INPUTFILE...\n" +
-			"Each INPUTFILE must be in a supported format:\n" +
-			"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
-			"Options:\n" +
-			"-o FILE     --output=FILE      Set output file name\n" +
-			"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
-			"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
-			"-b          --byte-samples     Output 8-bit samples\n" +
-			"-w          --word-samples     Output 16-bit samples (default)\n" +
-			"            --raw              Output raw audio (no WAV header)\n" +
-			"-m CHANNELS --mute=CHANNELS    Mute POKEY chanels (1-8)\n" +
-			"-h          --help             Display this information\n" +
-			"-v          --version          Display version information\n"
-		);
-	}
-
-	static void SetSong(string s)
-	{
-		Song = int.Parse(s);
-	}
-
-	static void SetTime(string s)
-	{
-		Duration = ASAPInfo.ParseDuration(s);
-	}
-
-	static void SetMuteMask(string s)
-	{
-		int mask = 0;
-		foreach (char c in s) {
-			if (c >= '1' && c <= '8')
-				mask |= 1 << (c - '1');
-		}
-		MuteMask = mask;
-	}
-
-	static void ProcessFile(string inputFilename)
-	{
-		byte[] module = new byte[ASAPInfo.MaxModuleLength];
-		int moduleLen;
-		using (Stream s = File.OpenRead(inputFilename)) {
-			moduleLen = s.Read(module, 0, module.Length);
-		}
-		ASAP asap = new ASAP();
-		asap.Load(inputFilename, module, moduleLen);
-		ASAPInfo info = asap.GetInfo();
-		if (Song < 0)
-			Song = info.GetDefaultSong();
-		if (Duration < 0) {
-			Duration = info.GetDuration(Song);
-			if (Duration < 0)
-				Duration = 180 * 1000;
-		}
-		asap.PlaySong(Song, Duration);
-		asap.MutePokeyChannels(MuteMask);
-		if (OutputFilename == null) {
-			int i = inputFilename.LastIndexOf('.');
-			OutputFilename = inputFilename.Substring(0, i + 1) + (OutputHeader ? "wav" : "raw");
-		}
-		using (Stream s = File.Create(OutputFilename)) {
-			byte[] buffer = new byte[8192];
-			int nBytes;
-			if (OutputHeader) {
-				nBytes = asap.GetWavHeader(buffer, Format, false);
-				s.Write(buffer, 0, nBytes);
-			}
-			do {
-				nBytes = asap.Generate(buffer, buffer.Length, Format);
-				s.Write(buffer, 0, nBytes);
-			} while (nBytes == buffer.Length);
-		}
-		OutputFilename = null;
-		Song = -1;
-		Duration = -1;
-	}
-
-	public static int Main(string[] args)
-	{
-		bool noInputFiles = true;
-		for (int i = 0; i < args.Length; i++) {
-			string arg = args[i];
-			if (arg[0] != '-') {
-				ProcessFile(arg);
-				noInputFiles = false;
-			}
-			else if (arg == "-o")
-				OutputFilename = args[++i];
-			else if (arg.StartsWith("--output="))
-				OutputFilename = arg.Substring(9);
-			else if (arg == "-s")
-				SetSong(args[++i]);
-			else if (arg.StartsWith("--song="))
-				SetSong(arg.Substring(7));
-			else if (arg == "-t")
-				SetTime(args[++i]);
-			else if (arg.StartsWith("--time="))
-				SetTime(arg.Substring(7));
-			else if (arg == "-b" || arg == "--byte-samples")
-				Format = ASAPSampleFormat.U8;
-			else if (arg == "-w" || arg == "--word-samples")
-				Format = ASAPSampleFormat.S16LE;
-			else if (arg == "--raw")
-				OutputHeader = false;
-			else if (arg == "-m")
-				SetMuteMask(args[++i]);
-			else if (arg.StartsWith("--mute="))
-				SetMuteMask(arg.Substring(7));
-			else if (arg == "-h" || arg == "--help") {
-				PrintHelp();
-				noInputFiles = false;
-			}
-			else if (arg == "-v" || arg == "--version") {
-				Console.WriteLine("ASAP2WAV (.NET) " + ASAPInfo.Version);
-				noInputFiles = false;
-			}
-			else
-				throw new ArgumentException("unknown option: " + arg);
-		}
-		if (noInputFiles) {
-			PrintHelp();
-			return 1;
-		}
-		return 0;
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/asapplay.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/asapplay.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/asapplay.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/asapplay.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-/*
- * asapplay.cs - .NET ASAP player
- *
- * Copyright (C) 2010-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using System;
-using System.IO;
-using System.Media;
-
-using Sf.Asap;
-
-public class ASAPWavStream : Stream
-{
-	readonly ASAP Asap = new ASAP();
-	readonly byte[] Buffer = new byte[8192];
-	int BufferPos = 0;
-	int BufferLen;
-
-	public ASAPWavStream(string inputFilename, int song, int duration)
-	{
-		byte[] module = new byte[ASAPInfo.MaxModuleLength];
-		int moduleLen;
-		using (Stream s = File.OpenRead(inputFilename)) {
-			moduleLen = s.Read(module, 0, module.Length);
-		}
-		Asap.Load(inputFilename, module, moduleLen);
-		ASAPInfo info = Asap.GetInfo();
-		if (song < 0)
-			song = info.GetDefaultSong();
-		if (duration < 0) {
-			duration = info.GetDuration(song);
-			if (duration < 0)
-				duration = 180 * 1000;
-		}
-		Asap.PlaySong(song, duration);
-		BufferLen = Asap.GetWavHeader(Buffer, ASAPSampleFormat.S16LE, false);
-	}
-
-	public override int Read(byte[] outputBuffer, int offset, int count)
-	{
-		int i = BufferPos;
-		if (i >= BufferLen) {
-			BufferLen = Asap.Generate(Buffer, Buffer.Length, ASAPSampleFormat.S16LE);
-			if (BufferLen == 0)
-				return 0;
-			i = 0;
-		}
-		if (count > BufferLen - i)
-			count = BufferLen - i;
-		Array.Copy(Buffer, i, outputBuffer, offset, count);
-		BufferPos = i + count;
-		return count;
-	}
-
-	public override bool CanRead
-	{
-		get
-		{
-			return true;
-		}
-	}
-
-	public override bool CanSeek
-	{
-		get
-		{
-			return false;
-		}
-	}
-
-	public override bool CanWrite
-	{
-		get
-		{
-			return false;
-		}
-	}
-
-	public override void Flush()
-	{
-		throw new NotSupportedException();
-	}
-
-	public override long Length
-	{
-		get
-		{
-			throw new NotSupportedException();
-		}
-	}
-
-	public override long Position
-	{
-		get
-		{
-			throw new NotSupportedException();
-		}
-		set
-		{
-			throw new NotSupportedException();
-		}
-	}
-
-	public override long Seek(long offset, SeekOrigin origin)
-	{
-		throw new NotSupportedException();
-	}
-
-	public override void SetLength(long value)
-	{
-		throw new NotSupportedException();
-	}
-
-	public override void Write(byte[] buffer, int offset, int count)
-	{
-		throw new NotSupportedException();
-	}
-}
-
-public class asapplay
-{
-	static int song = -1;
-	static int duration = -1;
-
-	static void PrintHelp()
-	{
-		Console.Write(
-			"Usage: asapplay [OPTIONS] INPUTFILE...\n" +
-			"Each INPUTFILE must be in a supported format:\n" +
-			"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
-			"Options:\n" +
-			"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
-			"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
-			"-h          --help             Display this information\n" +
-			"-v          --version          Display version information\n"
-		);
-	}
-
-	static void SetSong(string s)
-	{
-		song = int.Parse(s);
-	}
-
-	static void SetTime(string s)
-	{
-		duration = ASAPInfo.ParseDuration(s);
-	}
-
-	static void ProcessFile(string inputFilename)
-	{
-		Stream s = new ASAPWavStream(inputFilename, song, duration);
-		new SoundPlayer(s).PlaySync();
-		song = -1;
-		duration = -1;
-	}
-
-	public static int Main(string[] args)
-	{
-		bool noInputFiles = true;
-		for (int i = 0; i < args.Length; i++) {
-			string arg = args[i];
-			if (arg[0] != '-') {
-				ProcessFile(arg);
-				noInputFiles = false;
-			}
-			else if (arg == "-s")
-				SetSong(args[++i]);
-			else if (arg.StartsWith("--song="))
-				SetSong(arg.Substring(7));
-			else if (arg == "-t")
-				SetTime(args[++i]);
-			else if (arg.StartsWith("--time="))
-				SetTime(arg.Substring(7));
-			else if (arg == "-h" || arg == "--help") {
-				PrintHelp();
-				noInputFiles = false;
-			}
-			else if (arg == "-v" || arg == "--version") {
-				Console.WriteLine("asapplay (.NET) " + ASAPInfo.Version);
-				noInputFiles = false;
-			}
-			else
-				throw new ArgumentException("unknown option: " + arg);
-		}
-		if (noInputFiles) {
-			PrintHelp();
-			return 1;
-		}
-		return 0;
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/csharp.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/csharp.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/csharp.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/csharp.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-CSC = $(DO)"C:/Windows/Microsoft.NET/Framework/v2.0.50727/csc.exe" -nologo -o+ -out:$@ $(if $(filter %.dll,$@),-t:library) $(subst /,\\,$^)
-NDOC = $(DO)"C:/Program Files (x86)/NDoc3/bin/NDoc3Console.exe"
-SL = "C:/Program Files (x86)/Reference Assemblies/Microsoft/Framework/Silverlight/v3.0"
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "csharp.mk")
-endif
-
-csharp: csharp/asap2wav.exe csharp/asapplay.exe csharp/SilverASAP.xap
-.PHONY: csharp
-
-csharp/asap2wav.exe: $(srcdir)csharp/asap2wav.cs csharp/asap.cs
-	$(CSC)
-CLEAN += csharp/asap2wav.exe
-
-csharp/asapplay.exe: $(srcdir)csharp/asapplay.cs csharp/asap.cs
-	$(CSC)
-CLEAN += csharp/asapplay.exe
-
-csharp/SilverASAP.xap: csharp/SilverASAP.dll $(srcdir)csharp/AppManifest.xaml
-	$(MAKEZIP)
-CLEAN += csharp/SilverASAP.xap
-
-csharp/SilverASAP.dll: $(srcdir)csharp/SilverASAP.cs csharp/asap.cs
-	$(CSC) -nostdlib -noconfig -r:$(SL)/mscorlib.dll -r:$(SL)/system.dll -r:$(SL)/System.Net.dll -r:$(SL)/System.Windows.dll -r:$(SL)/System.Windows.Browser.dll
-CLEAN += csharp/SilverASAP.dll
-
-csharp/asap.cs: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-	$(CITO) -n Sf.Asap
-CLEAN += csharp/asap.cs
-
-csharp/doc/ASAP.chm: csharp/doc/ASAP.dll
-	$(NDOC) -documenter:MSDN -CleanIntermediates=true -DocumentInheritedFrameworkMembers=false \
-		-OutputDirectory=csharp/doc -OutputTarget=HtmlHelp -HtmlHelpName=ASAP -Title="ASAP .NET API" $<
-CLEAN += csharp/doc/ASAP.chm
-
-csharp/doc/ASAP.dll: csharp/asap.cs
-	$(CSC) -t:library -doc:csharp/doc/ASAP.xml
-CLEAN += csharp/doc/ASAP.dll csharp/doc/ASAP.xml
-
-include $(srcdir)csharp/winrt/winrt.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/SilverASAP.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/SilverASAP.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/SilverASAP.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/SilverASAP.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-/*
- * SilverASAP.cs - Silverlight version of ASAP
- *
- * Copyright (C) 2010-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Windows;
-using System.Windows.Browser;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-using Sf.Asap;
-
-class ASAPMediaStreamSource : MediaStreamSource
-{
-	const int BitsPerSample = 16;
-	static readonly Dictionary<MediaSampleAttributeKeys, string> SampleAttributes = new Dictionary<MediaSampleAttributeKeys, string>();
-
-	readonly ASAP Asap;
-	readonly int Duration;
-	MediaStreamDescription MediaStreamDescription;
-	readonly byte[] buffer = new byte[8192];
-
-	public ASAPMediaStreamSource(ASAP asap, int duration)
-	{
-		this.Asap = asap;
-		this.Duration = duration;
-	}
-
-	static int SwapBytes(int x)
-	{
-		return x << 24 | (x & 0xff00) << 8 | ((x >> 8) & 0xff00) | ((x >> 24) & 0xff);
-	}
-
-	protected override void OpenMediaAsync()
-	{
-		int channels = this.Asap.GetInfo().GetChannels();
-		int blockSize = channels * BitsPerSample >> 3;
-		string waveFormatHex = string.Format("0100{0:X2}00{1:X8}{2:X8}{3:X2}00{4:X2}000000",
-			channels, SwapBytes(ASAP.SampleRate), SwapBytes(ASAP.SampleRate * blockSize), blockSize, BitsPerSample);
-		Dictionary<MediaStreamAttributeKeys, string> streamAttributes = new Dictionary<MediaStreamAttributeKeys, string>();
-		streamAttributes[MediaStreamAttributeKeys.CodecPrivateData] = waveFormatHex;
-		this.MediaStreamDescription = new MediaStreamDescription(MediaStreamType.Audio, streamAttributes);
-
-		Dictionary<MediaSourceAttributesKeys, string> sourceAttributes = new Dictionary<MediaSourceAttributesKeys, string>();
-		sourceAttributes[MediaSourceAttributesKeys.CanSeek] = "True";
-		sourceAttributes[MediaSourceAttributesKeys.Duration] = (this.Duration < 0 ? 0 : this.Duration * 10000).ToString();
-
-		ReportOpenMediaCompleted(sourceAttributes, new MediaStreamDescription[1] { this.MediaStreamDescription });
-	}
-
-	protected override void GetSampleAsync(MediaStreamType mediaStreamType)
-	{
-		int blocksPlayed = this.Asap.GetBlocksPlayed();
-		int bufferLen = this.Asap.Generate(buffer, buffer.Length, BitsPerSample == 8 ? ASAPSampleFormat.U8 : ASAPSampleFormat.S16LE);
-		Stream s = bufferLen == 0 ? null : new MemoryStream(buffer);
-		MediaStreamSample mss = new MediaStreamSample(this.MediaStreamDescription, s, 0, bufferLen,
-			blocksPlayed * 10000000L / ASAP.SampleRate, SampleAttributes);
-		ReportGetSampleCompleted(mss);
-	}
-
-	protected override void SeekAsync(long seekToTime)
-	{
-		this.Asap.Seek((int) (seekToTime / 10000));
-		ReportSeekCompleted(seekToTime);
-	}
-
-	protected override void CloseMedia()
-	{
-	}
-
-	protected override void SwitchMediaStreamAsync(MediaStreamDescription mediaStreamDescription)
-	{
-		throw new NotImplementedException();
-	}
-
-	protected override void GetDiagnosticAsync(MediaStreamSourceDiagnosticKind diagnosticKind)
-	{
-		throw new NotImplementedException();
-	}
-
-}
-
-public class SilverASAP : Application
-{
-	readonly MediaElement MediaElement = new MediaElement();
-	string Filename;
-	int Song = -1;
-	WebClient WebClient = null;
-	ASAPInfo Info;
-
-	public SilverASAP()
-	{
-		this.Startup += this.Application_Startup;
-	}
-
-	void CallJS(string paramName)
-	{
-		string js;
-		if (this.Host.InitParams.TryGetValue(paramName, out js))
-			HtmlPage.Window.Eval(js);
-	}
-
-	void MediaElement_MediaEnded(object sender, RoutedEventArgs e)
-	{
-		CallJS("onPlaybackEnd");
-	}
-
-	void WebClient_OpenReadCompleted(object sender, OpenReadCompletedEventArgs e)
-	{
-		this.WebClient = null;
-		if (e.Cancelled || e.Error != null)
-			return;
-		byte[] module = new byte[e.Result.Length];
-		int moduleLen = e.Result.Read(module, 0, module.Length);
-
-		ASAP asap = new ASAP();
-		asap.Load(this.Filename, module, moduleLen);
-		this.Info = asap.GetInfo();
-		if (this.Song < 0)
-			this.Song = this.Info.GetDefaultSong();
-		int duration = this.Info.GetLoop(this.Song) ? -1 : this.Info.GetDuration(this.Song);
-		asap.PlaySong(this.Song, duration);
-
-		Stop();
-		CallJS("onLoad");
-		this.MediaElement.SetSource(new ASAPMediaStreamSource(asap, duration));
-	}
-
-	[ScriptableMember]
-	public void Play(string filename, int song)
-	{
-		this.Filename = filename;
-		this.Song = song;
-		this.WebClient = new WebClient();
-		this.WebClient.OpenReadCompleted += WebClient_OpenReadCompleted;
-		this.WebClient.OpenReadAsync(new Uri(filename, UriKind.Relative));
-	}
-
-	[ScriptableMember]
-	public void Play(string filename)
-	{
-		Play(filename, -1);
-	}
-
-	[ScriptableMember]
-	public bool Pause()
-	{
-		if (this.MediaElement.CurrentState == MediaElementState.Playing) {
-			this.MediaElement.Pause();
-			return true;
-		}
-		else {
-			this.MediaElement.Play();
-			return false;
-		}
-	}
-
-	[ScriptableMember]
-	public void Stop()
-	{
-		if (this.WebClient != null)
-			this.WebClient.CancelAsync();
-		this.MediaElement.Stop();
-		// in Opera Stop() doesn't work when MediaElement is in the Opening state:
-		this.MediaElement.Source = null;
-	}
-
-	[ScriptableMember]
-	public string Author
-	{
-		get
-		{
-			return this.Info.GetAuthor();
-		}
-	}
-
-	[ScriptableMember]
-	public string Title
-	{
-		get
-		{
-			return this.Info.GetTitle();
-		}
-	}
-
-	[ScriptableMember]
-	public string Date
-	{
-		get
-		{
-			return this.Info.GetDate();
-		}
-	}
-
-	void Application_Startup(object sender, StartupEventArgs e)
-	{
-		this.RootVisual = this.MediaElement;
-		this.MediaElement.Volume = 1;
-		this.MediaElement.AutoPlay = true;
-		this.MediaElement.MediaEnded += MediaElement_MediaEnded;
-		HtmlPage.RegisterScriptableObject("ASAP", this);
-		string filename;
-		if (e.InitParams.TryGetValue("file", out filename)) {
-			string s;
-			int song = -1;
-			if (e.InitParams.TryGetValue("song", out s))
-				song = int.Parse(s, CultureInfo.InvariantCulture);
-			Play(filename, song);
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/AppxManifest.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/AppxManifest.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/AppxManifest.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/AppxManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-	<Identity Name="ASAP" Publisher="CN=foxoft.com.pl" Version="3.1.5.0" />
-	<Properties>
-		<DisplayName>ASAP</DisplayName>
-		<PublisherDisplayName>foxoft.com.pl</PublisherDisplayName>
-		<Logo>Logo.png</Logo>
-		<Description>ASAP plays Atari 8-bit chiptunes</Description>
-	</Properties>
-	<Prerequisites>
-		<OSMinVersion>6.2</OSMinVersion>
-		<OSMaxVersionTested>6.2</OSMaxVersionTested>
-	</Prerequisites>
-	<Resources>
-		<Resource Language="en-us" />
-	</Resources>
-	<Applications>
-		<Application Id="MetroASAP" Executable="MetroASAP.exe" EntryPoint="MetroASAP">
-			<VisualElements DisplayName="ASAP" Description="ASAP plays Atari 8-bit chiptunes"
-				Logo="Logo.png" SmallLogo="SmallLogo.png" BackgroundColor="#c02020" ForegroundText="light">
-				<DefaultTile ShowName="allLogos" />
-				<SplashScreen Image="SplashScreen.png" />
-			</VisualElements>
-			<Extensions>
-				<Extension Category="windows.backgroundTasks" EntryPoint="MetroASAP">
-					<BackgroundTasks>
-						<Task Type="audio" />
-						<!-- <Task Type="controlChannel" /> XXX -->
-					</BackgroundTasks>
-				</Extension>
-				<Extension Category="windows.fileTypeAssociation">
-					<FileTypeAssociation Name="asap">
-						<Logo>FileLogo.png</Logo>
-						<SupportedFileTypes>
-							<FileType>.sap</FileType>
-							<FileType>.cmc</FileType>
-							<FileType>.cm3</FileType>
-							<FileType>.cmr</FileType>
-							<FileType>.cms</FileType>
-							<FileType>.dmc</FileType>
-							<FileType>.dlt</FileType>
-							<FileType>.mpt</FileType>
-							<FileType>.mpd</FileType>
-							<FileType>.rmt</FileType>
-							<FileType>.tmc</FileType>
-							<FileType>.tm8</FileType>
-							<FileType>.tm2</FileType>
-							<FileType>.fc</FileType>
-						</SupportedFileTypes>
-					</FileTypeAssociation>
-				</Extension>
-			</Extensions>
-		</Application>
-	</Applications>
-</Package>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/logo.svg kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/logo.svg
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/logo.svg	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/logo.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="3cm" height="3cm" viewBox="0 0 150 150" xmlns="http://www.w3.org/2000/svg" version="1.1">
-	<title>MetroASAP Logo</title>
-	<path d="M40,0 H150 V110 H110 V150 H0 V40 H40 Z M45,50 V100 H60 V50 Z M70,50 V100 L120,75 Z" fill="white" />
-</svg>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/MetroASAP.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/MetroASAP.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/MetroASAP.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/MetroASAP.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-/*
- * MetroASAP.cs - Windows 8 Metro Interface version of ASAP
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using System;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Media;
-using Windows.Storage;
-using Windows.Storage.Pickers;
-using Windows.Storage.Streams;
-using Windows.UI;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-
-using Sf.Asap;
-
-class ASAPRandomAccessStream : IRandomAccessStream
-{
-	readonly ASAP asap;
-	readonly byte[] wavHeader = new byte[44];
-	readonly ulong size;
-	ulong position;
-	const int BufferSize = 8192; // must be power of two
-	readonly byte[] samples = new byte[BufferSize];
-	bool needSeek = false;
-
-	public ASAPRandomAccessStream(ASAP asap, int duration)
-	{
-		this.asap = asap;
-		asap.GetWavHeader(this.wavHeader, ASAPSampleFormat.S16LE, false);
-		this.size = 8 + BitConverter.ToUInt32(wavHeader, 4);
-		this.position = 0;
-	}
-
-	uint Read(IBuffer buffer, uint offset, uint count)
-	{
-		if (this.needSeek) {
-			if (this.position < 44)
-				asap.Seek(0);
-			else {
-				ulong bytes = this.position - 44 & ~(BufferSize - 1UL);
-				asap.SeekSample((int) (bytes / wavHeader[32]));
-			}
-			this.needSeek = false;
-		}
-
-		ulong left = this.size - this.position;
-		if (count > left)
-			count = (uint) left;
-		if (this.position < 44UL) {
-			uint n = Math.Min(44 - (uint) this.position, count);
-			this.wavHeader.CopyTo((int) this.position, buffer, offset, (int) n);
-			this.position += n;
-			offset += n;
-			count -= n;
-		}
-		while (count > 0) {
-			int i = (int) this.position - 44 & BufferSize - 1;
-			if (i == 0)
-				asap.Generate(this.samples, BufferSize, ASAPSampleFormat.S16LE);
-			uint n = Math.Min((uint) BufferSize - (uint) i, count);
-			this.samples.CopyTo(i, buffer, offset, (int) n);
-			this.position += n;
-			offset += n;
-			count -= n;
-		}
-		return offset;
-	}
-
-	IAsyncOperationWithProgress<IBuffer, uint> IInputStream.ReadAsync(IBuffer buffer, uint count, InputStreamOptions options)
-	{
-#if true
-		return AsyncInfo.Run(async delegate (CancellationToken cancel, IProgress<uint> progress) {
-			cancel.ThrowIfCancellationRequested();
-			buffer.Length = Read(buffer, buffer.Length, count);
-			progress.Report(buffer.Length);
-			return buffer;
-		});
-#else
-		return AsyncInfo.Run((CancellationToken cancel, IProgress<uint> progress) => {
-			var task = new Task<IBuffer>(() => {
-				cancel.ThrowIfCancellationRequested();
-				buffer.Length = Read(buffer, buffer.Length, count);
-				progress.Report(buffer.Length);
-				return buffer;
-			}, cancel);
-			task.Start();
-			return task;
-		});
-#endif
-	}
-
-	void IRandomAccessStream.Seek(ulong position)
-	{
-		if (position != this.position) {
-			this.position = position;
-			this.needSeek = true;
-		}
-	}
-
-	bool IRandomAccessStream.CanRead
-	{
-		get
-		{
-			return true;
-		}
-	}
-
-	bool IRandomAccessStream.CanWrite
-	{
-		get
-		{
-			return false;
-		}
-	}
-
-	ulong IRandomAccessStream.Position
-	{
-		get
-		{
-			return this.position;
-		}
-	}
-
-	ulong IRandomAccessStream.Size
-	{
-		get
-		{
-			return this.size;
-		}
-		set
-		{
-			throw new NotSupportedException();
-		}
-	}
-
-	IRandomAccessStream IRandomAccessStream.CloneStream()
-	{
-		throw new NotImplementedException();
-	}
-
-	IInputStream IRandomAccessStream.GetInputStreamAt(ulong position)
-	{
-		throw new NotImplementedException();
-	}
-
-	IOutputStream IRandomAccessStream.GetOutputStreamAt(ulong position)
-	{
-		throw new NotSupportedException();
-	}
-
-	IAsyncOperationWithProgress<uint, uint> IOutputStream.WriteAsync(IBuffer buffer)
-	{
-		throw new NotSupportedException();
-	}
-
-	IAsyncOperation<bool> IOutputStream.FlushAsync()
-	{
-		throw new NotSupportedException();
-	}
-
-	public void Dispose()
-	{
-	}
-}
-
-class MetroASAP : Application
-{
-	MediaElement MyMedia;
-
-	static IAsyncOperation<StorageFile> PickFile()
-	{
-		FileOpenPicker fop = new FileOpenPicker {
-			FileTypeFilter = { ".sap", ".cmc", ".cm3", ".cmr", ".cms", ".dmc", ".dlt", ".mpt", ".mpd", ".rmt", ".tmc", ".tm8", ".tm2", ".fc" },
-			SuggestedStartLocation = PickerLocationId.ComputerFolder // Downloads, Desktop, MusicLibrary?
-		};
-		return fop.PickSingleFileAsync();
-	}
-
-	async Task PlayFile(StorageFile sf)
-	{
-		if (sf == null) {
-			Exit();
-			return;
-		}
-		byte[] module = new byte[ASAPInfo.MaxModuleLength];
-		int moduleLen;
-		using (IInputStream iis = await sf.OpenSequentialReadAsync()) {
-			IBuffer buf = await iis.ReadAsync(module.AsBuffer(), (uint) ASAPInfo.MaxModuleLength, InputStreamOptions.None);
-			moduleLen = (int) buf.Length;
-		}
-
-		ASAP asap = new ASAP();
-		asap.Load(sf.Name, module, moduleLen);
-		ASAPInfo info = asap.GetInfo();
-		int song = info.GetDefaultSong();
-		int duration = info.GetLoop(song) ? -1 : info.GetDuration(song);
-		asap.PlaySong(song, duration);
-
-		this.MyMedia = new MediaElement {
-			AudioCategory = AudioCategory.BackgroundCapableMedia,
-			Volume = 1,
-			AutoPlay = true
-		};
-		Window.Current.Content = this.MyMedia;
-		await Task.Yield();
-		this.MyMedia.SetSource(new ASAPRandomAccessStream(asap, duration), "audio/x-wav");
-
-		MediaControl.TrackName = info.GetTitleOrFilename();
-		MediaControl.ArtistName = info.GetAuthor();
-		MediaControl.PlayPressed += MediaControl_PlayPressed;
-		MediaControl.PausePressed += MediaControl_PausePressed;
-		MediaControl.PlayPauseTogglePressed += MediaControl_PlayPauseTogglePressed;
-		MediaControl.StopPressed += MediaControl_StopPressed;
-		MediaControl.IsPlaying = true;
-	}
-
-	static void DispatchMediaControl(Func<bool> func)
-	{
-		Window.Current.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => {
-			MediaControl.IsPlaying = func();
-		});
-	}
-
-	void MediaControl_PlayPressed(object sender, object e)
-	{
-		DispatchMediaControl(() => {
-			this.MyMedia.Play();
-			return true;
-		});
-	}
-
-	void MediaControl_PausePressed(object sender, object e)
-	{
-		DispatchMediaControl(() => {
-			this.MyMedia.Pause();
-			return false;
-		});
-	}
-
-	void MediaControl_PlayPauseTogglePressed(object sender, object e)
-	{
-		DispatchMediaControl(() => {
-			if (this.MyMedia.CurrentState == MediaElementState.Paused) {
-				this.MyMedia.Play();
-				return true;
-			}
-			else {
-				this.MyMedia.Pause();
-				return false;
-			}
-		});
-	}
-
-	void MediaControl_StopPressed(object sender, object e)
-	{
-		DispatchMediaControl(() => {
-			this.MyMedia.Stop();
-			return false;
-		});
-	}
-
-	protected override async void OnLaunched(LaunchActivatedEventArgs args)
-	{
-		Window.Current.Activate();
-		StorageFile sf = await PickFile();
-		await PlayFile(sf);
-	}
-
-	protected override async void OnFileActivated(FileActivatedEventArgs args)
-	{
-		StorageFile sf = args.Files[0] as StorageFile;
-		await PlayFile(sf);
-	}
-
-	public static void Main(string[] args)
-	{
-		Application.Start(p => new MetroASAP());
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/winrt.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/winrt.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/csharp/winrt/winrt.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/csharp/winrt/winrt.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-CSC45 = $(DO)"C:/Windows/Microsoft.NET/Framework/v4.0.30319/csc.exe" -nologo -o+ -out:$@ -t:appcontainerexe $(subst /,\\,$^)
-WIN8_SDK = "C:/Program Files (x86)/Windows Kits/8.0"
-MAKEAPPX = $(DO)$(WIN8_SDK)/bin/x86/makeappx.exe
-NET45_RA = "C:/Program Files (x86)/Reference Assemblies/Microsoft/Framework/.NETCore/v4.5"
-CONVERT = $(DO)convert
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "winrt.mk")
-endif
-
-csharp/winrt/MetroASAP.appx: csharp/winrt/obj/MetroASAP.exe csharp/winrt/obj/AppxManifest.xml csharp/winrt/obj/Logo.png csharp/winrt/obj/SmallLogo.png csharp/winrt/obj/SplashScreen.png csharp/winrt/obj/FileLogo.png
-	$(MAKEAPPX) pack -d csharp/winrt/obj -o -p $@
-CLEAN += csharp/winrt/MetroASAP.appx
-
-csharp/winrt/obj/MetroASAP.exe: $(srcdir)csharp/winrt/MetroASAP.cs csharp/asap.cs
-	$(CSC45) -nostdlib -noconfig -r:$(WIN8_SDK)/References/CommonConfiguration/Neutral/Windows.winmd \
-		-r:$(NET45_RA)/mscorlib.dll -r:$(NET45_RA)/System.Diagnostics.Debug.dll -r:$(NET45_RA)/System.Runtime.dll \
-		-r:$(NET45_RA)/System.Runtime.Extensions.dll -r:$(NET45_RA)/System.Runtime.InteropServices.WindowsRuntime.dll \
-		-r:$(NET45_RA)/System.Runtime.WindowsRuntime.dll -r:$(NET45_RA)/System.Text.Encoding.dll -r:$(NET45_RA)/System.Threading.Tasks.dll
-CLEANDIR += csharp/winrt/obj
-
-csharp/winrt/obj/AppxManifest.xml: $(srcdir)csharp/winrt/AppxManifest.xml
-	$(COPY)
-
-csharp/winrt/obj/Logo.png: $(srcdir)csharp/winrt/logo.svg
-	$(CONVERT) -background none -density 600 $< -gravity Center -resize "75x75!" -extent 150x150 -quality 95 $@
-
-csharp/winrt/obj/SmallLogo.png: $(srcdir)csharp/winrt/logo.svg
-	$(CONVERT) -background none -density 600 $< -gravity Center -resize "28x28!" -extent 30x30 -quality 95 $@
-
-csharp/winrt/obj/SplashScreen.png: $(srcdir)csharp/winrt/logo.svg
-	$(CONVERT) -background none -density 600 $< -gravity Center -resize "280x280!" -extent 620x300 -quality 95 $@
-
-csharp/winrt/obj/FileLogo.png: $(srcdir)csharp/winrt/logo.svg
-	$(CONVERT) -background "#c02020" -density 600 $< -gravity Center -resize "36x36!" -extent 48x48 -quality 95 $@
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/alsa/pcm.d kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/alsa/pcm.d
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/alsa/pcm.d	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/alsa/pcm.d	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-/*
- * pcm.d - minimum ALSA PCM interface for D port of ASAP
- *
- * Copyright (C) 2011  Adrian Matoga
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-module alsa.pcm;
-
-version (linux)
-{
-
-pragma (lib, "asound");
-
-// Dummy struct, only pointers are used.
-struct snd_pcm_t
-{
-}
-
-enum snd_pcm_stream_t
-{
-	SND_PCM_STREAM_PLAYBACK = 0,
-	SND_PCM_STREAM_CAPTURE,
-	SND_PCM_STREAM_LAST = SND_PCM_STREAM_CAPTURE
-}
-
-enum snd_pcm_access_t
-{
-	SND_PCM_ACCESS_MMAP_INTERLEAVED = 0,
-	SND_PCM_ACCESS_MMAP_NONINTERLEAVED,
-	SND_PCM_ACCESS_MMAP_COMPLEX,
-	SND_PCM_ACCESS_RW_INTERLEAVED,
-	SND_PCM_ACCESS_RW_NONINTERLEAVED,
-	SND_PCM_ACCESS_LAST = SND_PCM_ACCESS_RW_NONINTERLEAVED
-}
-
-enum snd_pcm_format_t
-{
-	SND_PCM_FORMAT_UNKNOWN = -1,
-	SND_PCM_FORMAT_S8 = 0,
-	SND_PCM_FORMAT_U8,
-	SND_PCM_FORMAT_S16_LE,
-	SND_PCM_FORMAT_S16_BE,
-	SND_PCM_FORMAT_U16_LE,
-	SND_PCM_FORMAT_U16_BE,
-	SND_PCM_FORMAT_S24_LE,
-	SND_PCM_FORMAT_S24_BE,
-	SND_PCM_FORMAT_U24_LE,
-	SND_PCM_FORMAT_U24_BE,
-	SND_PCM_FORMAT_S32_LE,
-	SND_PCM_FORMAT_S32_BE,
-	SND_PCM_FORMAT_U32_LE,
-	SND_PCM_FORMAT_U32_BE,
-	SND_PCM_FORMAT_FLOAT_LE,
-	SND_PCM_FORMAT_FLOAT_BE,
-	SND_PCM_FORMAT_FLOAT64_LE,
-	SND_PCM_FORMAT_FLOAT64_BE,
-	SND_PCM_FORMAT_IEC958_SUBFRAME_LE,
-	SND_PCM_FORMAT_IEC958_SUBFRAME_BE,
-	SND_PCM_FORMAT_MU_LAW,
-	SND_PCM_FORMAT_A_LAW,
-	SND_PCM_FORMAT_IMA_ADPCM,
-	SND_PCM_FORMAT_MPEG,
-	SND_PCM_FORMAT_GSM,
-	SND_PCM_FORMAT_SPECIAL = 31,
-	SND_PCM_FORMAT_S24_3LE = 32,
-	SND_PCM_FORMAT_S24_3BE,
-	SND_PCM_FORMAT_U24_3LE,
-	SND_PCM_FORMAT_U24_3BE,
-	SND_PCM_FORMAT_S20_3LE,
-	SND_PCM_FORMAT_S20_3BE,
-	SND_PCM_FORMAT_U20_3LE,
-	SND_PCM_FORMAT_U20_3BE,
-	SND_PCM_FORMAT_S18_3LE,
-	SND_PCM_FORMAT_S18_3BE,
-	SND_PCM_FORMAT_U18_3LE,
-	SND_PCM_FORMAT_U18_3BE,
-	SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE,
-}
-
-version (X86_64)
-{
-	alias long snd_pcm_sframes_t;
-	alias ulong snd_pcm_uframes_t;
-}
-else version (X86)
-{
-	alias int snd_pcm_sframes_t;
-	alias uint snd_pcm_uframes_t;
-}
-
-extern (C)
-int snd_pcm_open(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
-
-extern (C)
-int snd_pcm_set_params(
-	snd_pcm_t *pcm,
-	snd_pcm_format_t format,
-	snd_pcm_access_t access,
-	uint channels,
-	uint rate,
-	int soft_resample,
-	uint latency);
-
-extern (C)
-snd_pcm_sframes_t snd_pcm_writei(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
-
-extern (C)
-int snd_pcm_recover(snd_pcm_t *pcm, int err, int silent);
-
-extern (C)
-int snd_pcm_close(snd_pcm_t *pcm);
-
-} // version (linux)
-
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/asap2wav.d kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/asap2wav.d
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/asap2wav.d	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/asap2wav.d	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-/*
- * asap2wav.d - converter of ASAP-supported formats to WAV files
- *
- * Copyright (C) 2011  Adrian Matoga
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import std.stdio;
-import std.conv;
-import std.file;
-import std.string;
-
-import asap;
-
-string outputFilename;
-bool outputHeader = true;
-int song = -1;
-ASAPSampleFormat format = ASAPSampleFormat.S16LE;
-int duration = -1;
-int muteMask = 0;
-
-void printHelp()
-{
-	write(
-		"Usage: asap2wav [OPTIONS] INPUTFILE...\n" ~
-		"Each INPUTFILE must be in a supported format:\n" ~
-		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" ~
-		"Options:\n" ~
-		"-o FILE     --output=FILE      Set output file name\n" ~
-		"-s SONG     --song=SONG        Select subsong number (zero-based)\n" ~
-		"-t TIME     --time=TIME        Set output length (MM:SS format)\n" ~
-		"-b          --byte-samples     Output 8-bit samples\n" ~
-		"-w          --word-samples     Output 16-bit samples (default)\n" ~
-		"            --raw              Output raw audio (no WAV header)\n" ~
-		"-m CHANNELS --mute=CHANNELS    Mute POKEY chanels (1-8)\n" ~
-		"-h          --help             Display this information\n" ~
-		"-v          --version          Display version information\n"
-	);
-}
-
-void setSong(string s)
-{
-	song = to!int(s);
-}
-
-void setTime(string s)
-{
-	duration = ASAPInfo.ParseDuration(s);
-}
-
-void setMuteMask(string s)
-{
-	int mask = 0;
-	foreach (dchar c; s) {
-		if (c >= '1' && c <= '8')
-			mask |= 1 << (c - '1');
-	}
-	muteMask = mask;
-}
-
-void processFile(string inputFilename)
-{
-	auto asap = new ASAP;
-	auto mod = cast(ubyte[]) read(inputFilename, ASAPInfo.MaxModuleLength);
-	asap.Load(inputFilename, mod, cast(int) mod.length);
-	ASAPInfo info = asap.GetInfo();
-	if (song < 0)
-		song = info.GetDefaultSong();
-	if (duration < 0) {
-		duration = info.GetDuration(song);
-		if (duration < 0)
-			duration = 180 * 1000;
-	}
-	asap.PlaySong(song, duration);
-	asap.MutePokeyChannels(muteMask);
-	if (!outputFilename.length) {
-		auto i = inputFilename.lastIndexOf('.');
-		outputFilename = inputFilename[0 .. i + 1] ~ (outputHeader ? "wav" : "raw");
-	}
-	auto s = File(outputFilename, "wb");
-	auto buffer = new ubyte[8192];
-	if (outputHeader) {
-		int len = asap.GetWavHeader(buffer, format, false);
-		s.rawWrite(buffer[0 .. len]);
-	}
-	while ((buffer.length = asap.Generate(buffer, cast(int) buffer.length, format)) > 0)
-		s.rawWrite(buffer);
-	s.close();
-	outputFilename = null;
-	song = -1;
-	duration = -1;
-}
-
-int main(string[] args)
-{
-	bool noInputFiles = true;
-	for (int i = 1; i < args.length; i++) {
-		string arg = args[i];
-		if (arg[0] != '-') {
-			processFile(arg);
-			noInputFiles = false;
-		}
-		else if (arg == "-o")
-			outputFilename = args[++i];
-		else if (arg.startsWith("--output="))
-			outputFilename = arg[9 .. $];
-		else if (arg == "-s")
-			setSong(args[++i]);
-		else if (arg.startsWith("--song="))
-			setSong(arg[7 .. $]);
-		else if (arg == "-t")
-			setTime(args[++i]);
-		else if (arg.startsWith("--time="))
-			setTime(arg[7 .. $]);
-		else if (arg == "-b" || arg == "--byte-samples")
-			format = ASAPSampleFormat.U8;
-		else if (arg == "-w" || arg == "--word-samples")
-			format = ASAPSampleFormat.S16LE;
-		else if (arg == "--raw")
-			outputHeader = false;
-		else if (arg == "-m")
-			setMuteMask(args[++i]);
-		else if (arg.startsWith("--mute="))
-			setMuteMask(arg[7 .. $]);
-		else if (arg == "-h" || arg == "--help") {
-			printHelp();
-			noInputFiles = false;
-		}
-		else if (arg == "-v" || arg == "--version") {
-			writeln("ASAP2WAV (D) ", ASAPInfo.Version);
-			noInputFiles = false;
-		}
-		else
-			throw new Exception("unknown option: " ~ arg);
-	}
-	if (noInputFiles) {
-		printHelp();
-		return 1;
-	}
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/asapplay.d kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/asapplay.d
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/asapplay.d	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/asapplay.d	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/*
- * asapplay.d - D ASAP player
- *
- * Copyright (C) 2011  Adrian Matoga
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import std.math;
-import std.stdio;
-import std.file;
-import std.conv;
-import std.string;
-
-import waveout;
-import asap;
-
-int song = -1;
-int duration = -1;
-bool showInfo;
-
-void processFile(string filename)
-{
-	auto asap = new ASAP;
-	auto mod = cast(ubyte[]) read(filename, ASAPInfo.MaxModuleLength);
-	asap.Load(filename, mod, cast(int) mod.length);
-	ASAPInfo info = asap.GetInfo();
-	if (song < 0)
-		song = info.GetDefaultSong();
-	if (duration < 0) {
-		duration = info.GetDuration(song);
-		if (duration < 0)
-			duration = 180 * 1000;
-	}
-	asap.PlaySong(song, duration);
-	auto wo = new WaveOut(cast(ushort) info.Channels, 44100, 16);
-	scope(exit) wo.close();
-	ubyte[] buffer = new ubyte[8192];
-	if (showInfo)
-		writefln("%s - %s (%d:%02d)", info.GetAuthor(), info.GetTitle(), duration / 60000, duration / 1000 % 60);
-	while ((buffer.length = asap.Generate(buffer, cast(int) buffer.length, ASAPSampleFormat.S16LE)) > 0)
-		wo.write(buffer);
-	song = -1;
-	duration = -1;
-}
-
-void printHelp()
-{
-	write(
-		"Usage: asapplay [OPTIONS] INPUTFILE...\n" ~
-		"Each INPUTFILE must be in a supported format:\n" ~
-		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" ~
-		"Options:\n" ~
-		"-s SONG     --song=SONG        Select subsong number (zero-based)\n" ~
-		"-t TIME     --time=TIME        Set output length (MM:SS format)\n" ~
-		"-i          --show-info        Show song info\n" ~
-		"-h          --help             Display this information\n" ~
-		"-v          --version          Display version information\n"
-	);
-}
-
-void setSong(string s)
-{
-	song = to!int(s);
-}
-
-void setTime(string s)
-{
-	duration = ASAPInfo.ParseDuration(s);
-}
-
-int main(string[] args)
-{
-	bool noInputFiles = true;
-	for (size_t i = 1; i < args.length; ++i) {
-		auto arg = args[i];
-		if (arg[0] != '-') {
-			processFile(arg);
-			noInputFiles = false;
-		}
-		else if (arg == "-i" || arg == "--show-info")
-			showInfo = true;
-		else if (arg == "-s")
-			setSong(args[++i]);
-		else if (arg.startsWith("--song="))
-			setSong(arg[7 .. $]);
-		else if (arg == "-t")
-			setTime(args[++i]);
-		else if (arg.startsWith("--time="))
-			setTime(arg[7 .. $]);
-		else if (arg == "-h" || arg == "--help") {
-			printHelp();
-			noInputFiles = false;
-		}
-		else if (arg == "-v" || arg == "--version") {
-			writeln("asapplay (D) ", ASAPInfo.Version);
-			noInputFiles = false;
-		}
-		else
-			throw new Exception("unknown option: ", arg);
-	}
-	if (noInputFiles) {
-		printHelp();
-		return 1;
-	}
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/d.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/d.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/d.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/d.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-DC = $(DO)dmd -release -inline -O $(if $(WINDIR),-of$(subst /,\\,$@) $(subst /,\\,$^),-of$@ $^)
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "d.mk")
-endif
-
-d: d/asap2wav.exe d/asapplay.exe
-.PHONY: d
-
-d/asap2wav.exe: $(srcdir)d/asap2wav.d d/asap.d
-	$(DC)
-CLEAN += d/asap2wav.exe d/asap2wav.obj asap2wav.map
-
-d/asapplay.exe: $(call src,d/asapplay.d d/waveout.d d/alsa/pcm.d) d/asap.d
-	$(DC)
-CLEAN += d/asapplay.exe d/asapplay.obj asapplay.map
-
-d/asap.d: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-	$(CITO)
-CLEAN += d/asap.d
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/waveout.d kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/waveout.d
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/d/waveout.d	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/d/waveout.d	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-/*
- * waveout.d - convenience wrapper for Windows waveOut API and ALSA
- *
- * Copyright (C) 2011  Adrian Matoga
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import std.stdio;
-import std.exception;
-import std.algorithm;
-import std.conv;
-import std.string;
-
-version (Windows)
-{
-
-import win32.windef: UINT, DWORD, DWORD_PTR, NULL;
-import win32.winbase: GetCurrentThreadId, INVALID_HANDLE_VALUE;
-import win32.winuser: PostThreadMessage, GetMessage, PeekMessage, MSG, WM_USER, PM_REMOVE;
-import win32.mmsystem;
-
-pragma (lib, "winmm");
-
-enum IDM_WOM_DONE = WM_USER;
-
-class WaveOutException : Exception
-{
-	this(string msg)
-	{
-		super(msg);
-	}
-}
-
-extern (Windows)
-private void waveOutProc(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance, DWORD dwParam1, DWORD dwParam2)
-{
-	WaveOut wo = *(cast(WaveOut*) dwInstance);
-	if (uMsg == WOM_DONE)
-		PostThreadMessage(wo.threadId, IDM_WOM_DONE, 0, 0);
-}
-
-class WaveOut
-{
-	this(ushort channels, uint samplesPerSec, ushort bitsPerSample, size_t bufferSize = 16384)
-	{
-		thisObj = this;
-		threadId = GetCurrentThreadId();
-		enum bufferCount = 2;
-		buffers = new char[][bufferCount];
-		foreach (i; 0 .. bufferCount) {
-			buffers[i] = new char[bufferSize];
-			headers ~= WAVEHDR(buffers[i].ptr, buffers[i].length, 0, 0, 0, 0, NULL, 0);
-		}
-		WAVEFORMATEX wfx;
-		wfx.wFormatTag = WAVE_FORMAT_PCM;
-		wfx.nChannels = channels;
-		wfx.nSamplesPerSec = samplesPerSec;
-		wfx.nBlockAlign = cast(ushort) (channels * bitsPerSample / 8);
-		wfx.nAvgBytesPerSec = samplesPerSec * wfx.nBlockAlign;
-		wfx.wBitsPerSample = bitsPerSample;
-		wfx.cbSize = 0;
-		if (waveOutOpen(&hwo, WAVE_MAPPER, &wfx, cast(DWORD_PTR) &waveOutProc, cast(DWORD_PTR) &thisObj, CALLBACK_FUNCTION) != MMSYSERR_NOERROR)
-			throw new WaveOutException("waveOutOpen failed");
-		scope (failure) {
-			waveOutClose(hwo);
-			foreach (i; 0 .. bufferCount)
-				if (headers[i].dwFlags & WHDR_PREPARED)
-					waveOutUnprepareHeader(hwo, &headers[i], headers[i].sizeof);
-		}
-		foreach (i; 0 .. bufferCount)
-			if (waveOutPrepareHeader(hwo, &headers[i], headers[i].sizeof) != MMSYSERR_NOERROR)
-				throw new WaveOutException("waveOutPrepareHeader failed");
-	}
-
-	~this()
-	{
-		close();
-	}
-
-	void close()
-	{
-		if (hwo == INVALID_HANDLE_VALUE)
-			return;
-		waveOutReset(hwo);
-		foreach (ref hdr; headers) {
-			if (hdr.dwFlags & WHDR_PREPARED)
-				waveOutUnprepareHeader(hwo, &hdr, hdr.sizeof);
-		}
-		waveOutClose(hwo);
-		hwo = INVALID_HANDLE_VALUE;
-		MSG msg;
-		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {}
-	}
-
-	void write(const(ubyte)[] buf)
-	{
-		while (buf.length) {
-			if (usedBuffers == buffers.length) {
-				MSG msg;
-				if (GetMessage(&msg, NULL, 0, 0) <= 0 || msg.message != IDM_WOM_DONE)
-					throw new WaveOutException("GetMessage failed");
-				--usedBuffers;
-			}
-			size_t toEnd = buffers[currentBuffer].length - offset;
-			size_t toWrite = min(buf.length, toEnd);
-			buffers[currentBuffer][offset .. offset + toWrite] = cast(const(char[])) buf[0 .. toWrite];
-			buf = buf[toWrite .. $];
-			if ((offset += toWrite) >= buffers[currentBuffer].length) {
-				if (waveOutWrite(hwo, &headers[currentBuffer], headers[currentBuffer].sizeof) != MMSYSERR_NOERROR)
-					throw new WaveOutException("waveOutWrite failed");
-				offset = 0;
-				++usedBuffers;
-				if (++currentBuffer >= buffers.length)
-					currentBuffer = 0;
-			}
-		}
-	}
-
-private:
-	WaveOut thisObj;
-	DWORD threadId;
-
-	HWAVEOUT hwo = INVALID_HANDLE_VALUE;
-
-	WAVEHDR[] headers;
-	char[][] buffers;
-
-	size_t currentBuffer;
-	size_t offset;
-	size_t usedBuffers;
-}
-
-} // version (Windows)
-
-version (linux)
-{
-
-import alsa.pcm;
-
-class WaveOut
-{
-	this(ushort channels, uint samplesPerSec, ushort bitsPerSample, size_t bufferSize = 16384)
-	{
-		int err;
-		if ((err = snd_pcm_open(&hpcm, "default".toStringz(), snd_pcm_stream_t.SND_PCM_STREAM_PLAYBACK, 0)) < 0)
-			throw new Exception("Cannot open default audio device");
-		if ((err = snd_pcm_set_params(
-			hpcm, bitsPerSample == 8 ? snd_pcm_format_t.SND_PCM_FORMAT_U8 : snd_pcm_format_t.SND_PCM_FORMAT_S16_LE,
-			snd_pcm_access_t.SND_PCM_ACCESS_RW_INTERLEAVED,
-			channels, samplesPerSec, 1, 50000)) < 0) {
-			close();
-			throw new Exception("Cannot set audio device params");
-		}
-		bytesPerSample = bitsPerSample / 8 * channels;
-	}
-
-	~this()
-	{
-		close();
-	}
-
-	void close()
-	{
-		if (hpcm is null)
-			return;
-		snd_pcm_close(hpcm);
-		hpcm = null;
-	}
-
-	void write(const(ubyte)[] buf)
-	{
-		snd_pcm_sframes_t frames = snd_pcm_writei(hpcm, buf.ptr, buf.length / bytesPerSample);
-		if (frames < 0) {
-			frames = snd_pcm_recover(hpcm, cast(int) frames, 0);
-			if (frames < 0)
-				throw new Exception("snd_pcm_writei failed");
-		}
-	}
-
-private:
-	snd_pcm_t* hpcm;
-	int bytesPerSample;
-}
-
-} // version (linux)
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap-dev.install kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap-dev.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap-dev.install	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap-dev.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/include/asap.h
-usr/lib/libasap.a
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap-gstreamer0.10.install kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap-gstreamer0.10.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap-gstreamer0.10.install	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap-gstreamer0.10.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/gstreamer-0.10/libgstasapdec.so
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap.install kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap.install	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/bin/asapconv
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap-vlc.install kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap-vlc.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/asap-vlc.install	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/asap-vlc.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/vlc/plugins/demux/libasap_plugin.so
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/changelog kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/changelog
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/changelog	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/changelog	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-asap (3.1.5-1) UNRELEASED; urgency=low
-
-  * First deb packaging.
-
- -- Piotr Fusik <fox@scene.pl>  Fri, 16 Aug 2013 15:08:15 +0200
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/compat kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/compat
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/compat	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/control kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/control
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/control	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-Source: asap
-Maintainer: Piotr Fusik <fox@scene.pl>
-Section: contrib/sound
-Priority: optional
-Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7), libgstreamer0.10-dev, libvlccore-dev
-
-Package: asap
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Provides "asapconv" command-line converter of Atari 8-bit music
- to WAV files. Supports the following file formats:
- SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
-
-Package: asap-dev
-Architecture: any
-Description: Development library providing Atari 8-bit music emulation.
-
-Package: asap-gstreamer0.10
-Architecture: any
-Depends: libgstreamer0.10-0 (>= 0.10.36), ${shlibs:Depends}
-Description: Provides playback of Atari 8-bit music in the SAP format
- in GStreamer-based players.
-
-Package: asap-vlc
-Architecture: any
-Depends: vlc, ${shlibs:Depends}
-Description: Provides playback of Atari 8-bit music in VLC.
- Supports the following file formats: SAP, RMT, FC.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/copyright kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/copyright
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/copyright	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/copyright	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Name: asap
-Source: http://asap.sourceforge.net
-
-Files: *
-Copyright: 2005-2013 Piotr Fusik <fox@scene.pl>
-License: GPL-2+
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/rules kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/rules
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/debian/rules	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/debian/rules	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
-
-# skip "make clean" to avoid dependency on xasm, mads and cito
-override_dh_auto_clean:
-
-override_dh_auto_build:
-	$(MAKE) asapconv lib asap-gstreamer asap-vlc
-
-# skip "make check" to avoid dependency on Acid800
-override_dh_auto_test:
-
-override_dh_auto_install:
-	$(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install install-gstreamer install-vlc
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/flash/ASAPPlayer.as kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/flash/ASAPPlayer.as
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/flash/ASAPPlayer.as	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/flash/ASAPPlayer.as	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-/*
- * ASAPPlayer.as - ASAP Flash player
- *
- * Copyright (C) 2009-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package
-{
-	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.events.SampleDataEvent;
-	import flash.external.ExternalInterface;
-	import flash.media.Sound;
-	import flash.media.SoundChannel;
-	import flash.net.URLLoader;
-	import flash.net.URLLoaderDataFormat;
-	import flash.net.URLRequest;
-	import flash.utils.ByteArray;
-	import net.sf.asap.ASAP;
-	import net.sf.asap.ASAPInfo;
-
-	public class ASAPPlayer extends Sprite
-	{
-		private var filename : String;
-		private var song : int;
-		private var asap : ASAP = new ASAP();
-		private var soundChannel : SoundChannel = null;
-
-		private function callJS(paramName : String) : void
-		{
-			var js : String = this.loaderInfo.parameters[paramName];
-			if (js != null)
-				ExternalInterface.call(js);
-		}
-
-		private function startPlayback() : void
-		{
-			var sound : Sound = new Sound();
-			function generator(event : SampleDataEvent) : void
-			{
-				asap.generate(event.data, 8192, 0);
-			}
-			sound.addEventListener(SampleDataEvent.SAMPLE_DATA, generator);
-			this.soundChannel = sound.play();
-			function soundCompleteHandler(event : Event) : void
-			{
-				callJS("onPlaybackEnd");
-			}
-			this.soundChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler);
-		}
-
-		private function loadCompleteHandler(event : Event) : void
-		{
-			var module : ByteArray = URLLoader(event.target).data;
-			stop();
-			this.asap.load(this.filename, module, module.length);
-			var info : ASAPInfo = this.asap.getInfo();
-			var song : int = this.song;
-			if (song < 0)
-				song = info.getDefaultSong();
-			var duration : int = info.getLoop(song) ? -1 : info.getDuration(song);
-			this.asap.playSong(song, duration);
-			callJS("onLoad");
-			startPlayback();
-		}
-
-		public function play(filename : String, song : int = -1) : void
-		{
-			this.filename = filename;
-			this.song = song;
-			var loader : URLLoader = new URLLoader();
-			loader.dataFormat = URLLoaderDataFormat.BINARY;
-			loader.addEventListener(Event.COMPLETE, loadCompleteHandler);
-			loader.load(new URLRequest(filename));
-		}
-
-		public function pause() : Boolean
-		{
-			if (this.soundChannel != null) {
-				stop();
-				return true;
-			}
-			else {
-				startPlayback();
-				return false;
-			}
-		}
-
-		public function stop() : void
-		{
-			if (this.soundChannel != null) {
-				this.soundChannel.stop();
-				this.soundChannel = null;
-			}
-		}
-
-		public function getAuthor() : String
-		{
-			return this.asap.getInfo().getAuthor();
-		}
-
-		public function getTitle() : String
-		{
-			return this.asap.getInfo().getTitle();
-		}
-
-		public function getDate() : String
-		{
-			return this.asap.getInfo().getDate();
-		}
-
-		public function ASAPPlayer()
-		{
-			ExternalInterface.addCallback("asapPlay", play);
-			ExternalInterface.addCallback("asapPause", pause);
-			ExternalInterface.addCallback("asapStop", stop);
-			ExternalInterface.addCallback("getAuthor", getAuthor);
-			ExternalInterface.addCallback("getTitle", getTitle);
-			ExternalInterface.addCallback("getDate", getDate);
-			var parameters : Object = this.loaderInfo.parameters;
-			if (parameters.file != null)
-				play(parameters.file, parameters.song != null ? parameters.song : -1);
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/flash/flash.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/flash/flash.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/flash/flash.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/flash/flash.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-MXMLC = $(DO)mxmlc -o $@ -compiler.optimize -compiler.warn-duplicate-variable-def=false -static-link-runtime-shared-libraries -target-player 10 $<
-# -compiler.debug -compiler.warn-no-type-decl=false
-ASDOC = $(DO)asdoc
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "flash.mk")
-endif
-
-flash/asap.swf: $(srcdir)flash/ASAPPlayer.as flash/net/sf/asap/ASAP.as $(ASM6502_PLAYERS_OBX)
-	$(MXMLC) -source-path flash 6502
-CLEAN += flash/asap.swf
-
-flash/net/sf/asap/ASAP.as: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-	$(CITO) -n net.sf.asap -D FLASH
-CLEAN += flash/net/sf/asap/*.as
-
-debug-flash:
-	tail -f "${APPDATA}\Macromedia\Flash Player\Logs\flashlog.txt"
-.PHONY: debug-flash
-
-flash/doc: flash/net/sf/asap/ASAP.as
-	$(ASDOC) -compiler.warn-duplicate-variable-def=false -compiler.warn-const-not-initialized=false -output=$@ -window-title="ASAP ActionScript API" -main-title="ASAP (Another Slight Atari Player) ActionScript API" -doc-sources=$(<D)
-CLEANDIR += flash/doc
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/flashpack.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/flashpack.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/flashpack.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/flashpack.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +0,0 @@
-// flashpack.ci - Atari 8-bit executable compression
-//
-// Copyright (C) 2011-2013  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-enum FlashPackLoadState
-{
-	StartLowByte,
-	StartHighByte,
-	EndLowByte,
-	EndHighByte,
-	Content
-}
-
-enum FlashPackItemType
-{
-	Literal,
-	CopyTwoBytes,
-	CopyThreeBytes,
-	CopyManyBytes,
-	SetAddress,
-	EndOfStream
-}
-
-class FlashPackItem
-{
-	FlashPackItemType Type;
-	int Value;
-
-	int WriteValueTo(byte[] buffer, int index)
-	{
-		switch (Type) {
-		case FlashPackItemType.Literal:
-			buffer[index] = Value;
-			return 1;
-		case FlashPackItemType.CopyTwoBytes:
-			buffer[index] = (0x80 - Value) << 1;
-			return 1;
-		case FlashPackItemType.CopyThreeBytes:
-			buffer[index] = ((0x80 - Value) << 1) + 1;
-			return 1;
-		case FlashPackItemType.CopyManyBytes:
-			buffer[index] = 1;
-			buffer[index + 1] = Value;
-			return 2;
-		case FlashPackItemType.SetAddress:
-			int value = Value - 0x80;
-			buffer[index] = 0;
-			buffer[index + 1] = value.LowByte;
-			buffer[index + 2] = value >> 8;
-			return 3;
-		default: // case FlashPackItemType.EndOfStream:
-			buffer[index] = 1;
-			buffer[index + 1] = 0;
-			return 2;
-		}
-	}
-}
-
-class FlashPack
-{
-	int[65536] Memory; // TODO: short
-	int LoadAddress;
-	int LoadEndAddress;
-	FlashPackLoadState LoadState;
-
-	FlashPack()
-	{
-		for (int i = 0; i < 65536; i++)
-			Memory[i] = -1;
-		LoadState = FlashPackLoadState.StartLowByte;
-	}
-
-	internal void LoadByte(int data)
-	{
-		switch (LoadState) {
-		case FlashPackLoadState.StartLowByte:
-			LoadAddress = data;
-			LoadState = FlashPackLoadState.StartHighByte;
-			break;
-		case FlashPackLoadState.StartHighByte:
-			LoadAddress += data << 8;
-			LoadState = LoadAddress == 0xffff ? FlashPackLoadState.StartLowByte : FlashPackLoadState.EndLowByte;
-			break;
-		case FlashPackLoadState.EndLowByte:
-			LoadEndAddress = data;
-			LoadState = FlashPackLoadState.EndHighByte;
-			break;
-		case FlashPackLoadState.EndHighByte:
-			LoadEndAddress += data << 8;
-			LoadState = FlashPackLoadState.Content;
-			break;
-		case FlashPackLoadState.Content:
-			Memory[LoadAddress] = data;
-			if (LoadAddress == LoadEndAddress)
-				LoadState = FlashPackLoadState.StartLowByte;
-			else
-				LoadAddress = (LoadAddress + 1) & 0xffff;
-			break;
-		}
-	}
-
-	const int MinLoadAddress = 0x2000; // safe for most of Atari DOSes
-
-	int FindHole()
-	{
-		const int holeSize = 0x400; // FIXME: just a guess
-		int end = 0xbc1f; // below the Display List for standard text mode
-		for (;;) {
-			while (Memory[end] >= 0)
-				if (--end < MinLoadAddress + holeSize)
-					throw "Too much data to compress";
-			int start = end;
-			while (Memory[--start] < 0)
-				if (end - start >= holeSize - 1)
-					return end;
-			end = start;
-		}
-	}
-
-	byte[65536] Compressed;
-	int CompressedLength;
-
-	FlashPackItem()[64] Items;
-	int ItemsCount;
-
-	int GetInnerFlags(int index)
-	{
-		int flags = 1;
-		do {
-			flags <<= 1;
-			if (index < ItemsCount && Items[index++].Type != FlashPackItemType.Literal)
-				flags++;
-		} while (flags < 0x100);
-		return flags & 0xff;
-	}
-
-	void PutItems()
-	{
-		int outerFlags = 0;
-		for (int i = 0; i < ItemsCount; i += 8) {
-			if (GetInnerFlags(i) != 0)
-				outerFlags |= 0x80 >> (i >> 3);
-		}
-		Compressed[CompressedLength++] = outerFlags;
-		for (int i = 0; i < ItemsCount; i++) {
-			if ((i & 7) == 0) {
-				int flags = GetInnerFlags(i);
-				if (flags != 0)
-					Compressed[CompressedLength++] = flags;
-			}
-			CompressedLength += Items[i].WriteValueTo(Compressed, CompressedLength);
-		}
-	}
-
-	void PutItem(FlashPackItemType type, int value)
-	{
-		if (ItemsCount >= 64) {
-			PutItems();
-			ItemsCount = 0;
-		}
-		Items[ItemsCount].Type = type;
-		Items[ItemsCount].Value = value;
-		ItemsCount++;
-	}
-
-	bool IsLiteralPreferred()
-	{
-		return (ItemsCount & 7) == 7 && GetInnerFlags(ItemsCount - 7) == 0;
-	}
-
-	void CompressMemoryArea(int startAddress, int endAddress)
-	{
-		int lastDistance = -1;
-
-		for (int address = startAddress; address <= endAddress; ) {
-			while (Memory[address] < 0)
-				if (++address > endAddress)
-					return;
-			PutItem(FlashPackItemType.SetAddress, address);
-
-			while (address <= endAddress && Memory[address] >= 0) {
-				int bestMatch = 0;
-				int bestDistance = -1;
-				// brute force matching, think about hashtables
-				for (int backAddress = address - 1; backAddress >= startAddress && address - backAddress < 0x80; backAddress--) {
-					int match;
-					for (match = 0; address + match <= endAddress; match++) {
-						int data = Memory[address + match];
-						if (data < 0 || data != Memory[backAddress + match])
-							break;
-					}
-					if (bestMatch < match) {
-						bestMatch = match;
-						bestDistance = address - backAddress;
-					}
-					else if (bestMatch == match && address - backAddress == lastDistance)
-						bestDistance = lastDistance;
-				}
-
-				switch (bestMatch) {
-				case 0:
-				case 1:
-					PutItem(FlashPackItemType.Literal, Memory[address++]);
-					continue;
-				case 2:
-					PutItem(FlashPackItemType.CopyTwoBytes, bestDistance);
-					break;
-				case 3:
-					PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-					break;
-				case 4:
-					if (bestDistance == lastDistance)
-						PutItem(FlashPackItemType.CopyManyBytes, 4);
-					else if (IsLiteralPreferred()) {
-						PutItem(FlashPackItemType.Literal, Memory[address]);
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-					}
-					else {
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-						PutItem(FlashPackItemType.Literal, Memory[address + 3]);
-					}
-					break;
-				case 5:
-					if (bestDistance == lastDistance)
-						PutItem(FlashPackItemType.CopyManyBytes, 5);
-					else {
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-						PutItem(FlashPackItemType.CopyTwoBytes, bestDistance);
-					}
-					break;
-				case 6:
-					if (bestDistance == lastDistance)
-						PutItem(FlashPackItemType.CopyManyBytes, 6);
-					else {
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-					}
-					break;
-				default:
-					int length = bestMatch;
-					if (bestDistance != lastDistance) {
-						if (IsLiteralPreferred() && length % 255 == 4) {
-							PutItem(FlashPackItemType.Literal, Memory[address]);
-							length--;
-						}
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-						length -= 3;
-					}
-					else if (IsLiteralPreferred() && length % 255 == 1) {
-						PutItem(FlashPackItemType.Literal, Memory[address]);
-						length--;
-					}
-					for (; length > 255; length -= 255)
-						PutItem(FlashPackItemType.CopyManyBytes, 255);
-					switch (length) {
-					case 0:
-						break;
-					case 1:
-						PutItem(FlashPackItemType.Literal, Memory[address + bestMatch - 1]);
-						break;
-					case 2:
-						PutItem(FlashPackItemType.CopyTwoBytes, bestDistance);
-						break;
-					case 3:
-						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
-						break;
-					default:
-						PutItem(FlashPackItemType.CopyManyBytes, length);
-						break;
-					}
-					break;
-				}
-				address += bestMatch;
-				lastDistance = bestDistance;
-			}
-		}
-	}
-
-	void PutPoke(int address, int value)
-	{
-		PutItem(FlashPackItemType.SetAddress, address);
-		PutItem(FlashPackItemType.Literal, value);
-	}
-
-	void Compress(ByteWriter w)
-	{
-		//assert LoadState == FlashPackLoadState.StartLowByte, "Invalid data to compress";
-		//assert Memory[0x2e0] >= 0 && Memory[0x2e1] >= 0, "Missing run address";
-		if (Memory[0xfc] >= 0 || Memory[0xfd] >= 0 || Memory[0xfe] >= 0 || Memory[0xff] >= 0)
-			throw "Conflict with decompressor variables";
-		int runAddress = Memory[0x2e0] + (Memory[0x2e1] << 8);
-		Memory[0x2e0] = Memory[0x2e1] = -1;
-
-		int depackerEndAddress = FindHole();
-		CompressedLength = 0;
-		ItemsCount = 0;
-		PutPoke(0xd40e, 0); // disable NMI
-		PutPoke(0xd20e, 0); // disable IRQ
-		PutPoke(0xd400, 0); // disable screen
-		PutPoke(0xd301, 0xfe); // disable ROM
-		PutPoke(0x244, 0xff); // cold start after Reset
-		CompressMemoryArea(depackerEndAddress, 0xffff);
-		CompressMemoryArea(0, depackerEndAddress);
-		PutItem(FlashPackItemType.EndOfStream, 0);
-		PutItems();
-
-		int depackerStartAddress = depackerEndAddress - (0x58 - 1);
-		int compressedStartAddress = depackerStartAddress - CompressedLength;
-		if (compressedStartAddress < MinLoadAddress)
-			throw "Too much compressed data";
-		w(0xff);
-		w(0xff);
-		// turn off the built-in BASIC
-		ASAPWriter.WriteWord(w, 0xd301);
-		ASAPWriter.WriteWord(w, 0xd301);
-		w(0xff);
-
-		ASAPWriter.WriteWord(w, compressedStartAddress);
-		ASAPWriter.WriteWord(w, depackerEndAddress);
-		ASAPWriter.WriteBytes(w, Compressed, 0, CompressedLength);
-
-		w(0xad); ASAPWriter.WriteWord(w, compressedStartAddress); // LDA compressed
-		w(0xee); ASAPWriter.WriteWord(w, depackerStartAddress + 1); // INC getByte+1
-		w(0xd0); w(0x03); // SNE
-		w(0xee); ASAPWriter.WriteWord(w, depackerStartAddress + 2); // INC getByte+2
-		w(0x60); // RTS
-		w(0x4c); ASAPWriter.WriteWord(w, runAddress); // JMP run
-		w(0x85); w(0xfe); // STA outPtr
-		w(0x8a); // TXA
-		w(0x2a); // ROL @
-		w(0xaa); // TAX
-		w(0xf0); w(0xf6); // BEQ exit
-		w(0xb1); w(0xfe); // LDA (outPtr),Y
-		w(0x99); w(0x80); w(0x80); // STA $8080,Y
-		w(0xc8); // INY
-		w(0xd0); w(0x09); // BNE samePage
-		w(0x98); // TYA
-		w(0x38); // SEC
-		w(0x65); w(0xff); // ADC outPtr+1
-		w(0x85); w(0xff); // STA outPtr+1
-		w(0x8d); ASAPWriter.WriteWord(w, depackerStartAddress + 0x1a); // STA putByte+2
-		w(0xca); // DEX
-		w(0xd0); w(0xec); // BNE copy
-		w(0x06); w(0xfd); // ASL innerFlags
-		w(0xd0); w(0x15); // BNE gotInnerFlags
-		w(0x06); w(0xfc); // ASL outerFlags
-		w(0xd0); w(0x07); // BNE gotOuterFlags
-		w(0x38); // SEC
-		w(0x20); ASAPWriter.WriteWord(w, depackerStartAddress); // JSR getByte
-		w(0x2a); // ROL @
-		w(0x85); w(0xfc); // STA outerFlags
-		w(0xa9); w(0x01); // LDA #1
-		w(0x90); w(0x04); // BCC setInnerFlags
-		w(0x20); ASAPWriter.WriteWord(w, depackerStartAddress); // JSR getByte
-		w(0x2a); // ROL @
-		w(0x85); w(0xfd); // STA innerFlags
-		w(0x20); ASAPWriter.WriteWord(w, depackerStartAddress); // JSR getByte
-		w(0xa2); w(0x01); // LDX #1
-		w(0x90); w(0xce); // BCC putByte
-		w(0x4a); // LSR @
-		w(0xd0); w(0xc2); // BNE copyTwoOrThree
-		w(0x20); ASAPWriter.WriteWord(w, depackerStartAddress); // JSR getByte
-		w(0xb0); w(0xc1); // BCS copyMany
-		w(0xa8); // TAY
-		w(0x20); ASAPWriter.WriteWord(w, depackerStartAddress); // JSR getByte
-		w(0x90); w(0xca); // BCC setPage
-
-		ASAPWriter.WriteWord(w, 0x2e0);
-		ASAPWriter.WriteWord(w, 0x2e1);
-		ASAPWriter.WriteWord(w, depackerStartAddress + 0x32);
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/gstreamer/gstasapdec.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/gstreamer/gstasapdec.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/gstreamer/gstasapdec.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/gstreamer/gstasapdec.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,409 +0,0 @@
-/*
- * gstasapdec.c - ASAP plugin for GStreamer
- *
- * Copyright (C) 2011-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/**
- * SECTION:element-asapdec
- *
- * This element decodes .sap files to raw audio.
- * .sap files are small Atari XL/XE programs that are executed
- * on an emulated 6502 and a POKEY sound chip.
- *
- * <refsect2>
- * <title>Example launch line</title>
- * |[
- * gst-launch filesrc location=Foo.sap ! asapdec ! audioconvert ! alsasink
- * ]|
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h> /* memcpy */
-#include <gst/gst.h>
-
-#include "gstasapdec.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_asap_dec_debug);
-#define GST_CAT_DEFAULT gst_asap_dec_debug
-
-enum
-{
-  PROP_0,
-  PROP_TUNE
-};
-
-/* the capabilities of the inputs and outputs. */
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-sap")
-    );
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-raw-int, "
-        "endianness = (int) LITTLE_ENDIAN, "
-        "signed = (boolean) true, "
-        "width = (int) 16, "
-        "depth = (int) 16, "
-        "rate = (int) 44100, "
-        "channels = (int) [ 1, 2 ]")
-    );
-
-GST_BOILERPLATE (GstAsapDec, gst_asap_dec, GstElement, GST_TYPE_ELEMENT);
-
-static void
-play_loop (GstPad * pad)
-{
-#define BUFFER_SIZE 4096
-  GstAsapDec *asapdec = GST_ASAPDEC (gst_pad_get_parent (pad));
-  GstBuffer *out = gst_buffer_new_and_alloc (BUFFER_SIZE);
-  int position;
-  int len;
-  gint64 time;
-  gint64 time2;
-  gst_buffer_set_caps (out, GST_PAD_CAPS (pad));
-
-  position = ASAP_GetBlocksPlayed (asapdec->asap);
-  len = ASAP_Generate (asapdec->asap, GST_BUFFER_DATA (out), GST_BUFFER_SIZE (out), ASAPSampleFormat_S16_L_E);
-  if (len == 0)
-    goto eos;
-  time = gst_util_uint64_scale_int (position, GST_SECOND, ASAP_SAMPLE_RATE);
-  GST_BUFFER_OFFSET (out) = position;
-  GST_BUFFER_TIMESTAMP (out) = time;
-  position = ASAP_GetBlocksPlayed (asapdec->asap);
-  time2 = gst_util_uint64_scale_int (position, GST_SECOND, ASAP_SAMPLE_RATE);
-  GST_BUFFER_OFFSET_END (out) = position;
-  GST_BUFFER_DURATION (out) = time2 - time;
-
-  if (gst_pad_push (asapdec->srcpad, out) != GST_FLOW_OK || len < BUFFER_SIZE) {
-  eos:
-    gst_pad_push_event (pad, gst_event_new_eos ());
-    gst_pad_pause_task (pad);
-  }
-
-  gst_object_unref (asapdec);
-}
-
-static void
-add_tag (GstTagList * tags, const char * tag, const char * value)
-{
-  if (value[0] != '\0')
-      gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, tag, value, (void *) NULL);
-}
-
-static gboolean
-start_play_tune (GstAsapDec * asapdec)
-{
-  const ASAPInfo *info;
-  int song;
-  GstTagList *tags;
-  int i;
-  GstCaps *caps;
-
-  if (!ASAP_Load (asapdec->asap, NULL, asapdec->module, asapdec->module_len)) {
-    GST_ELEMENT_ERROR (asapdec, LIBRARY, INIT, ("Could not load tune"), ("Could not load tune"));
-    return FALSE;
-  }
-
-  info = ASAP_GetInfo (asapdec->asap);
-  song = asapdec->tune_number;
-  if (song > 0)
-    song--;
-  else
-    song = ASAPInfo_GetDefaultSong (info);
-
-  tags = gst_tag_list_new ();
-  add_tag (tags, GST_TAG_TITLE, ASAPInfo_GetTitle (info));
-  add_tag (tags, GST_TAG_ARTIST, ASAPInfo_GetAuthor (info));
-  i = ASAPInfo_GetYear (info);
-  if (i > 0) {
-    GDate *date = g_date_new ();
-    g_date_set_year (date, i);
-    i = ASAPInfo_GetMonth (info);
-    if (i > 0) {
-      g_date_set_month (date, i);
-      i = ASAPInfo_GetDayOfMonth (info);
-      if (i > 0)
-        g_date_set_day (date, i);
-    }
-    gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, GST_TAG_DATE, date, (void *) NULL);
-  }
-  gst_pad_push_event (asapdec->srcpad, gst_event_new_tag (tags));
-
-  asapdec->duration = ASAPInfo_GetDuration (info, song);
-  if (!ASAP_PlaySong (asapdec->asap, song, asapdec->duration)) {
-    GST_ELEMENT_ERROR (asapdec, LIBRARY, INIT, ("Could not initialize song"), ("Could not initialize song"));
-    return FALSE;
-  }
-  asapdec->playing = TRUE;
-
-  caps = gst_caps_new_simple ("audio/x-raw-int",
-      "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
-      "signed", G_TYPE_BOOLEAN, TRUE,
-      "width", G_TYPE_INT, 16,
-      "depth", G_TYPE_INT, 16,
-      "rate", G_TYPE_INT, ASAP_SAMPLE_RATE,
-      "channels", G_TYPE_INT, ASAPInfo_GetChannels (info), NULL);
-  gst_pad_set_caps (asapdec->srcpad, caps);
-  gst_caps_unref (caps);
-  gst_pad_push_event (asapdec->srcpad, gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, -1, 0));
-  return gst_pad_start_task (asapdec->srcpad, (GstTaskFunction) play_loop, asapdec->srcpad);
-}
-
-static gboolean
-gst_asap_sink_event (GstPad * pad, GstEvent * event)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (gst_pad_get_parent (pad));
-  gboolean res;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_EOS:
-      res = start_play_tune (asapdec);
-      break;
-    default:
-      res = FALSE;
-      break;
-  }
-
-  gst_object_unref (asapdec);
-  gst_event_unref (event);
-  return res;
-}
-
-static GstFlowReturn
-gst_asap_sink_chain (GstPad * pad, GstBuffer * buffer)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (gst_pad_get_parent (pad));
-  guint64 size = GST_BUFFER_SIZE (buffer);
-
-  if (asapdec->module_len + size > ASAPInfo_MAX_MODULE_LENGTH) {
-    GST_ELEMENT_ERROR (asapdec, STREAM, DECODE, (NULL), ("Input file too long"));
-    gst_object_unref (asapdec);
-    return GST_FLOW_ERROR;
-  }
-  memcpy (asapdec->module + asapdec->module_len, GST_BUFFER_DATA (buffer), size);
-  asapdec->module_len += size;
-
-  gst_object_unref (asapdec);
-  gst_buffer_unref (buffer);
-  return GST_FLOW_OK;
-}
-
-static gboolean
-gst_asap_src_query (GstPad * pad, GstQuery * query)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (gst_pad_get_parent (pad));
-  gboolean res = FALSE;
-  gint64 time;
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_POSITION:
-      if (asapdec->playing) {
-        time = gst_util_uint64_scale_int (ASAP_GetBlocksPlayed (asapdec->asap), GST_SECOND, ASAP_SAMPLE_RATE);
-        gst_query_set_duration (query, GST_FORMAT_TIME, time);
-        res = TRUE;
-      }
-      break;
-    case GST_QUERY_DURATION:
-      if (asapdec->playing && asapdec->duration >= 0) {
-        gst_query_set_duration (query, GST_FORMAT_TIME, asapdec->duration * GST_MSECOND);
-        res = TRUE;
-      }
-      break;
-    default:
-      break;
-  }
-
-  gst_object_unref (asapdec);
-  return res;
-}
-
-static gboolean
-perform_seek (GstAsapDec * asapdec, GstEvent * event)
-{
-  gdouble rate;
-  GstFormat format;
-  GstSeekFlags flags;
-  GstSeekType start_type;
-  gint64 start;
-  GstSeekType stop_type;
-  gint64 stop;
-
-  if (!asapdec->playing)
-    return FALSE;
-  gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start, &stop_type, &stop);
-  if (rate != 1.0 || format != GST_FORMAT_TIME || start_type != GST_SEEK_TYPE_SET || stop_type != GST_SEEK_TYPE_NONE) {
-    GST_DEBUG_OBJECT (asapdec, "unsupported seek, aborted.");
-    return FALSE;
-  }
-  ASAP_Seek (asapdec->asap, (int) (start / GST_MSECOND));
-  return TRUE;
-}
-
-static gboolean
-gst_asap_src_event (GstPad * pad, GstEvent * event)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (gst_pad_get_parent (pad));
-  gboolean res;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEEK:
-      res = perform_seek (asapdec, event);
-      gst_event_unref (event);
-      return res;
-    default:
-      return gst_pad_event_default (pad, event);
-  }
-}
-
-static void
-gst_asap_dec_base_init (gpointer gclass)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-
-  gst_element_class_set_details_simple (element_class,
-    "ASAP decoder",
-    "Codec/Decoder/Audio",
-    "Decodes Atari 8-bit .sap chiptunes",
-    "Piotr Fusik <fox@scene.pl>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&src_factory));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_factory));
-}
-
-static void
-gst_asap_dec_init (GstAsapDec * asapdec, GstAsapDecClass * gclass)
-{
-  asapdec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
-  gst_pad_set_event_function (asapdec->sinkpad, GST_DEBUG_FUNCPTR (gst_asap_sink_event));
-  gst_pad_set_chain_function (asapdec->sinkpad, GST_DEBUG_FUNCPTR (gst_asap_sink_chain));
-  gst_element_add_pad (GST_ELEMENT (asapdec), asapdec->sinkpad);
-
-  asapdec->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
-  gst_pad_use_fixed_caps (asapdec->srcpad);
-  gst_pad_set_query_function (asapdec->srcpad, GST_DEBUG_FUNCPTR (gst_asap_src_query));
-  gst_pad_set_event_function (asapdec->srcpad, GST_DEBUG_FUNCPTR (gst_asap_src_event));
-  gst_element_add_pad (GST_ELEMENT (asapdec), asapdec->srcpad);
-
-  asapdec->asap = ASAP_New ();
-  asapdec->playing = FALSE;
-  asapdec->duration = -1;
-  asapdec->tune_number = 0;
-  asapdec->module_len = 0;
-}
-
-static void
-gst_asap_dec_finalize (GObject * object)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (object);
-
-  ASAP_Delete (asapdec->asap);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-gst_asap_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (object);
-
-  switch (prop_id) {
-    case PROP_TUNE:
-      asapdec->tune_number = g_value_get_int (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      return;
-  }
-}
-
-static void
-gst_asap_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstAsapDec *asapdec = GST_ASAPDEC (object);
-
-  switch (prop_id) {
-    case PROP_TUNE:
-      g_value_set_int (value, asapdec->tune_number);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      return;
-  }
-}
-
-static void
-gst_asap_dec_class_init (GstAsapDecClass * klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-
-  gobject_class->finalize = gst_asap_dec_finalize;
-  gobject_class->set_property = gst_asap_dec_set_property;
-  gobject_class->get_property = gst_asap_dec_get_property;
-
-  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_TUNE,
-      g_param_spec_int ("tune", "tune", "tune", 0, ASAPInfo_MAX_SONGS, 0,
-          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-}
-
-static gboolean
-asapdec_init (GstPlugin * asapdec)
-{
-  /* debug category for filtering log messages */
-  GST_DEBUG_CATEGORY_INIT (gst_asap_dec_debug, "asapdec", 0, "ASAP decoder");
-
-  return gst_element_register (asapdec, "asapdec", GST_RANK_PRIMARY, GST_TYPE_ASAPDEC);
-}
-
-/* Workaround for gstconfig.h: it only checks _MSC_VER,
-   so it doesn't emit __declspec(dllexport) for MinGW.
-   As a result, no symbol has __declspec(dllexport)
-   and thus all are exported from the DLL. */
-#ifdef _WIN32
-#undef GST_PLUGIN_EXPORT
-#define GST_PLUGIN_EXPORT __declspec(dllexport)
-#endif
-
-/* GST_PLUGIN_DEFINE needs PACKAGE to be defined. */
-#define PACKAGE "asap"
-
-/* gstreamer looks for this structure to register asapdec */
-GST_PLUGIN_DEFINE (
-    GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "asapdec",
-    "Decodes Atari 8-bit .sap chiptunes",
-    asapdec_init,
-    ASAPInfo_VERSION,
-    "GPL",
-    "ASAP",
-    "http://asap.sourceforge.net/"
-)
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/gstreamer/gstasapdec.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/gstreamer/gstasapdec.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/gstreamer/gstasapdec.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/gstreamer/gstasapdec.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/*
- * gstasapdec.c - ASAP plugin for GStreamer
- *
- * Copyright (C) 2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GST_ASAPDEC_H__
-#define __GST_ASAPDEC_H__
-
-#include <gst/gst.h>
-#include "asap.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ASAPDEC \
-  (gst_asap_dec_get_type())
-#define GST_ASAPDEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ASAPDEC,GstAsapDec))
-#define GST_ASAPDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ASAPDEC,GstAsapDecClass))
-#define GST_IS_ASAPDEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ASAPDEC))
-#define GST_IS_ASAPDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ASAPDEC))
-
-typedef struct _GstAsapDec      GstAsapDec;
-typedef struct _GstAsapDecClass GstAsapDecClass;
-
-struct _GstAsapDec
-{
-  GstElement element;
-
-  GstPad *sinkpad, *srcpad;
-
-  ASAP *asap;
-  gboolean playing;
-  gint duration;
-  gint tune_number;
-  gint module_len;
-  guchar module[ASAPInfo_MAX_MODULE_LENGTH];
-};
-
-struct _GstAsapDecClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_asap_dec_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_ASAPDEC_H__ */
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/gstreamer/gstreamer.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/gstreamer/gstreamer.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/gstreamer/gstreamer.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/gstreamer/gstreamer.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-GSTREAMER_CFLAGS = `pkg-config --cflags --libs gstreamer-0.10`
-GSTREAMER_PLUGIN_DIR = `pkg-config --variable=pluginsdir gstreamer-0.10`
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "gstreamer.mk")
-endif
-
-asap-gstreamer: libgstasapdec.so
-.PHONY: asap-gstreamer
-
-libgstasapdec.so: $(call src,gstreamer/gstasapdec.c asap.[ch])
-	$(CC) $(GSTREAMER_CFLAGS)
-CLEAN += libgstasapdec.so
-
-install-gstreamer: libgstasapdec.so
-	$(call INSTALL_PROGRAM,libgstasapdec.so,$(GSTREAMER_PLUGIN_DIR))
-.PHONY: install-gstreamer
-
-uninstall-gstreamer:
-	$(RM) $(DESTDIR)$(GSTREAMER_PLUGIN_DIR)/libgstasapdec.so
-.PHONY: uninstall-gstreamer
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/INSTALL kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/INSTALL
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/INSTALL	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/INSTALL	1970-01-01 00:00:00.000000000 +0000
@@ -1,504 +0,0 @@
-// This file is in AsciiDoc format. It is converted to README.html.
-
-Using asapconv
---------------
-
-Run the program from the command line to see the syntax.
-The `-o`/`--output` option selects the output format and is mandatory.
-
-
-Using libasap
--------------
-
-The library is documented in the `asap.h` header file.
-Be warned there might be breaking changes in the future versions of the library.
-
-
-Compilation instructions
-------------------------
-
-Required tools
-~~~~~~~~~~~~~~
-
-For all builds you will need:
-
-GNU Make::
-On Linux this program is called `make`. On other systems it may be called `gmake`
-(if this is the case, type `gmake` instead of `make` in the following instructions).
-On Windows you may install GNU Make from http://cygwin.com/[Cygwin] or http://www.mingw.org/[MinGW].
-
-Standard Unix tools::
-I mean `sh`, `cat`, `cp`, `rm`, `mkdir`. On Windows you can find them in Cygwin.
-
-xasm and MADS::
-If you are compiling latest source code from Git, install
-http://xasm.atari.org/[xasm] and http://mads.atari8.info/[MADS].
-
-Ć Translator::
-The core of ASAP is written in the Ć programming language.
-You'll need http://cito.sourceforge.net[cito].
-For your convenience, this is not needed for most of the C and C++ ports.
-
-Make sure these tools are on your `PATH`.
-
-
-Getting officially released source code
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you want to compile an official release of ASAP, download a source distribution
-(`asap-*.tar.gz`) and uncompress it to a directory of your choice.
-
-On Unix-like systems:
---------------------------------------------------------------------------------
-tar zxf asap-*.tar.gz
---------------------------------------------------------------------------------
-
-On Windows you may use http://7-zip.org/[7-Zip].
-
-
-Getting latest source code
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Alternatively you may get the latest version from the Git repository.
-To do this using a command-line Git client:
---------------------------------------------------------------------------------
-git clone git://git.code.sf.net/p/asap/code asap-code
---------------------------------------------------------------------------------
-
-This will fetch the latest code into a new directory called `asap-code`.
-
-
-Building asapconv and libasap on Unix-like systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-From your shell prompt navigate to the directory which contains `asap.c`.
-
-To compile and install, run the following commands:
---------------------------------------------------------------------------------
-make
-sudo make install
---------------------------------------------------------------------------------
-
-The latter command installs the command-line converter and the C library
-in `/usr/local`.
-
-
-Building the Audacious plugin on Unix-like systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Install `audacious-dev` or `audacious-devel`.
-To compile, run the following command:
---------------------------------------------------------------------------------
-make asap-audacious
---------------------------------------------------------------------------------
-
-To install:
---------------------------------------------------------------------------------
-sudo make install-audacious
---------------------------------------------------------------------------------
-
-
-Building the GStreamer plugin on Unix-like systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To compile, run the following command:
---------------------------------------------------------------------------------
-make asap-gstreamer
---------------------------------------------------------------------------------
-
-To install in `/usr/lib/gstreamer-0.10`:
---------------------------------------------------------------------------------
-sudo make install-gstreamer
---------------------------------------------------------------------------------
-
-
-Building the MOC plugin on Unix-like systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need source code of MOC. The plugin is compatible with MOC 2.4.x
-and MOC 2.5.0 alpha.
-
-Check `MOC_INCLUDE` and `MOC_PLUGIN_DIR` in the `moc/moc.mk` file.
-These should be the directory with MOC sources
-and the directory with the installed MOC plugins, respectively.
-
-If the defaults are correct, use the following commands:
---------------------------------------------------------------------------------
-make asap-moc
-sudo make install-moc
---------------------------------------------------------------------------------
-
-If you need to specify different directories, use:
---------------------------------------------------------------------------------
-make asap-moc MOC_INCLUDE=path/to/moc/sources
-sudo make install-moc MOC_PLUGIN_DIR=/path/to/moc/plugins
---------------------------------------------------------------------------------
-
-
-Building the VLC plugin on Linux
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Install `vlc-devel`. Verify paths at the top of `vlc/vlc.mk`.
-To compile, run the following command:
---------------------------------------------------------------------------------
-make asap-vlc
---------------------------------------------------------------------------------
-
-To install:
---------------------------------------------------------------------------------
-sudo make install-vlc
---------------------------------------------------------------------------------
-
-
-Building the VLC plugin on OS X
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Install Xcode Command Line Tools.
-
-You need `vlc_plugin.h` and other header files.
-Unfortunately they are not installed with the VLC on Mac.
-You can find them in VLC source code. I copied them from my Windows VLC
-(`C:\Program Files (x86)\VideoLAN\VLC\sdk\include\vlc\plugins`). ;)
-Make sure `VLC_OSX_CFLAGS` in `vlc/vlc.mk` points to the directory
-with these header files.
-
-To compile, run the following command:
---------------------------------------------------------------------------------
-make asap-vlc-osx
---------------------------------------------------------------------------------
-
-To install:
---------------------------------------------------------------------------------
-make install-vlc-osx
---------------------------------------------------------------------------------
-
-
-Building the XBMC plugin on Linux
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need source code of the Linux port of XBMC.
-
-Run:
---------------------------------------------------------------------------------
-make asap-xbmc XBMC_DLL_LOADER_EXPORTS=path/to/dir/in/xbmc/sources
---------------------------------------------------------------------------------
-
-`XBMC_DLL_LOADER_EXPORTS` must point to the directory in XBMC sources
-which contains `wrapper.def` and `wrapper.o`.
-You should get `xbmc_asap-i486-linux.so`.
-
-Recently I wasn't able to enable the ASAP plugin in XBMC.
-This seems to be an XBMC issue.
-
-
-Building the XMMS plugin on Unix-like systems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need `xmms` and `xmms-devel` packages.
-
-To compile, run the following command:
---------------------------------------------------------------------------------
-make asap-xmms
---------------------------------------------------------------------------------
-
-If the compilation finished successfully, you can install the plugin
-in your home directory:
---------------------------------------------------------------------------------
-make install-xmms-user
---------------------------------------------------------------------------------
-
-or for all users:
---------------------------------------------------------------------------------
-sudo make install-xmms
---------------------------------------------------------------------------------
-
-If you have another XMMS plugin that supports Atari 8-bit music,
-remove it in order to avoid conflicts.
-
-
-Building asapconv, WASAP, Winamp/GSPlayer/Apollo/XMPlay/BASS plugins, RMT DLL, asapscan, shell extension and libasap on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Install the C and C++ compilers from http://www.mingw.org/[MinGW].
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make mingw
---------------------------------------------------------------------------------
-
-You should get `asapconv.exe`, `wasap.exe`, `in_asap.dll`, `gspasap.dll`,
-`ASAP_Apollo.dll`, `xmp-asap.dll`, `bass_asap.dll`, `apokeysnd.dll`,
-`asapscan.exe`, `ASAPShellEx.dll` and `libasap.a`.
-
-
-Building Windows Media Player plugin and asap.lib on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You additionally need Windows SDK
-(install native C++ compiler, headers, libraries and samples).
-Set `Path`, `INCLUDE` and `LIB` environment variables
-to point to the right locations in the Windows SDK.
-Make sure `DSHOW_BASECLASSES_DIR` is set correctly in `win32\win32.mk`.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make win32/asap_dsf.dll win32/asap.lib
---------------------------------------------------------------------------------
-
-You will get `asap_dsf.dll` and `asap.lib`.
-
-
-Building the GStreamer plugin on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Install http://www.gstreamer.com/[GStreamer SDK] 32-bit development files.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make win32/libgstasapdec.dll
---------------------------------------------------------------------------------
-
-Building the Audacious plugin on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Too bad Audacious doesn't provide an SDK for Windows.
-
-Unpack http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip[GTK+ 2 bundle]
-and make sure `GTK_DIR` in `win32/win32.mk` points to it.
-
-Install Audacious and make sure `AUDACIOUS_LIB` points inside it.
-
-Unpack Audacious source code and make sure `AUDACIOUS_INCLUDE` points inside it.
-
-Now comes the tricky part: configure Audacious for Windows.
-You'll need to install `gettext` and `libgnurx` in MinGW
-(that's probably not an exhaustive list, `configure` will complain about missing things).
-From the Audacious source directory run:
---------------------------------------------------------------------------------
-bash configure PKG_CONFIG=../gtk/bin/pkg-config
---------------------------------------------------------------------------------
-
-After it finishes with no errors (warnings are fine), go to ASAP and run:
---------------------------------------------------------------------------------
-make win32/asapplug.dll
---------------------------------------------------------------------------------
-
-Put the DLL in `lib/audacious/Input` of the Windows binary distribution of Audacious.
-
-
-Building the foobar2000 plugin on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In addition to the common prerequisites and Windows SDK you need
-foobar2000 SDK - extract it to a new directory called
-`foobar2000_SDK` next to (not inside!) the ASAP directory.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make win32/foo_asap.dll
---------------------------------------------------------------------------------
-
-This should produce `foo_asap.dll`.
-
-
-Building the VLC plugin on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Install VLC as usual, it includes the SDK.
-`VLC_SDK_DIR` in `win32/win32.mk` is fine for the default installation
-directory on 64-bit Windows - edit it if necessary.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make win32/libasap_plugin.dll
---------------------------------------------------------------------------------
-
-You will get `libasap_plugin.dll`.
-
-
-Building the XBMC plugin on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need Visual C\++ Toolkit (it used to be a free download from Microsoft,
-now search the internet for `VCToolkitSetup.exe`)
-and .NET Framework SDK Version 1.1.
-Microsoft Visual C++ 2003 might work, but wasn't tested.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make win32/xbmc_asap.dll
---------------------------------------------------------------------------------
-
-This should produce `xbmc_asap.dll`, which you can use with XBox
-or Windows version of XBMC. The XBMC must include support for ASAP.
-
-Alternatively, you may use the `build_vctk.bat` script in the `xbmc` directory.
-
-
-Building WASAP, GSPlayer and Windows Media Player plugins for Windows CE
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For WASAP and GSPlayer plugins you need http://cegcc.sourceforge.net/[CeGCC].
-For the Windows Media Player plugin you need Visual Studio 2008
-(2005 might work, but wasn't checked, 2010 won't work).
-
-Edit the `WINCE_...` paths at the top of `win32/win32.mk` so that they point to your installed tools.
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make wince
---------------------------------------------------------------------------------
-
-This should produce `wasap.exe`, `gspasap.dll` and `asap_dsf.dll`
-in the `win32/wince` directory.
-
-
-Building Java ASAP2WAV and Java applet
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need Java Development Kit (JDK).
-
-If necessary, edit the paths at the top of `java/java.mk` so that they point to your installed tools.
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make java/asap2wav.jar java/asap_applet.jar
---------------------------------------------------------------------------------
-
-This should produce `asap2wav.jar` and `asap_applet.jar`.
-
-
-Building Java midlet
-~~~~~~~~~~~~~~~~~~~~
-
-You need a Java ME SDK - I use Oracle Java ME SDK.
-
-Edit the WTK path at the top of `java/j2me/j2me.mk` so that they point to your installed Java ME SDK.
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make java/j2me/asap_midlet.jad
---------------------------------------------------------------------------------
-
-This should produce `asap_midlet.jar` and `asap_midlet.jad`.
-
-
-Building AndroidASAP
-~~~~~~~~~~~~~~~~~~~~
-
-Install http://developer.android.com/sdk/[Android SDK]
-with an Android platform(s) (I compile with 2.2 and test with 1.6).
-
-Edit the paths at the top of `java/android/android.mk` so that they point to your installed SDK.
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make android-debug
---------------------------------------------------------------------------------
-
-This should produce `AndroidASAP-debug.apk`.
-AndroidASAP integrates with file managers and the web browser.
-It uses the internet connection only for files clicked in the web browser.
-It reads phone state only to pause playback on incoming phone calls.
-
-
-Building C# ASAP2WAV, asapplay and SilverASAP on Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need the .NET Framework, of course.
-For SilverASAP you need Silverlight and 7-Zip.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make csharp
---------------------------------------------------------------------------------
-
-This should produce `asap2wav.exe`, `asapplay.exe` and `SilverASAP.xap`.
-
-
-Building MetroASAP for Windows 8
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NOTE: Windows 8 is not yet generally available and this port is work in progress.
-
-Install .NET Framework 4.5 (Windows 8 already has it).
-Install Windows SDK for Windows 8 or Visual Studio 2012 (any edition should be fine).
-Verify the paths at the top of `csharp/winrt/winrt.mk`.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make csharp/winrt/MetroASAP.appx
---------------------------------------------------------------------------------
-
-If you're not on Windows 8, the last step (creating the appx) will fail,
-but you'll have the application in the `csharp/winrt/obj` directory.
-Copy it to Windows 8 and install from PowerShell:
---------------------------------------------------------------------------------
-Add-AppxPackage AppxManifest.xml -Register
---------------------------------------------------------------------------------
-
-
-Building JavaScript command-line ASAP2WAV and the web browser player
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make javascript
---------------------------------------------------------------------------------
-
-`asap2wav.js` is the command-line script.
-`asapweb.js` plus `asap.js` are the browser player (you'll probably need `binaryHttpRequest.js` as well).
-
-
-Building Flash player version of ASAP
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK[Flex SDK].
-Add its `bin` directory to your `PATH`.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make flash/asap.swf
---------------------------------------------------------------------------------
-
-You should get `asap.swf`.
-
-
-Building Perl command-line ASAP2WAV
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make perl
---------------------------------------------------------------------------------
-
-`asap2wav.pl` is the Perl script which uses the `Asap.pm` module you have just built.
-
-
-Building D ASAP2WAV and asapplay on Windows and Linux
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need DMD 2.054 or compatible D compiler.
-To build asapplay on Windows, you need http://www.dsource.org/projects/bindings/wiki/WindowsApi[D Windows API bindings].
-On Linux, you need ALSA development libraries (e.g. libasound2-dev package in Ubuntu).
-D bindings for ALSA are currently included in ASAP sources.
-
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make d
---------------------------------------------------------------------------------
-
-This should produce `asap2wav.exe` and `asapplay.exe`.
-
-
-Building Android command-line asapconv
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need http://developer.android.com/tools/sdk/ndk/index.html[Android NDK].
-
-Edit the paths at the top of `java/android/android.mk` so that they point to your installed NDK.
-Open the command prompt in the root directory of ASAP sources and run:
---------------------------------------------------------------------------------
-make java/android/asapconv
---------------------------------------------------------------------------------
-
-Now you need to put the binary (`java/android/asapconv`) on your device and make it executable.
-It's not possible on a FAT-formatted SD card. I was able to do that in `/data/local/tmp/`.
-If you use USB debugging, `make android-push-asapconv` will copy the file,
-but you have to do the `chmod` part.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/AndroidManifest.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/AndroidManifest.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/AndroidManifest.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="net.sf.asap" android:versionCode="315" android:versionName="3.1.5">
-	<uses-sdk android:minSdkVersion="4" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
-	<application android:label="@string/app_name" android:icon="@drawable/icon" android:description="@string/app_description" android:theme="@style/Theme">
-		<activity android:name=".FileSelector" android:label="@string/app_name">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity android:name=".Player" android:label="@string/play_in_asap" android:launchMode="singleTop" android:configChanges="mcc|mnc|keyboard|keyboardHidden|orientation">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="file" android:host="*" />
-				<data android:scheme="http" android:host="*" />
-				<data android:pathPattern=".*\\.sap" />
-				<data android:pathPattern=".*\\.cmc" />
-				<data android:pathPattern=".*\\.cm3" />
-				<data android:pathPattern=".*\\.cmr" />
-				<data android:pathPattern=".*\\.cms" />
-				<data android:pathPattern=".*\\.dmc" />
-				<data android:pathPattern=".*\\.dlt" />
-				<data android:pathPattern=".*\\.mpt" />
-				<data android:pathPattern=".*\\.mpd" />
-				<data android:pathPattern=".*\\.rmt" />
-				<data android:pathPattern=".*\\.tmc" />
-				<data android:pathPattern=".*\\.tm8" />
-				<data android:pathPattern=".*\\.tm2" />
-				<data android:pathPattern=".*\\.fc" />
-			</intent-filter>
-		</activity>
-		<service android:name=".PlayerService" />
-		<receiver android:name=".MediaButtonEventReceiver">
-			<intent-filter>
-				<action android:name="android.intent.action.MEDIA_BUTTON" />
-			</intent-filter>
-		</receiver>
-	</application>
-</manifest>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/android.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/android.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/android.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/android.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-ANDROID_SDK = C:/bin/android-sdk-windows
-ANDROID_JAR = $(ANDROID_SDK)/platforms/android-17/android.jar
-PROGUARD_JAR = C:/bin/proguard4.6/lib/proguard.jar
-
-AAPT = $(ANDROID_SDK)/platform-tools/aapt
-PROGUARD = $(DO)java -jar $(PROGUARD_JAR)
-DX = $(DO)java -jar "$(ANDROID_SDK)/platform-tools/lib/dx.jar" --no-strict
-APKBUILDER = $(DO)java -classpath "$(ANDROID_SDK)/tools/lib/sdklib.jar" com.android.sdklib.build.ApkBuilderMain $@
-JARSIGNER = $(DO)jarsigner -sigalg SHA1withDSA -digestalg SHA1
-ZIPALIGN = $(DO)$(ANDROID_SDK)/tools/zipalign
-ADB = $(ANDROID_SDK)/platform-tools/adb
-ANDROID = $(ANDROID_SDK)/tools/android.bat
-EMULATOR = $(ANDROID_SDK)/tools/emulator
-
-# NDK is only needed for the command-line asapconv
-# It ended up in this Makefile even though it's not Java
-ANDROID_NDK = C:/bin/android-ndk-r8c
-ANDROID_NDK_PLATFORM = $(ANDROID_NDK)/platforms/android-3/arch-arm
-ANDROID_CC = $(DO)$(ANDROID_NDK)/toolchains/arm-linux-androideabi-4.6/prebuilt/windows/bin/arm-linux-androideabi-gcc --sysroot=$(ANDROID_NDK_PLATFORM) -s -O2 -Wall -o $@ $(INCLUDEOPTS) $(filter %.c,$^)
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "android.mk")
-endif
-
-ANDROID_RELEASE = release/asap-$(VERSION)-android.apk
-
-android-debug: java/android/AndroidASAP-debug.apk
-.PHONY: android-debug
-
-android-release: $(ANDROID_RELEASE)
-.PHONY: android-release
-
-android-install-emu: java/android/AndroidASAP-debug.apk
-	$(ADB) -e install -r java/android/AndroidASAP-debug.apk
-.PHONY: android-install-emu
-
-android-install-dev: $(ANDROID_RELEASE)
-	$(ADB) -d install -r $(ANDROID_RELEASE)
-.PHONY: android-install-dev
-
-android-log-emu:
-	$(ADB) -e logcat -d
-.PHONY: android-log-emu
-
-android-log-dev:
-	$(ADB) -d logcat
-.PHONY: android-log-dev
-
-android-shell-emu:
-	$(ADB) -e shell
-.PHONY: android-shell-emu
-
-android-shell-dev:
-	$(ADB) -d shell
-.PHONY: android-shell-dev
-
-android-emu:
-	$(EMULATOR) -avd myavd &
-.PHONY: android-emu
-
-android-push-release: $(ANDROID_RELEASE)
-	$(ADB) -d push $(ANDROID_RELEASE) /sdcard/sap/
-.PHONY: android-push-release
-
-android-push-sap:
-	$(ADB) -e push ../Drunk_Chessboard.sap /sdcard/
-.PHONY: android-push-sap
-
-android-create-avd:
-	$(ANDROID) create avd -n myavd -t android-4 -c 16M
-.PHONY: android-create-avd
-
-$(ANDROID_RELEASE): java/android/AndroidASAP-unaligned.apk
-	$(ZIPALIGN) -f 4 $< $@
-
-java/android/AndroidASAP-unaligned.apk: java/android/AndroidASAP-unsigned.apk
-	$(JARSIGNER) -storepass walsie -signedjar $@ java/android/AndroidASAP-unsigned.apk pfusik-android
-CLEAN += java/android/AndroidASAP-unaligned.apk
-
-java/android/AndroidASAP-unsigned.apk: java/android/AndroidASAP-resources.apk java/android/classes.dex
-	$(APKBUILDER) -u -z java/android/AndroidASAP-resources.apk -f java/android/classes.dex
-CLEAN += java/android/AndroidASAP-unsigned.apk
-
-java/android/AndroidASAP-debug.apk: java/android/AndroidASAP-resources.apk java/android/classes.dex
-	$(APKBUILDER) -z java/android/AndroidASAP-resources.apk -f java/android/classes.dex
-CLEAN += java/android/AndroidASAP-debug.apk
-
-java/android/classes.dex: java/android/classes/net/sf/asap/Player.class
-	$(DX) --dex --output=$@ java/android/classes
-CLEAN += java/android/classes.dex
-
-#java/android/classes.dex: java/android/classes.jar
-#	$(DX) --dex --output=$@ $<
-
-java/android/classes.jar: $(srcdir)java/android/proguard.cfg java/android/classes/net/sf/asap/Player.class
-	$(PROGUARD) -injars java/android/classes -outjars $@ -libraryjars $(ANDROID_JAR) @$<
-
-java/android/classes/net/sf/asap/Player.class: $(addprefix $(srcdir)java/android/,FileContainer.java FileSelector.java MediaButtonEventReceiver.java Player.java PlayerService.java Util.java ZipInputStream.java) java/android/AndroidASAP-resources.apk java/src/net/sf/asap/ASAP.java
-	$(JAVAC) -d java/android/classes -bootclasspath $(ANDROID_JAR) $(addprefix $(srcdir)java/android/,FileContainer.java FileSelector.java MediaButtonEventReceiver.java Player.java PlayerService.java Util.java ZipInputStream.java) java/android/src/net/sf/asap/R.java java/src/net/sf/asap/*.java
-CLEANDIR += java/android/classes
-
-# Also generates java/android/src/net/sf/asap/R.java
-java/android/AndroidASAP-resources.apk: $(addprefix $(srcdir)java/android/,AndroidManifest.xml res/drawable/icon.png res/layout/fileinfo_list_item.xml res/layout/filename_list_item.xml res/layout/playing.xml res/menu/file_selector.xml res/menu/playing.xml res/values/strings.xml res/values/themes.xml) $(JAVA_OBX)
-	$(DO)mkdir -p java/android/src && $(AAPT) p -f -m -M $< -I $(ANDROID_JAR) -S $(srcdir)java/android/res -F $@ -J java/android/src java/obx
-CLEAN += java/android/AndroidASAP-resources.apk java/android/src/net/sf/asap/R.java
-
-android-push-asapconv: java/android/asapconv
-	$(ADB) -d push java/android/asapconv /data/local/tmp/
-.PHONY: android-push-asapconv
-
-java/android/asapconv: $(call src,asapconv.c asap.[ch])
-	$(ANDROID_CC)
-CLEAN += java/android/asapconv
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/FileContainer.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/FileContainer.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/FileContainer.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/FileContainer.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/*
- * FileContainer.java - ASAP for Android
- *
- * Copyright (C) 2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import android.net.Uri;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
-
-/*
- * Container of files: either a directory, a ZIP directory or an M3U playlist.
- */
-abstract class FileContainer
-{
-	protected abstract void onSongFile(String name, InputStream is) throws Exception;
-
-	// directory, m3u, zip
-	protected void onContainer(String name)
-	{
-	}
-
-	private void listDirectory(File dir, boolean inputStreams) throws IOException
-	{
-		File[] files = dir.listFiles();
-		if (files == null)
-			throw new FileNotFoundException();
-		for (File file : files) {
-			String name = file.getName();
-			if (file.isDirectory())
-				onContainer(name + '/');
-			else if (ASAPInfo.isOurFile(name)) {
-				try {
-					onSongFile(name, inputStreams ? new FileInputStream(file) : null);
-				}
-				catch (Exception ex) {
-					// ignore files we cannot read or understand
-				}
-			}
-			else if (Util.isZip(name) || Util.isM3u(name))
-				onContainer(name);
-		}
-	}
-
-	private void listM3u(Uri uri, boolean inputStreams) throws IOException
-	{
-		String path = uri.getPath();
-		InputStream m3uIs;
-		ZipInputStream zis;
-		if (Util.isZip(path)) {
-			String zipFilename = path;
-			path = uri.getFragment();
-			m3uIs = zis = new ZipInputStream(zipFilename, path);
-		}
-		else {
-			m3uIs = new FileInputStream(uri.getPath());
-			zis = null;
-		}
-		path = Util.getParent(path);
-		BufferedReader lineReader = new BufferedReader(new InputStreamReader(m3uIs));
-
-		try {
-			for (;;) {
-				String line = lineReader.readLine();
-				if (line == null)
-					break;
-				if (line.length() == 0 || line.charAt(0) == '#')
-					continue;
-				line = line.replace('\\', '/');
-
-				if (ASAPInfo.isOurFile(line)) {
-					try {
-						InputStream is;
-						if (inputStreams) {
-							if (zis != null)
-								is = zis.openInputStream(path + line);
-							else
-								is = new FileInputStream(path + line);
-						}
-						else
-							is = null;
-						onSongFile(line, is);
-					}
-					catch (Exception ex) {
-						// ignore files we cannot read or understand
-					}
-				}
-			}
-		}
-		finally {
-			lineReader.close();
-		}
-	}
-
-	private void listZipDirectory(File zipFile, String zipPath, boolean inputStreams, boolean recurseZip) throws IOException
-	{
-		if (zipPath == null)
-			zipPath = "";
-		int zipPathLen = zipPath.length();
-		ZipFile zip = new ZipFile(zipFile);
-		try {
-			Enumeration<? extends ZipEntry> zipEntries = zip.entries();
-			while (zipEntries.hasMoreElements()) {
-				final ZipEntry zipEntry = zipEntries.nextElement();
-				if (!zipEntry.isDirectory()) {
-					String name = zipEntry.getName();
-					if (name.startsWith(zipPath) && (ASAPInfo.isOurFile(name) || Util.isM3u(name))) {
-						if (!recurseZip) {
-							int i = name.indexOf('/', zipPathLen);
-							if (i >= 0) {
-								// file in a subdirectory - add subdirectory with the trailing slash
-								onContainer(name.substring(zipPathLen, i + 1));
-								continue;
-							}
-						}
-						// file
-						name = name.substring(zipPathLen);
-						if (Util.isM3u(name))
-							onContainer(name);
-						else {
-							try {
-								onSongFile(name, inputStreams ? zip.getInputStream(zipEntry) : null);
-							}
-							catch (Exception ex) {
-								// ignore files we cannot read or understand
-							}
-						}
-					}
-				}
-			}
-		}
-		finally {
-			zip.close();
-		}
-	}
-
-	void list(Uri uri, boolean inputStreams, boolean recurseZip) throws IOException
-	{
-		File file = new File(uri.getPath());
-		if (file.isDirectory())
-			listDirectory(file, inputStreams);
-		else if (Util.isM3u(uri))
-			listM3u(uri, inputStreams);
-		else
-			listZipDirectory(file, uri.getFragment(), inputStreams, recurseZip);
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/FileSelector.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/FileSelector.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/FileSelector.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/FileSelector.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,285 +0,0 @@
-/*
- * FileSelector.java - ASAP for Android
- *
- * Copyright (C) 2010-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.TreeSet;
-
-public class FileSelector extends ListActivity
-{
-	private boolean isDetails;
-	private Uri uri;
-
-	private static class FileInfo implements Comparable<FileInfo>
-	{
-		private String filename;
-		private String title;
-		private String author;
-		private String date;
-		private int songs;
-
-		private FileInfo(String filename)
-		{
-			this.title = this.filename = filename;
-		}
-
-		private FileInfo(String filename, InputStream is) throws Exception
-		{
-			this(filename);
-			if (is != null) {
-				byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
-				int moduleLen = Util.readAndClose(is, module);
-				ASAPInfo info = new ASAPInfo();
-				info.load(filename, module, moduleLen);
-				this.title = info.getTitleOrFilename();
-				this.author = info.getAuthor();
-				this.date = info.getDate();
-				this.songs = info.getSongs();
-			}
-		}
-
-		private FileInfo(String filename, String title)
-		{
-			this.filename = filename;
-			this.title = title;
-		}
-
-		@Override
-		public String toString()
-		{
-			return title;
-		}
-
-		@Override
-		public boolean equals(Object obj)
-		{
-			if (!(obj instanceof FileInfo))
-				return false;
-			FileInfo that = (FileInfo) obj;
-			if (this.filename == null)
-				return that.filename == null;
-			return this.filename.equals(that.filename);
-		}
-
-		@Override
-		public int hashCode()
-		{
-			return filename == null ? 0 : filename.hashCode();
-		}
-
-		public int compareTo(FileInfo that)
-		{
-			if (this.filename == null)
-				return -1;
-			if (that.filename == null)
-				return 1;
-			boolean dir1 = this.filename.endsWith("/");
-			boolean dir2 = that.filename.endsWith("/");
-			if (dir1 != dir2)
-				return dir1 ? -1 : 1;
-			return this.title.compareTo(that.title);
-		}
-	}
-
-	private static class FileInfoAdapter extends ArrayAdapter<FileInfo>
-	{
-		private LayoutInflater layoutInflater;
-
-		private FileInfoAdapter(Context context, int rowViewResourceId, FileInfo[] infos)
-		{
-			super(context, rowViewResourceId, infos);
-			layoutInflater = LayoutInflater.from(context);
-		}
-
-		private static class ViewHolder
-		{
-			private TextView title;
-			private TextView author;
-			private TextView date;
-			private TextView songs;
-		}
-
-		public View getView(int position, View convertView, ViewGroup parent)
-		{
-			ViewHolder holder;
-			if (convertView == null) {
-				convertView = layoutInflater.inflate(R.layout.fileinfo_list_item, null);
-				holder = new ViewHolder();
-				holder.title = (TextView) convertView.findViewById(R.id.title);
-				holder.author = (TextView) convertView.findViewById(R.id.author);
-				holder.date = (TextView) convertView.findViewById(R.id.date);
-				holder.songs = (TextView) convertView.findViewById(R.id.songs);
-				convertView.setTag(holder);
-			}
-			else
-				holder = (ViewHolder) convertView.getTag();
-
-			FileInfo info = getItem(position);
-			holder.title.setText(info.title);
-			holder.author.setText(info.author);
-			holder.date.setText(info.date);
-			holder.songs.setText(info.songs > 1 ? getContext().getString(R.string.songs_format, info.songs) : null);
-
-			return convertView;
-		}
-	}
-
-	private class FileInfoList extends FileContainer
-	{
-		private Collection<FileInfo> coll;
-		private int songFiles;
-
-		@Override
-		protected void onSongFile(String name, InputStream is) throws Exception
-		{
-			coll.add(new FileInfo(name, is));
-			songFiles++;
-		}
-
-		@Override
-		protected void onContainer(String name)
-		{
-			coll.add(new FileInfo(name));
-		}
-
-		FileInfo[] list() throws IOException
-		{
-			boolean isM3u = Util.isM3u(uri);
-			coll = isM3u ? new ArrayList<FileInfo>() : new TreeSet<FileInfo>();
-			songFiles = 0;
-			list(uri, isDetails, false);
-
-			// "(shuffle all)" if any song files or non-empty ZIP directory
-			if (songFiles > 1 || (!coll.isEmpty() && Util.isZip(uri.getPath()))) {
-				FileInfo shuffleAll = new FileInfo(null, getString(R.string.shuffle_all));
-				if (isM3u)
-					((ArrayList<FileInfo>) coll).add(0, shuffleAll); // insert at the beginning
-				else
-					coll.add(shuffleAll);
-			}
-
-			return coll.toArray(new FileInfo[coll.size()]);
-		}
-	}
-
-	private void reload()
-	{
-		uri = getIntent().getData();
-		if (uri == null) {
-			String state = Environment.getExternalStorageState();
-			File dir = Environment.MEDIA_MOUNTED.equals(state) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)
-				? Environment.getExternalStorageDirectory()
-				: Environment.getRootDirectory();
-			uri = Uri.fromFile(dir);
-		}
-
-		FileInfo[] infos;
-		try {
-			infos = new FileInfoList().list();
-		}
-		catch (IOException ex) {
-			Toast.makeText(this, R.string.access_denied, Toast.LENGTH_SHORT).show();
-			infos = new FileInfo[0];
-		}
-
-		ListAdapter adapter = isDetails
-			? new FileInfoAdapter(this, R.layout.fileinfo_list_item, infos)
-			: new ArrayAdapter<FileInfo>(this, R.layout.filename_list_item, infos);
-		setListAdapter(adapter);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		getListView().setTextFilterEnabled(true);
-		isDetails = getPreferences(MODE_PRIVATE).getBoolean("fileDetails", false);
-		reload();
-	}
-
-	@Override
-	protected void onListItemClick(ListView l, View v, int position, long id)
-	{
-		Intent intent;
-		FileInfo info = (FileInfo) l.getItemAtPosition(position);
-		String name = info.filename;
-		if (name == null) {
-			// shuffle all
-			intent = new Intent(Intent.ACTION_VIEW, uri, this, Player.class);
-		}
-		else {
-			Class klass = ASAPInfo.isOurFile(name) ? Player.class : FileSelector.class;
-			intent = new Intent(Intent.ACTION_VIEW, Util.buildUri(uri, name), this, klass);
-			if (Util.isM3u(uri))
-				intent.putExtra(PlayerService.EXTRA_PLAYLIST, uri.toString());
-		}
-		startActivity(intent);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		getMenuInflater().inflate(R.menu.file_selector, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item)
-	{
-		switch (item.getItemId()) {
-		case R.id.menu_toggle_details:
-			isDetails = !isDetails;
-			getPreferences(MODE_PRIVATE).edit().putBoolean("fileDetails", isDetails).commit();
-			reload();
-			return true;
-		case R.id.menu_about:
-			Util.showAbout(this);
-			return true;
-		default:
-			return false;
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/MediaButtonEventReceiver.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/MediaButtonEventReceiver.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/MediaButtonEventReceiver.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/MediaButtonEventReceiver.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
- * MediaButtonEventReceiver.java - ASAP for Android
- *
- * Copyright (C) 2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.IBinder;
-import android.view.KeyEvent;
-
-public class MediaButtonEventReceiver extends BroadcastReceiver
-{
-	@Override
-	public void onReceive(Context context, Intent intent)
-	{
-		IBinder binder = peekService(context, new Intent(context, PlayerService.class));
-		if (binder == null)
-			return;
-		PlayerService service = ((PlayerService.LocalBinder) binder).getService();
-
-		KeyEvent event = (KeyEvent) intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
-		if (event.getAction() != KeyEvent.ACTION_DOWN)
-			return;
-		switch (event.getKeyCode()) {
-		case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
-		case KeyEvent.KEYCODE_HEADSETHOOK:
-			service.togglePause();
-			break;
-		case KeyEvent.KEYCODE_MEDIA_PAUSE:
-			service.pause();
-			break;
-		case KeyEvent.KEYCODE_MEDIA_PLAY:
-			service.start();
-			break;
-		case KeyEvent.KEYCODE_MEDIA_NEXT:
-			service.playNextSong();
-			break;
-		case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-			service.playPreviousSong();
-			break;
-		default:
-			break;
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/Player.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/Player.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/Player.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/Player.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-/*
- * Player.java - ASAP for Android
- *
- * Copyright (C) 2010-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.net.Uri;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.MediaController;
-import android.widget.TextView;
-
-public class Player extends Activity
-{
-	private PlayerService service;
-	private final ServiceConnection connection = new ServiceConnection() {
-			public void onServiceConnected(ComponentName className, IBinder service)
-			{
-				Player.this.service = ((PlayerService.LocalBinder) service).getService();
-				showInfo();
-			}
-			public void onServiceDisconnected(ComponentName className)
-			{
-				Player.this.service = null;
-			}
-		};
-
-	private MediaController mediaController;
-
-	private View getContentView()
-	{
-		return findViewById(android.R.id.content);
-	}
-
-	private void setTag(int controlId, String value)
-	{
-		TextView control = (TextView) findViewById(controlId);
-		if (value.length() == 0)
-			control.setVisibility(View.GONE);
-		else {
-			control.setText(value);
-			control.setVisibility(View.VISIBLE);
-		}
-	}
-
-	private void showInfo()
-	{
-		final PlayerService service = this.service;
-		if (service == null)
-			return;
-		ASAPInfo info = service.info;
-		if (info == null)
-			return;
-		setTag(R.id.name, info.getTitleOrFilename());
-		setTag(R.id.author, info.getAuthor());
-		setTag(R.id.date, info.getDate());
-		int songs = info.getSongs();
-		if (songs > 1)
-			setTag(R.id.song, getString(R.string.song_format, service.song + 1, songs));
-		else
-			setTag(R.id.song, "");
-
-		mediaController.setMediaPlayer(service);
-		mediaController.setPrevNextListeners(new OnClickListener() {
-				public void onClick(View v) { service.playNextSong(); }
-			},
-			new OnClickListener() {
-				public void onClick(View v) { service.playPreviousSong(); }
-			});
-	}
-
-	static final String ACTION_SHOW_INFO = "net.sf.asap.action.SHOW_INFO";
-
-	private BroadcastReceiver receiver = new BroadcastReceiver() {
-			@Override
-			public void onReceive(Context context, Intent intent) {
-				showInfo();
-			}
-		};
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		setTitle(R.string.playing_title);
-		setContentView(R.layout.playing);
-		mediaController = new MediaController(this, false);
-		mediaController.setAnchorView(getContentView());
-
-		Uri uri = getIntent().getData();
-		Intent intent = new Intent(Intent.ACTION_VIEW, uri, this, PlayerService.class);
-		if (uri != null)
-			startService(intent);
-		bindService(intent, connection, Context.BIND_AUTO_CREATE);
-
-		findViewById(R.id.stop_button).setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					if (service != null)
-						service.stopSelf();
-					finish();
-				}
-			});
-
-		registerReceiver(receiver, new IntentFilter(ACTION_SHOW_INFO));
-	}
-
-	@Override
-	protected void onResume()
-	{
-		super.onResume();
-		if (service != null)
-			mediaController.show(0);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event)
-	{
-		if (service != null)
-			mediaController.show(0);
-		return true;
-	}
-
-	@Override
-	protected void onDestroy()
-	{
-		super.onDestroy();
-		unregisterReceiver(receiver);
-		unbindService(connection);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		getMenuInflater().inflate(R.menu.playing, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item)
-	{
-		switch (item.getItemId()) {
-		case R.id.menu_about:
-			Util.showAbout(this);
-			return true;
-		default:
-			return false;
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/PlayerService.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/PlayerService.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/PlayerService.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/PlayerService.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,503 +0,0 @@
-/*
- * PlayerService.java - ASAP for Android
- *
- * Copyright (C) 2010-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.AudioTrack;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Handler;
-import android.os.IBinder;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
-import android.widget.MediaController;
-import android.widget.Toast;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-public class PlayerService extends Service implements Runnable, MediaController.MediaPlayerControl
-{
-	private Uri uri;
-	int song;
-	private static final int SONG_DEFAULT = -1;
-	private static final int SONG_LAST = -2;
-
-	// User interface -----------------------------------------------------------------------------------------
-
-	private NotificationManager notMan;
-	private static final int NOTIFICATION_ID = 1;
-
-	@Override
-	public void onCreate()
-	{
-		notMan = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-	}
-
-	private void startForegroundCompat(int id, Notification notification)
-	{
-		if (!Util.invokeMethod(this, "startForeground", id, notification)) {
-			// Fall back on the old API.
-			Util.invokeMethod(this, "setForeground", true);
-			notMan.notify(id, notification);
-		}
-	}
-
-	private void stopForegroundCompat(int id)
-	{
-		if (!Util.invokeMethod(this, "stopForeground", true)) {
-			// Fall back on the old API.
-			// Cancel before changing the foreground state, since we could be killed at that point.
-			notMan.cancel(id);
-			Util.invokeMethod(this, "setForeground", false);
-		}
-	}
-
-	private final Handler toastHandler = new Handler();
-
-	private void showError(final int messageId)
-	{
-		toastHandler.post(new Runnable() {
-			public void run() {
-				Toast.makeText(PlayerService.this, messageId, Toast.LENGTH_SHORT).show();
-			}
-		});
-	}
-
-
-	// Threading ----------------------------------------------------------------------------------------------
-
-	private Thread thread;
-	private boolean stop;
-
-	private void stop()
-	{
-		if (thread != null) {
-			synchronized (this) {
-				stop = true;
-				notify();
-			}
-			try {
-				thread.join();
-			}
-			catch (InterruptedException ex) {
-			}
-			thread = null;
-			stopForegroundCompat(NOTIFICATION_ID);
-		}
-	}
-
-	private void playFile(Uri uri, int song)
-	{
-		stop();
-		this.uri = uri;
-		this.song = song;
-		stop = false;
-		thread = new Thread(this);
-		thread.start();
-	}
-
-
-	// I/O ----------------------------------------------------------------------------------------------------
-
-	private static InputStream httpGet(Uri uri) throws IOException
-	{
-		DefaultHttpClient client = new DefaultHttpClient();
-		HttpGet request = new HttpGet(uri.toString());
-		HttpResponse response = client.execute(request);
-		StatusLine status = response.getStatusLine();
-		if (status.getStatusCode() != 200)
-			throw new IOException("HTTP error " + status);
-		return response.getEntity().getContent();
-	}
-
-
-	// Playlist -----------------------------------------------------------------------------------------------
-
-	static final String EXTRA_PLAYLIST = "asap.intent.extra.PLAYLIST";
-
-	private final ArrayList<Uri> playlist = new ArrayList<Uri>();
-
-	private void setPlaylist(final Uri uri, boolean shuffle)
-	{
-		playlist.clear();
-		FileContainer container = new FileContainer() {
-				@Override
-				protected void onSongFile(String name, InputStream is) {
-					playlist.add(Util.buildUri(uri, name));
-				}
-			};
-		try {
-			container.list(uri, false, true);
-			if (shuffle)
-				Collections.shuffle(playlist);
-			else if (!Util.isM3u(uri))
-				Collections.sort(playlist);
-		}
-		catch (IOException ex) {
-			// playlist is not essential
-		}
-	}
-
-	private int getPlaylistIndex()
-	{
-		return playlist.indexOf(uri);
-	}
-
-	private void playFileFromPlaylist(int playlistIndex, int song)
-	{
-		playFile(playlist.get(playlistIndex), song);
-	}
-
-
-	// Playback -----------------------------------------------------------------------------------------------
-
-	private final ASAP asap = new ASAP();
-	ASAPInfo info;
-	private AudioTrack audioTrack;
-	private int seekPosition;
-
-	private boolean isPaused()
-	{
-		return audioTrack == null || audioTrack.getPlayState() == AudioTrack.PLAYSTATE_PAUSED;
-	}
-
-	public boolean isPlaying()
-	{
-		return !isPaused();
-	}
-
-	public boolean canPause()
-	{
-		return !isPaused();
-	}
-
-	public boolean canSeekBackward()
-	{
-		return false;
-	}
-
-	public boolean canSeekForward()
-	{
-		return false;
-	}
-
-	public int getBufferPercentage()
-	{
-		return 100;
-	}
-
-	public void pause()
-	{
-		if (audioTrack != null)
-			audioTrack.pause();
-	}
-
-	public void start()
-	{
-		if (audioTrack != null) {
-			audioTrack.play();
-			synchronized (this) {
-				notify();
-			}
-		}
-	}
-
-	void togglePause()
-	{
-		if (isPaused())
-			start();
-		else
-			pause();
-	}
-
-	private void showInfo()
-	{
-		sendBroadcast(new Intent(Player.ACTION_SHOW_INFO));
-	}
-
-	private void playSong() throws Exception
-	{
-		synchronized (asap) {
-			seekPosition = -1;
-			asap.playSong(song, info.getLoop(song) ? -1 : info.getDuration(song));
-		}
-		showInfo();
-		start();
-	}
-
-	void playNextSong()
-	{
-		if (song + 1 < info.getSongs()) {
-			song++;
-			try {
-				playSong();
-				return;
-			}
-			catch (Exception ex) {
-			}
-		}
-
-		int playlistIndex = getPlaylistIndex();
-		if (playlistIndex >= 0) {
-			if (++playlistIndex >= playlist.size())
-				playlistIndex = 0;
-			playFileFromPlaylist(playlistIndex, 0);
-		}
-	}
-
-	void playPreviousSong()
-	{
-		if (song > 0) {
-			song--;
-			try {
-				playSong();
-				return;
-			}
-			catch (Exception ex) {
-			}
-		}
-
-		int playlistIndex = getPlaylistIndex();
-		if (playlistIndex >= 0) {
-			if (playlistIndex == 0)
-				playlistIndex = playlist.size();
-			playFileFromPlaylist(playlistIndex - 1, SONG_LAST);
-		}
-	}
-
-	public int getDuration()
-	{
-		if (song < 0)
-			return -1;
-		return info.getDuration(song);
-	}
-
-	public int getCurrentPosition()
-	{
-		return asap.getPosition();
-	}
-
-	public void seekTo(int pos)
-	{
-		synchronized (asap) {
-			seekPosition = pos;
-		}
-	}
-
-	public void run()
-	{
-		// read file
-		String filename = uri.getPath();
-		byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
-		int moduleLen;
-		try {
-			InputStream is;
-			switch (uri.getScheme()) {
-			case "file":
-				if (Util.isZip(filename)) {
-					String zipFilename = filename;
-					filename = uri.getFragment();
-					is = new ZipInputStream(zipFilename, filename);
-				}
-				else
-					is = new FileInputStream(filename);
-				break;
-			case "http":
-				is = httpGet(uri);
-				break;
-			default:
-				throw new FileNotFoundException(uri.toString());
-			}
-			moduleLen = Util.readAndClose(is, module);
-		}
-		catch (IOException ex) {
-			showError(R.string.error_reading_file);
-			return;
-		}
-
-		// load file
-		try {
-			asap.load(filename, module, moduleLen);
-			info = asap.getInfo();
-			switch (song) {
-			case SONG_DEFAULT:
-				song = info.getDefaultSong();
-				break;
-			case SONG_LAST:
-				song = info.getSongs() - 1;
-				break;
-			default:
-				break;
-			}
-			playSong();
-		}
-		catch (Exception ex) {
-			showError(R.string.invalid_file);
-			return;
-		}
-
-		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, Player.class), 0);
-		String title = info.getTitleOrFilename();
-		Notification notification = new Notification(R.drawable.icon, title, System.currentTimeMillis());
-		notification.flags |= Notification.FLAG_ONGOING_EVENT;
-		notification.setLatestEventInfo(this, title, info.getAuthor(), contentIntent);
-		startForegroundCompat(NOTIFICATION_ID, notification);
-
-		// playback
-		int channelConfig = info.getChannels() == 1 ? AudioFormat.CHANNEL_CONFIGURATION_MONO : AudioFormat.CHANNEL_CONFIGURATION_STEREO;
-		int bufferLen = AudioTrack.getMinBufferSize(ASAP.SAMPLE_RATE, channelConfig, AudioFormat.ENCODING_PCM_16BIT) >> 1;
-		if (bufferLen < 16384)
-			bufferLen = 16384;
-		final byte[] byteBuffer = new byte[bufferLen << 1];
-		final short[] shortBuffer = new short[bufferLen];
-		audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, ASAP.SAMPLE_RATE, channelConfig, AudioFormat.ENCODING_PCM_16BIT, bufferLen << 1, AudioTrack.MODE_STREAM);
-		audioTrack.play();
-
-		for (;;) {
-			synchronized (this) {
-				if (bufferLen < shortBuffer.length || isPaused()) {
-					try {
-						wait();
-					}
-					catch (InterruptedException ex) {
-					}
-				}
-				if (stop) {
-					audioTrack.stop();
-					return;
-				}
-			}
-			synchronized (asap) {
-				int pos = seekPosition;
-				if (pos >= 0) {
-					seekPosition = -1;
-					try {
-						asap.seek(pos);
-					}
-					catch (Exception ex) {
-					}
-				}
-				bufferLen = asap.generate(byteBuffer, byteBuffer.length, ASAPSampleFormat.S16_L_E) >> 1;
-			}
-			for (int i = 0; i < bufferLen; i++)
-				shortBuffer[i] = (short) ((byteBuffer[i << 1] & 0xff) | byteBuffer[i << 1 | 1] << 8);
-			audioTrack.write(shortBuffer, 0, bufferLen);
-		}
-	}
-
-	private final BroadcastReceiver headsetReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context context, Intent intent)
-		{
-			if (intent.getIntExtra("state", -1) == 0) {
-				pause();
-				showInfo(); // just to update MediaController
-			}
-		}
-	};
-
-	private void registerMediaButtonEventReceiver(String methodName)
-	{
-		Object audioManager = getSystemService(AUDIO_SERVICE);
-		ComponentName eventReceiver = new ComponentName(getPackageName(), MediaButtonEventReceiver.class.getName());
-		Util.invokeMethod(audioManager, methodName, eventReceiver);
-	}
-
-	@Override
-	public void onStart(Intent intent, int startId)
-	{
-		super.onStart(intent, startId);
-
-		registerReceiver(headsetReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
-		registerMediaButtonEventReceiver("registerMediaButtonEventReceiver");
-
-		TelephonyManager telephony = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
-		telephony.listen(new PhoneStateListener() {
-				public void onCallStateChanged(int state, String incomingNumber) {
-					if (state == TelephonyManager.CALL_STATE_RINGING)
-						pause();
-				}
-			}, PhoneStateListener.LISTEN_CALL_STATE);
-
-		Uri uri = intent.getData();
-		String playlistUri = intent.getStringExtra(EXTRA_PLAYLIST);
-		if (playlistUri != null)
-			setPlaylist(Uri.parse(playlistUri), false);
-		else if ("file".equals(uri.getScheme())) {
-			if (ASAPInfo.isOurFile(uri.toString()))
-				setPlaylist(Util.getParent(uri), false);
-			else {
-				setPlaylist(uri, true);
-				uri = playlist.get(0);
-			}
-		}
-		playFile(uri, SONG_DEFAULT);
-	}
-
-	@Override
-	public void onDestroy()
-	{
-		super.onDestroy();
-		stop();
-		registerMediaButtonEventReceiver("unregisterMediaButtonEventReceiver");
-		unregisterReceiver(headsetReceiver);
-	}
-
-
-	// Player.java interface ----------------------------------------------------------------------------------
-
-	class LocalBinder extends Binder
-	{
-		PlayerService getService()
-		{
-			return PlayerService.this;
-		}
-	}
-
-	private final IBinder binder = new LocalBinder();
-
-	@Override
-	public IBinder onBind(Intent intent)
-	{
-		return binder;
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/proguard.cfg kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/proguard.cfg
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/proguard.cfg	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/proguard.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-# Based on examples/android.pro from ProGuard 4.6.
-
--dontpreverify
--repackageclasses ''
--allowaccessmodification
-
-# don't change package because of the resources
--keep class net.sf.asap.ASAP6502
-
-# Switch off some optimizations that trip older versions of the Dalvik VM.
--optimizations !code/simplification/arithmetic
-
-# RemoteViews might need annotations.
--keepattributes *Annotation*
-
-# Preserve all fundamental application classes.
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
-
-# Preserve all View implementations, their special context constructors, and
-# their setters.
--keep public class * extends android.view.View {
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-    public void set*(...);
-}
-
-# Preserve all classes that have special context constructors, and the
-# constructors themselves.
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
-# Preserve all classes that have special context constructors, and the
-# constructors themselves.
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
-# Preserve the special fields of all Parcelable implementations.
--keepclassmembers class * implements android.os.Parcelable {
-    static android.os.Parcelable$Creator CREATOR;
-}
-
-# Preserve static fields of inner classes of R classes that might be accessed
-# through introspection.
--keepclassmembers class **.R$* {
-  public static <fields>;
-}
-
-# Preserve the required interface from the License Verification Library
-# (but don't nag the developer if the library is not used at all).
--keep public interface com.android.vending.licensing.ILicensingService
-
--dontnote com.android.vending.licensing.ILicensingService
-
-# Preserve all native method names and the names of their classes.
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# Preserve the special static methods that are required in all enumeration
-# classes.
--keepclassmembers class * extends java.lang.Enum {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-# Explicitly preserve all serialization members. The Serializable interface
-# is only a marker interface, so it wouldn't save them.
-# You can comment this out if your application doesn't use serialization.
-# If your code contains serializable classes that have to be backward 
-# compatible, please refer to the manual.
--keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    static final java.io.ObjectStreamField[] serialPersistentFields;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/drawable/icon.png and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/drawable/icon.png differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/layout/fileinfo_list_item.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/layout/fileinfo_list_item.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/layout/fileinfo_list_item.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/layout/fileinfo_list_item.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<TextView android:id="@+id/title"
-			android:layout_width="0px" android:layout_weight="1" android:layout_height="wrap_content"
-			android:textSize="18sp" android:textStyle="bold" />
-		<TextView android:id="@+id/songs"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:textSize="18sp" />
-	</LinearLayout>
-	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<TextView android:id="@+id/author"
-			android:layout_width="0px" android:layout_weight="1" android:layout_height="wrap_content"
-			android:textSize="18sp" />
-		<TextView android:id="@+id/date"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:textSize="18sp" />
-	</LinearLayout>
-</LinearLayout>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/layout/filename_list_item.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/layout/filename_list_item.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/layout/filename_list_item.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/layout/filename_list_item.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="wrap_content"
-	android:textSize="26sp" />
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/layout/playing.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/layout/playing.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/layout/playing.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/layout/playing.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent" android:layout_height="fill_parent">
-	<TextView android:id="@+id/name" android:textSize="28sp" android:gravity="center_horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/author" android:textSize="24sp" android:gravity="center_horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/date" android:textSize="24sp" android:gravity="center_horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/song" android:textSize="20sp" android:gravity="center_horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />
-	<Button android:id="@+id/stop_button" android:text="@string/stop_button"
-		android:textSize="36sp" android:gravity="center_horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" />
-</LinearLayout>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/menu/file_selector.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/menu/file_selector.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/menu/file_selector.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/menu/file_selector.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/menu_toggle_details" android:title="@string/menu_toggle_details" android:icon="@android:drawable/ic_menu_info_details" />
-	<item android:id="@+id/menu_about" android:title="@string/menu_about" android:icon="@android:drawable/ic_menu_help" />
-</menu>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/menu/playing.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/menu/playing.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/menu/playing.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/menu/playing.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/menu_about" android:title="@string/menu_about" android:icon="@android:drawable/ic_menu_help" />
-</menu>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/values/strings.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/values/strings.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/values/strings.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="app_name">ASAP</string>
-	<string name="app_description">ASAP is a player of Atari 8-bit music. It emulates the POKEY sound chip and the 6502 processor. ASAP supports the following file formats: SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.</string>
-	<string name="play_in_asap">Play in ASAP</string>
-	<string name="access_denied">Access denied</string>
-	<string name="shuffle_all">(shuffle all)</string>
-	<string name="songs_format">%1$d songs</string>
-	<string name="playing_title">ASAP - Playing</string>
-	<string name="error_title">ASAP - Error</string>
-	<string name="error_reading_file">Error reading file</string>
-	<string name="invalid_file">Invalid file</string>
-	<string name="stop_button">Stop</string>
-	<string name="song_format">Song %1$d of %2$d</string>
-	<string name="menu_toggle_details">Toggle details</string>
-	<string name="menu_about">About</string>
-	<string name="about_title">About ASAP 3.1.5</string>
-	<string name="about_message">Another Slight Atari Player (C) 2005-2013 Piotr Fusik\nCMC, MPT, TMC, TM2 players (C) 1994-2005 Marcin Lewandowski\nRMT player (C) 2002-2005 Radek Sterba\nDLT player (C) 2009 Marek Konopka\nCMS player (C) 1999 David Spilka\nFC player (C) 2011 Jerzy Kut\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</string>
-</resources>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/values/themes.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/values/themes.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/res/values/themes.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/res/values/themes.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="Theme" parent="@android:style/Theme.Wallpaper">
-		<item name="android:textColor">@android:color/white</item>
-	</style>
-</resources>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/Util.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/Util.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/Util.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/Util.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-/*
- * Util.java - ASAP for Android
- *
- * Copyright (C) 2010-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.net.Uri;
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-class Util
-{
-	static boolean isZip(String filename)
-	{
-		int n = filename.length();
-		return n >= 4 && filename.regionMatches(true, n - 4, ".zip", 0, 4);
-	}
-
-	static boolean isM3u(String filename)
-	{
-		int n = filename.length();
-		return n >= 4 && filename.regionMatches(true, n - 4, ".m3u", 0, 4);
-	}
-
-	static boolean isM3u(Uri uri)
-	{
-		return isM3u(uri.toString());
-	}
-
-	static String getParent(String path)
-	{
-		int i = path.lastIndexOf('/');
-		if (i < 0)
-			return "";
-		return path.substring(0, i + 1);
-	}
-
-	static Uri getParent(Uri uri)
-	{
-		String path = uri.getFragment();
-		if (path != null)
-			return uri.buildUpon().fragment(getParent(path)).build();
-		return Uri.fromFile(new File(getParent(uri.getPath())));
-	}
-
-	static String stripM3u(String path)
-	{
-		return isM3u(path) ? getParent(path) : path;
-	}
-
-	static Uri buildUri(Uri baseUri, String relativePath)
-	{
-		String path = baseUri.getPath();
-		if (isZip(path)) {
-			String zipPath = baseUri.getFragment();
-			if (zipPath == null)
-				zipPath = relativePath;
-			else {
-				zipPath = stripM3u(zipPath) + relativePath;
-			}
-			return baseUri.buildUpon().fragment(zipPath).build();
-		}
-		return Uri.fromFile(new File(stripM3u(path), relativePath));
-	}
-
-	/**
-	 * Reads bytes from the stream into the byte array
-	 * until end of stream or array is full.
-	 * @param is source stream
-	 * @param b output array
-	 * @return number of bytes read
-	 */
-	static int readAndClose(InputStream is, byte[] b) throws IOException
-	{
-		int got = 0;
-		int len = b.length;
-		try {
-			while (got < len) {
-				int i = is.read(b, got, len - got);
-				if (i <= 0)
-					break;
-				got += i;
-			}
-		}
-		finally {
-			is.close();
-		}
-		return got;
-	}
-
-	static boolean invokeMethod(Object thiz, String name, Object... args)
-	{
-		Class[] classes = new Class[args.length];
-		for (int i = 0; i < args.length; i++)
-			classes[i] = args[i].getClass();
-		try {
-			Method method = thiz.getClass().getMethod(name, classes);
-			method.invoke(thiz, args);
-		}
-		catch (Exception ex) {
-			return false;
-		}
-		return true;
-	}
-
-	static void showAbout(Activity activity)
-	{
-		new AlertDialog.Builder(activity).setTitle(R.string.about_title).setIcon(R.drawable.icon).setMessage(R.string.about_message).show();
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/ZipInputStream.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/ZipInputStream.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/android/ZipInputStream.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/android/ZipInputStream.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * ZipInputStream.java - ASAP for Android
- *
- * Copyright (C) 2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import java.io.FilterInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.zip.ZipFile;
-
-class ZipInputStream extends FilterInputStream
-{
-	private final ZipFile zip;
-
-	private ZipInputStream(ZipFile zip, String filename) throws IOException
-	{
-		super(zip.getInputStream(zip.getEntry(filename)));
-		this.zip = zip;
-	}
-
-	ZipInputStream(String zipFilename, String filename) throws IOException
-	{
-		this(new ZipFile(zipFilename), filename);
-	}
-
-	@Override
-	public void close() throws IOException
-	{
-		super.close();
-		zip.close();
-	}
-
-	InputStream openInputStream(String filename) throws IOException
-	{
-		return zip.getInputStream(zip.getEntry(filename));
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/ASAP2WAV.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/ASAP2WAV.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/ASAP2WAV.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/ASAP2WAV.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/*
- * ASAP2WAV.java - converter of ASAP-supported formats to WAV files
- *
- * Copyright (C) 2007-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import net.sf.asap.ASAP;
-import net.sf.asap.ASAPInfo;
-import net.sf.asap.ASAPSampleFormat;
-
-public class ASAP2WAV
-{
-	private static String outputFilename = null;
-	private static boolean outputHeader = true;
-	private static int song = -1;
-	private static int format = ASAPSampleFormat.S16_L_E;
-	private static int duration = -1;
-	private static int muteMask = 0;
-
-	private static void printHelp()
-	{
-		System.out.print(
-			"Usage: java -jar asap2wav.jar [OPTIONS] INPUTFILE...\n" +
-			"Each INPUTFILE must be in a supported format:\n" +
-			"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
-			"Options:\n" +
-			"-o FILE     --output=FILE      Set output file name\n" +
-			"-o -        --output=-         Write to standard output\n" +
-			"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
-			"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
-			"-b          --byte-samples     Output 8-bit samples\n" +
-			"-w          --word-samples     Output 16-bit samples (default)\n" +
-			"            --raw              Output raw audio (no WAV header)\n" +
-			"-m CHANNELS --mute=CHANNELS    Mute POKEY chanels (1-8)\n" +
-			"-h          --help             Display this information\n" +
-			"-v          --version          Display version information\n"
-		);
-	}
-
-	private static void setSong(String s)
-	{
-		song = Integer.parseInt(s);
-	}
-
-	private static void setTime(String s) throws Exception
-	{
-		duration = ASAPInfo.parseDuration(s);
-	}
-
-	private static void setMuteMask(String s)
-	{
-		int mask = 0;
-		for (int i = 0; i < s.length(); i++) {
-			int c = s.charAt(i);
-			if (c >= '1' && c <= '8')
-				mask |= 1 << (c - '1');
-		}
-		muteMask = mask;
-	}
-
-	/**
-	 * Reads bytes from the stream into the byte array
-	 * until end of stream or array is full.
-	 * @param is source stream
-	 * @param b output array
-	 * @return number of bytes read
-	 */
-	private static int readAndClose(InputStream is, byte[] b) throws IOException
-	{
-		int got = 0;
-		int len = b.length;
-		try {
-			while (got < len) {
-				int i = is.read(b, got, len - got);
-				if (i <= 0)
-					break;
-				got += i;
-			}
-		}
-		finally {
-			is.close();
-		}
-		return got;
-	}
-
-	private static void processFile(String inputFilename) throws Exception
-	{
-		InputStream is = new FileInputStream(inputFilename);
-		byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
-		int moduleLen = readAndClose(is, module);
-		ASAP asap = new ASAP();
-		asap.load(inputFilename, module, moduleLen);
-		ASAPInfo info = asap.getInfo();
-		if (song < 0)
-			song = info.getDefaultSong();
-		if (duration < 0) {
-			duration = info.getDuration(song);
-			if (duration < 0)
-				duration = 180 * 1000;
-		}
-		asap.playSong(song, duration);
-		asap.mutePokeyChannels(muteMask);
-		if (outputFilename == null) {
-			int i = inputFilename.lastIndexOf('.');
-			outputFilename = inputFilename.substring(0, i + 1) + (outputHeader ? "wav" : "raw");
-		}
-		OutputStream os;
-		if (outputFilename.equals("-"))
-			os = System.out;
-		else
-			os = new FileOutputStream(outputFilename);
-		byte[] buffer = new byte[8192];
-		int nBytes;
-		if (outputHeader) {
-			nBytes = asap.getWavHeader(buffer, format, false);
-			os.write(buffer, 0, nBytes);
-		}
-		do {
-			nBytes = asap.generate(buffer, buffer.length, format);
-			os.write(buffer, 0, nBytes);
-		} while (nBytes == buffer.length);
-		os.close();
-		outputFilename = null;
-		song = -1;
-		duration = -1;
-	}
-
-	public static void main(String[] args) throws Exception
-	{
-		boolean noInputFiles = true;
-		for (int i = 0; i < args.length; i++) {
-			String arg = args[i];
-			if (arg.charAt(0) != '-') {
-				processFile(arg);
-				noInputFiles = false;
-			}
-			else if (arg.equals("-o"))
-				outputFilename = args[++i];
-			else if (arg.startsWith("--output="))
-				outputFilename = arg.substring(9);
-			else if (arg.equals("-s"))
-				setSong(args[++i]);
-			else if (arg.startsWith("--song="))
-				setSong(arg.substring(7));
-			else if (arg.equals("-t"))
-				setTime(args[++i]);
-			else if (arg.startsWith("--time="))
-				setTime(arg.substring(7));
-			else if (arg.equals("-b") || arg.equals("--byte-samples"))
-				format = ASAPSampleFormat.U8;
-			else if (arg.equals("-w") || arg.equals("--word-samples"))
-				format = ASAPSampleFormat.S16_L_E;
-			else if (arg.equals("--raw"))
-				outputHeader = false;
-			else if (arg.equals("-m"))
-				setMuteMask(args[++i]);
-			else if (arg.startsWith("--mute="))
-				setMuteMask(arg.substring(7));
-			else if (arg.equals("-h") || arg.equals("--help")) {
-				printHelp();
-				noInputFiles = false;
-			}
-			else if (arg.equals("-v") || arg.equals("--version")) {
-				System.out.println("ASAP2WAV (Java) " + ASAPInfo.VERSION);
-				noInputFiles = false;
-			}
-			else
-				throw new IllegalArgumentException("unknown option: " + arg);
-		}
-		if (noInputFiles) {
-			printHelp();
-			System.exit(1);
-		}
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/asap2wav.MF kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/asap2wav.MF
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/asap2wav.MF	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/asap2wav.MF	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: ASAP2WAV
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/ASAPApplet.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/ASAPApplet.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/ASAPApplet.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/ASAPApplet.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,244 +0,0 @@
-/*
- * ASAPApplet.java - ASAP applet
- *
- * Copyright (C) 2007-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import java.applet.Applet;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.URL;
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.DataLine;
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.SourceDataLine;
-import netscape.javascript.JSObject;
-
-import net.sf.asap.ASAP;
-import net.sf.asap.ASAPInfo;
-import net.sf.asap.ASAPSampleFormat;
-
-public class ASAPApplet extends Applet implements Runnable
-{
-	private final ASAP asap = new ASAP();
-	private int song;
-	private SourceDataLine line;
-	private boolean running;
-	private boolean paused;
-
-	private Color background;
-	private Color foreground;
-
-	public void update(Graphics g)
-	{
-		if (running)
-			paint(g);
-		else
-			super.update(g);
-	}
-
-	public void paint(Graphics g)
-	{
-		if (!running)
-			return;
-		int channels = 4 * asap.getInfo().getChannels();
-		int channelWidth = getWidth() / channels;
-		int totalHeight = getHeight();
-		int unitHeight = totalHeight / 15;
-		for (int i = 0; i < channels; i++) {
-			int height = asap.getPokeyChannelVolume(i) * unitHeight;
-			g.setColor(background);
-			g.fillRect(i * channelWidth, 0, channelWidth, totalHeight - height);
-			g.setColor(foreground);
-			g.fillRect(i * channelWidth, totalHeight - height, channelWidth, height);
-		}
-	/*
-		ASAPInfo info = asap.getInfo();
-		g.drawString("Author: " + info.getAuthor(), 10, 20);
-		g.drawString("Name: " + info.getTitleOrFilename(), 10, 40);
-		g.drawString("Date: " + info.getDate(), 10, 60);
-		if (info.getSongs() > 1)
-			g.drawString("Song " + (song + 1) + " of " + info.getSongs(), 10, 80);
-	*/
-	}
-
-	private void callJS(String paramName)
-	{
-		String js = getParameter(paramName);
-		if (js != null)
-			JSObject.getWindow(this).eval(js);
-	}
-
-	public void run()
-	{
-		byte[] buffer = new byte[8192];
-		int len;
-		do {
-			synchronized (asap) {
-				len = asap.generate(buffer, buffer.length, ASAPSampleFormat.S16_L_E);
-			}
-			synchronized (this) {
-				while (paused) {
-					try {
-						wait();
-					} catch (InterruptedException e) {
-						return;
-					}
-				}
-			}
-			line.write(buffer, 0, len);
-			repaint();
-			if (len != buffer.length) {
-				callJS("onPlaybackEnd");
-				running = false;
-			}
-		} while (running);
-		repaint();
-	}
-
-	/**
-	 * Reads bytes from the stream into the byte array
-	 * until end of stream or array is full.
-	 * @param is source stream
-	 * @param b output array
-	 * @return number of bytes read
-	 */
-	private static int readAndClose(InputStream is, byte[] b) throws IOException
-	{
-		int got = 0;
-		int len = b.length;
-		try {
-			while (got < len) {
-				int i = is.read(b, got, len - got);
-				if (i <= 0)
-					break;
-				got += i;
-			}
-		}
-		finally {
-			is.close();
-		}
-		return got;
-	}
-
-	public void play(String filename, int song)
-	{
-		byte[] module;
-		int moduleLen;
-		try {
-			InputStream is = new URL(getDocumentBase(), filename).openStream();
-			module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
-			moduleLen = readAndClose(is, module);
-		} catch (IOException e) {
-			showStatus("ERROR LOADING " + filename);
-			return;
-		}
-		ASAPInfo info;
-		synchronized (asap) {
-			try {
-				asap.load(filename, module, moduleLen);
-				info = asap.getInfo();
-				if (song < 0)
-					song = info.getDefaultSong();
-				asap.playSong(song, info.getLoop(song) ? -1 : info.getDuration(song));
-			} catch (Exception e) {
-				showStatus(e.getMessage());
-				return;
-			}
-		}
-		AudioFormat format = new AudioFormat(ASAP.SAMPLE_RATE, 16, info.getChannels(), true, false);
-		try {
-			line = (SourceDataLine) AudioSystem.getLine(new DataLine.Info(SourceDataLine.class, format));
-			line.open(format);
-		} catch (LineUnavailableException e) {
-			showStatus("ERROR OPENING AUDIO");
-			return;
-		}
-		callJS("onLoad");
-		line.start();
-		if (!running) {
-			running = true;
-			new Thread(this).start();
-		}
-		synchronized (this) {
-			paused = false;
-			notify();
-		}
-		repaint();
-	}
-
-	private Color getColor(String parameter, Color defaultColor)
-	{
-		String s = getParameter(parameter);
-		if (s == null || s.length() == 0)
-			return defaultColor;
-		if (s.charAt(0) == '#')
-			s = s.substring(1);
-		return new Color(Integer.parseInt(s, 16));
-	}
-
-	public void start()
-	{
-		background = getColor("background", Color.BLACK);
-		setBackground(background);
-		foreground = getColor("foreground", Color.GREEN);
-		String filename = getParameter("file");
-		if (filename == null)
-			return;
-		int song = -1;
-		String s = getParameter("song");
-		if (s == null || s.length() == 0)
-			song = -1;
-		else
-			song = Integer.parseInt(s);
-		play(filename, song);
-	}
-
-	public void stop()
-	{
-		running = false;
-	}
-
-	public synchronized boolean togglePause()
-	{
-		paused = !paused;
-		if (!paused)
-			notify();
-		return paused;
-	}
-
-	public String getAuthor()
-	{
-		return asap.getInfo().getAuthor();
-	}
-
-	public String getTitle()
-	{
-		return asap.getInfo().getTitle();
-	}
-
-	public String getDate()
-	{
-		return asap.getInfo().getDate();
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/ASAPMusicRoutine.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/ASAPMusicRoutine.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/ASAPMusicRoutine.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/ASAPMusicRoutine.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/*
- * ASAPMusicRoutine.java - music embeddable in an Atari program
- *
- * Copyright (C) 2011-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-package net.sf.asap;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Music embeddable in an Atari program.
- * Use this class to transform music into a routine
- * that can be called from your 6502 assembly language program.
- * Link your program with the binary returned by {@link #getBinary()}.
- * Call the music routine as specified by {@link #getInitAddress()},
- * {@link #isFulltime()}, {@link #getPlayerAddress()} and {@link #getPlayerRate()}.
- */
-public class ASAPMusicRoutine
-{
-	private final byte[] binary;
-	private final int initAddress;
-	private final boolean fulltime;
-	private final int playerAddress;
-	private final int playerRate;
-
-	/**
-	 * Transforms music data into a form that can be embedded in an Atari 8-bit program.
-	 * @param filename Name of the source music file. The extension is used to identify the format. No I/O is performed.
-	 * @param module Contents of the source music file. Only <code>moduleLen</code> leading bytes are meaningful.
-	 * @param moduleLen Length of the source music file.
-	 * @throws Exception if the source is invalid, not supported by ASAP or cannot be converted to ASAPMusicRoutine.
-	 */
-	public ASAPMusicRoutine(String filename, byte[] module, int moduleLen) throws Exception
-	{
-		ASAPInfo info = new ASAPInfo();
-		info.load(filename, module, moduleLen);
-		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		int[] initAndPlayer = new int[2];
-		ASAPWriter.writeExecutable(
-			new ByteWriter() { public void run(int data) { baos.write(data); } },
-			initAndPlayer, info, module, moduleLen);
-		binary = baos.toByteArray();
-		initAddress = initAndPlayer[0];
-		// TODO: SAP_S
-		fulltime = info.type == ASAPModuleType.SAP_D;
-		playerAddress = initAndPlayer[1];
-		playerRate = info.fastplay;
-	}
-
-	/**
-	 * Returns music data.
-	 * The data is in the format of Atari 8-bit executables:
-	 * two <code>0xff</code> bytes followed by multiple blocks loaded
-	 * at different addresses.
-	 * It is not a complete program, there is no init or run address.
-	 * Currently the loading addresses can be as low as <code>0x200</code>
-	 * which normally conflicts with the Atari operating system.
-	 */
-	public byte[] getBinary() { return binary; }
-
-	/**
-	 * Returns address of the initialization routine.
-	 * The initialization routine is 6502 code which should be called once
-	 * before the playback. There can be more than one song available -
-	 * load the zero-based song number into the accumulator.
-	 * For correct playback, you should reset the audio part of POKEY.
-	 * Example stereo-ready music initialization code:
-	 * <pre>
-	 *     lda #3
-	 *     sta $d21f
-	 *     sta $d20f
-	 *     ldx #8
-	 *     lda #0
-	 * initPokey_1 sta $d210,x
-	 *     sta $d200,x
-	 *     dex
-	 *     bpl initPokey_1
-	 *     lda #0 ; first song
-	 *     jsr initMusic ; use the address returned by {@link #getInitAddress()}
-	 * </pre>
-	 */
-	public int getInitAddress() { return initAddress; }
-
-	/**
-	 * Returns <code>true</code> if the initialization routine doesn't return
-	 * and actually performs the playback.
-	 * This usually means that the music contains digitalized sounds
-	 * and requires full 6502 processing power.
-	 * It is likely that you also need to disable screen DMA
-	 * and operating system interrupts for correct playback.
-	 */
-	public boolean isFulltime() { return fulltime; }
-
-	/**
-	 * Returns address of the player routine.
-	 * The player routine should be called at a constant rate
-	 * with a <code>JSR</code>.
-	 */
-	public int getPlayerAddress() { return playerAddress; }
-
-	/**
-	 * Returns the rate at which the player routine should be called.
-	 * The value is expressed as an interval in scanlines (one scanline equals 114 cycles).
-	 * Typical value is 312, which means that on a PAL Atari you should
-	 * call the player routine once per frame (usually on a vertical blank interrupt).
-	 */
-	public int getPlayerRate() { return playerRate; }
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/j2me/ASAPMIDlet.java kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/j2me/ASAPMIDlet.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/j2me/ASAPMIDlet.java	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/j2me/ASAPMIDlet.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,372 +0,0 @@
-/*
- * ASAPMIDlet.java - ASAP midlet
- *
- * Copyright (C) 2007-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Vector;
-import javax.microedition.io.Connector;
-import javax.microedition.io.file.FileConnection;
-import javax.microedition.io.file.FileSystemRegistry;
-import javax.microedition.lcdui.Alert;
-import javax.microedition.lcdui.AlertType;
-import javax.microedition.lcdui.Command;
-import javax.microedition.lcdui.CommandListener;
-import javax.microedition.lcdui.Display;
-import javax.microedition.lcdui.Displayable;
-import javax.microedition.lcdui.Form;
-import javax.microedition.lcdui.Gauge;
-import javax.microedition.lcdui.List;
-import javax.microedition.lcdui.StringItem;
-import javax.microedition.media.Manager;
-import javax.microedition.media.MediaException;
-import javax.microedition.media.Player;
-import javax.microedition.media.PlayerListener;
-import javax.microedition.midlet.MIDlet;
-
-import net.sf.asap.ASAP;
-import net.sf.asap.ASAPInfo;
-import net.sf.asap.ASAPSampleFormat;
-
-class FileList
-{
-	final String caption;
-	final String path;
-	final String[] names;
-	final FileList parent;
-	final FileList[] sublists;
-
-	private static boolean lessOrEqual(String name1, String name2)
-	{
-		boolean dir1 = name1.endsWith("/");
-		boolean dir2 = name2.endsWith("/");
-		if (dir1 != dir2)
-			return dir1;
-		return (name1.compareTo(name2) <= 0);
-	}
-
-	private void sort(int start, int end)
-	{
-		while (start + 1 < end) {
-			int left = start + 1;
-			int right = end;
-			String pivot = names[start];
-			String tmp;
-			while (left < right) {
-				if (lessOrEqual(names[left], pivot))
-					left++;
-				else {
-					right--;
-					tmp = names[left];
-					names[left] = names[right];
-					names[right] = tmp;
-				}
-			}
-			left--;
-			tmp = names[left];
-			names[left] = names[start];
-			names[start] = tmp;
-			sort(start, left);
-			start = right;
-		}
-	}
-
-	FileList(String caption, String path, FileList parent, Enumeration contents)
-	{
-		this.caption = caption;
-		this.path = path;
-		this.parent = parent;
-		Vector v = new Vector();
-		int start = 0;
-		if (parent != null) {
-			v.addElement("..");
-			start = 1;
-		}
-		while (contents.hasMoreElements()) {
-			String name = (String) contents.nextElement();
-			if (name.endsWith("/") || ASAPInfo.isOurFile(name))
-				v.addElement(name);
-		}
-		int n = v.size();
-		names = new String[n];
-		sublists = new FileList[n];
-		for (int i = 0; i < n; i++)
-			names[i] = (String) v.elementAt(i);
-		sort(start, n);
-	}
-}
-
-class ASAPInputStream extends InputStream
-{
-	private final ASAP asap;
-	private final ASAPMIDlet midlet;
-	private final byte[] buffer = new byte[16384];
-	private int bufferLen;
-	private int bufferOffset = 0;
-
-	private static final int FORMAT = ASAPSampleFormat.U8;
-
-	ASAPInputStream(ASAP asap, ASAPMIDlet midlet)
-	{
-		this.asap = asap;
-		this.midlet = midlet;
-		this.bufferLen = asap.getWavHeader(buffer, FORMAT, false);
-	}
-
-	public int read()
-	{
-		int i = bufferOffset;
-		if (i >= bufferLen) {
-			bufferLen = asap.generate(buffer, buffer.length, FORMAT);
-			if (bufferLen == 0)
-				return -1;
-			midlet.updatePosition();
-			i = 0;
-		}
-		bufferOffset = i + 1;
-		return buffer[i] & 0xff;
-	}
-
-	public int read(byte[] b, int off, int len)
-	{
-		int i = bufferOffset;
-		if (i >= bufferLen) {
-			bufferLen = asap.generate(buffer, buffer.length, FORMAT);
-			if (bufferLen == 0)
-				return -1;
-			midlet.updatePosition();
-			i = 0;
-		}
-		if (len > bufferLen - i)
-			len = bufferLen - i;
-		System.arraycopy(buffer, i, b, off, len);
-		bufferOffset = i + len;
-		return len;
-	}
-}
-
-public class ASAPMIDlet extends MIDlet implements CommandListener, PlayerListener
-{
-	private Command selectCommand;
-	private Command backCommand;
-	private Command stopCommand;
-	private Command exitCommand;
-	private FileList fileList;
-	private List fileListControl;
-	private byte[] module;
-	private ASAP asap;
-	private Player player;
-	private List songListControl;
-	private Gauge gauge;
-
-	private void displayFileList(FileList fileList)
-	{
-		this.fileList = fileList;
-		this.fileListControl = new List(fileList.caption, List.IMPLICIT, fileList.names, null);
-		fileListControl.addCommand(selectCommand);
-		fileListControl.addCommand(exitCommand);
-		fileListControl.setCommandListener(this);
-		Display.getDisplay(this).setCurrent(fileListControl);
-	}
-
-	private void displayError(String message)
-	{
-		Alert alert = new Alert("Error", message, null, AlertType.ERROR);
-		Display.getDisplay(this).setCurrent(alert);
-	}
-
-	private static void appendStringItem(Form form, String label, String text)
-	{
-		if (text.length() == 0)
-			return;
-		StringItem si = new StringItem(label, text);
-		si.setLayout(StringItem.LAYOUT_NEWLINE_AFTER);
-		form.append(si);
-	}
-
-	public void updatePosition()
-	{
-		gauge.setValue(asap.getPosition());
-	}
-
-	private static void setTwoDigits(char[] chars, int offset, int value)
-	{
-		chars[offset] = (char) ('0' + value / 10);
-		chars[offset + 1] = (char) ('0' + value % 10);
-	}
-
-	private static String durationToString(int duration)
-	{
-		if (duration < 0 || duration >= 100 * 60 * 1000)
-			return "";
-		char[] chars = new char[5];
-		int seconds = duration / 1000;
-		setTwoDigits(chars, 0, seconds / 60);
-		chars[2] = ':';
-		setTwoDigits(chars, 3, seconds % 60);
-		return new String(chars);
-	}
-
-	private void playSong(int song) throws Exception
-	{
-		ASAPInfo info = asap.getInfo();
-		int duration = info.getDuration(song);
-
-		gauge = new Gauge(null, false, 1, 0);
-		Form playForm = new Form("ASAP " + ASAPInfo.VERSION);
-		appendStringItem(playForm, "Name: ", info.getTitleOrFilename());
-		appendStringItem(playForm, "Author: ", info.getAuthor());
-		appendStringItem(playForm, "Date: ", info.getDate());
-		appendStringItem(playForm, "Time: ", durationToString(duration));
-		playForm.append(gauge);
-		playForm.addCommand(stopCommand);
-		playForm.addCommand(exitCommand);
-		playForm.setCommandListener(this);
-		Display.getDisplay(this).setCurrent(playForm);
-
-		if (duration < 0)
-			duration = 180000;
-		gauge.setMaxValue(duration);
-		asap.playSong(song, duration);
-		InputStream is = new ASAPInputStream(asap, this);
-		player = Manager.createPlayer(is, "audio/x-wav");
-		player.addPlayerListener(this);
-		player.start();
-	}
-
-	public void startApp()
-	{
-		selectCommand = new Command("Select", Command.ITEM, 1);
-		backCommand = new Command("Back", Command.BACK, 1);
-		stopCommand = new Command("Stop", Command.STOP, 1);
-		exitCommand = new Command("Exit", Command.EXIT, 2);
-		module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
-		asap = new ASAP();
-		displayFileList(new FileList("Select File", "", null, FileSystemRegistry.listRoots()));
-	}
-
-	/**
-	 * Reads bytes from the stream into the byte array
-	 * until end of stream or array is full.
-	 * @param is source stream
-	 * @param b output array
-	 * @return number of bytes read
-	 */
-	private static int readAndClose(InputStream is, byte[] b) throws IOException
-	{
-		int got = 0;
-		int len = b.length;
-		try {
-			while (got < len) {
-				int i = is.read(b, got, len - got);
-				if (i <= 0)
-					break;
-				got += i;
-			}
-		}
-		finally {
-			is.close();
-		}
-		return got;
-	}
-
-	public void commandAction(Command c, Displayable s)
-	{
-		if (c == selectCommand || c == List.SELECT_COMMAND) {
-			try {
-				if (songListControl != null) {
-					playSong(songListControl.getSelectedIndex());
-					songListControl = null;
-					return;
-				}
-				int index = fileListControl.getSelectedIndex();
-				String filename = fileList.names[index];
-				if (filename.equals("..")) {
-					displayFileList(fileList.parent);
-					return;
-				}
-				FileList newList = fileList.sublists[index];
-				if (newList != null) {
-					displayFileList(newList);
-					return;
-				}
-				String path = fileList.path + filename;
-				FileConnection fc = (FileConnection) Connector.open("file:///" + path, Connector.READ);
-				if (fc.isDirectory()) {
-					newList = new FileList(filename, path, fileList, fc.list());
-					fileList.sublists[index] = newList;
-					displayFileList(newList);
-					return;
-				}
-				InputStream is = fc.openInputStream();
-				int moduleLen = readAndClose(is, module);
-				asap.load(filename, module, moduleLen);
-				ASAPInfo info = asap.getInfo();
-				int songs = info.getSongs();
-				if (songs > 1) {
-					songListControl = new List(info.getTitleOrFilename(), List.IMPLICIT);
-					for (int i = 1; i <= songs; i++)
-						songListControl.append("Song " + i, null);
-					songListControl.setSelectedIndex(info.getDefaultSong(), true);
-					songListControl.addCommand(selectCommand);
-					songListControl.addCommand(backCommand);
-					songListControl.setCommandListener(this);
-					Display.getDisplay(this).setCurrent(songListControl);
-				}
-				else
-					playSong(0);
-			} catch (Exception ex) {
-				displayError(ex.toString());
-			}
-		}
-		else if (c == backCommand) {
-			songListControl = null;
-			Display.getDisplay(this).setCurrent(fileListControl);
-		}
-		else if (c == stopCommand) {
-			try {
-				player.stop();
-			} catch (MediaException ex) {
-			}
-			Display.getDisplay(this).setCurrent(fileListControl);
-		}
-		else if (c == exitCommand)
-			notifyDestroyed();
-	}
-
-	public void playerUpdate(Player player, String event, Object eventData)
-	{
-		if (event == PlayerListener.END_OF_MEDIA)
-			Display.getDisplay(this).setCurrent(fileListControl);
-		else if (event == PlayerListener.ERROR)
-			displayError((String) eventData);
-	}
-
-	public void pauseApp()
-	{
-	}
-
-	public void destroyApp(boolean unconditional)
-	{
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/j2me/j2me.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/j2me/j2me.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/j2me/j2me.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/j2me/j2me.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-WTK = C:/bin/Java_ME_platform_SDK_3.2
-ME_CLASSES = $(WTK)/lib/cldc_1.1.jar;$(WTK)/lib/midp_2.0.jar;$(WTK)/lib/jsr75_1.0.jar
-PREVERIFY = $(DO)"$(WTK)/bin/preverify"
-ME_EMU = "$(WTK)/bin/emulator"
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "j2me.mk")
-endif
-
-midlet-emu: java/j2me/asap_midlet.jad
-	$(ME_EMU) -Xdescriptor:$<
-
-java/j2me/asap_midlet.jad: $(srcdir)java/j2me/MANIFEST.MF java/j2me/asap_midlet.jar
-	$(DO)(echo MIDlet-Jar-URL: asap_midlet.jar && echo MIDlet-Jar-Size: `stat -c %s java/j2me/asap_midlet.jar` && cat $<) > $@
-CLEAN += java/j2me/asap_midlet.jad
-
-java/j2me/asap_midlet.jar: $(srcdir)java/j2me/MANIFEST.MF java/j2me/preverified/ASAPMIDlet.class $(JAVA_OBX)
-	$(JAR) cfm $@ $< -C java/j2me/preverified . $(ASM6502_PLAYERS:%=-C java/obx net/sf/asap/%.obx)
-CLEAN += java/j2me/asap_midlet.jar
-
-java/j2me/preverified/ASAPMIDlet.class: java/classes/ASAPMIDlet.class
-	$(PREVERIFY) -classpath "$(ME_CLASSES);java/classes" -d $(@D) ASAPMIDlet FileList ASAPInputStream net.sf.asap.ASAP net.sf.asap.ASAP6502 net.sf.asap.ASAPInfo net.sf.asap.ASAPModuleType net.sf.asap.ASAPSampleFormat net.sf.asap.Cpu6502 net.sf.asap.NmiStatus net.sf.asap.Pokey net.sf.asap.PokeyPair
-CLEANDIR += java/j2me/preverified
-
-java/classes/ASAPMIDlet.class: $(srcdir)java/j2me/ASAPMIDlet.java java/classes/net/sf/asap/ASAP.class
-	$(JAVAC) -d $(@D) -source 1.2 -bootclasspath "$(ME_CLASSES)" -classpath java/classes $<
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/j2me/MANIFEST.MF kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/j2me/MANIFEST.MF
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/j2me/MANIFEST.MF	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/j2me/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-MIDlet-1: ASAP, , ASAPMIDlet
-MIDlet-Name: ASAP
-MIDlet-Vendor: Piotr Fusik
-MIDlet-Version: 3.1.5
-MicroEdition-Configuration: CLDC-1.1
-MicroEdition-Profile: MIDP-2.0
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/java.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/java.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/java.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/java.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-JRE = C:/Program Files/Java/jre7
-JAVAC = $(DO)javac
-JAR = $(DO)jar
-JAVADOC = $(DO)javadoc
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "java.mk")
-endif
-
-JAVA_OBX = $(ASM6502_PLAYERS:%=java/obx/net/sf/asap/%.obx)
-JAR_COMMON = -C java/classes net $(ASM6502_PLAYERS:%=-C java/obx net/sf/asap/%.obx)
-
-java/asap2wav.jar: $(srcdir)java/asap2wav.MF java/classes/ASAP2WAV.class $(JAVA_OBX)
-	$(JAR) cfm $@ $< -C java/classes ASAP2WAV.class $(JAR_COMMON)
-CLEAN += java/asap2wav.jar
-
-java/classes/ASAP2WAV.class: $(srcdir)java/ASAP2WAV.java java/classes/net/sf/asap/ASAP.class
-	$(JAVAC) -d $(@D) -source 1.2 -classpath java/classes $<
-
-java/asap_applet.jar: java/classes/ASAPApplet.class $(JAVA_OBX)
-	$(JAR) cf $@ -C java/classes ASAPApplet.class $(JAR_COMMON)
-CLEAN += java/asap_applet.jar
-
-java/classes/ASAPApplet.class: $(srcdir)java/ASAPApplet.java java/classes/net/sf/asap/ASAP.class
-	$(JAVAC) -d $(@D) -source 1.2 -classpath "$(JRE)/lib/plugin.jar;java/classes" $<
-
-java/asap.jar: java/classes/net/sf/asap/ASAP.class $(JAVA_OBX)
-	$(JAR) cf $@ $(JAR_COMMON)
-CLEAN += java/asap.jar
-
-java/obx/net/sf/asap/%.obx: 6502/%.obx
-	$(COPY)
-CLEAN += $(JAVA_OBX)
-
-java/classes/net/sf/asap/ASAP.class: $(srcdir)java/ASAPMusicRoutine.java java/src/net/sf/asap/ASAP.java
-	$(JAVAC) -d java/classes -source 1.2 $(srcdir)java/ASAPMusicRoutine.java java/src/net/sf/asap/*.java
-CLEANDIR += java/classes
-
-java/src/net/sf/asap/ASAP.java: $(call src,asap.ci asap6502.ci asapinfo.ci asapwriter.ci cpu6502.ci pokey.ci) $(ASM6502_OBX)
-	$(CITO) -n net.sf.asap
-CLEANDIR += java/src
-
-java/doc: java/src/net/sf/asap/ASAP.java $(srcdir)java/ASAPMusicRoutine.java
-	$(JAVADOC) -d $@ java/src/net/sf/asap/*.java $(srcdir)java/ASAPMusicRoutine.java
-CLEANDIR += java/doc
-
-include $(srcdir)java/android/android.mk
-include $(srcdir)java/j2me/j2me.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/USAGE kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/USAGE
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/java/USAGE	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/java/USAGE	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-How to use
-----------
-
-ASAP2WAV
-~~~~~~~~
-
-Enter the following command line to see the syntax:
-
----------------------------------------------------------------------------
-java -jar asap2wav.jar
----------------------------------------------------------------------------
-
-Unless you specify the `-o`/`--output` option, the output filename will be
-constructed from the input filename with the extension changed to `wav`.
-
-
-Java midlet
-~~~~~~~~~~~
-
-Midlet is an application for mobile phones.
-The ASAP midlet requires CLDC 1.1 and MIDP 2.0
-and thus will not work on very old Java implementations.
-The midlet has a file browser for selecting music files,
-which should be stored in phone memory or on a memory card.
-J2ME platforms usually start playback after the music is completely rendered.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/AIRASAP-app.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/AIRASAP-app.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/AIRASAP-app.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/AIRASAP-app.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-<application xmlns="http://ns.adobe.com/air/application/1.5">
-	<id>net.sf.asap.AIRASAP</id>
-	<version>3.1.5</version>
-	<filename>AIRASAP</filename>
-	<initialWindow>
-		<content>airasap.html</content>
-		<visible>true</visible>
-		<maximizable>false</maximizable>
-		<width>300</width>
-		<height>180</height>
-	</initialWindow>
-	<icon>
-		<image16x16>asap16x16.png</image16x16>
-		<image32x32>asap32x32.png</image32x32>
-	</icon>
-	<fileTypes>
-		<fileType>
-			<name>sap.file</name>
-			<extension>sap</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-sap</contentType>
-		</fileType>
-		<fileType>
-			<name>cmc.file</name>
-			<extension>cmc</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-cmc</contentType>
-		</fileType>
-		<fileType>
-			<name>cm3.file</name>
-			<extension>cm3</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-cm3</contentType>
-		</fileType>
-		<fileType>
-			<name>cmr.file</name>
-			<extension>cmr</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-cmr</contentType>
-		</fileType>
-		<fileType>
-			<name>cms.file</name>
-			<extension>cms</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-cms</contentType>
-		</fileType>
-		<fileType>
-			<name>dmc.file</name>
-			<extension>dmc</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-dmc</contentType>
-		</fileType>
-		<fileType>
-			<name>dlt.file</name>
-			<extension>dlt</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-dlt</contentType>
-		</fileType>
-		<fileType>
-			<name>mpt.file</name>
-			<extension>mpt</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-mpt</contentType>
-		</fileType>
-		<fileType>
-			<name>mpd.file</name>
-			<extension>mpd</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-mpd</contentType>
-		</fileType>
-		<fileType>
-			<name>rmt.file</name>
-			<extension>rmt</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-rmt</contentType>
-		</fileType>
-		<fileType>
-			<name>tmc.file</name>
-			<extension>tmc</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-tmc</contentType>
-		</fileType>
-		<fileType>
-			<name>tm8.file</name>
-			<extension>tm8</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-tm8</contentType>
-		</fileType>
-		<fileType>
-			<name>tm2.file</name>
-			<extension>tm2</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-tm2</contentType>
-		</fileType>
-		<fileType>
-			<name>fc.file</name>
-			<extension>fc</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>audio/x-fc</contentType>
-		</fileType>
-	</fileTypes>
-</application>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/airasap.html kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/airasap.html
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/airasap.html	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/airasap.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<html>
-<head>
-	<title>AIRASAP</title>
-	<script type="text/javascript" src="asap.js"></script>
-	<script type="text/javascript" src="airasap.js"></script>
-</head>
-<body style="text-align: center;">
-	<div id="name" style="font-size: large;"></div>
-	<div id="author"></div>
-	<div id="date" style="font-size: small;"></div>
-	<div id="song_panel" style="font-size: small; display: none;">
-		<input type="button" onclick="prevSong()" value="&lt;" />
-		Song <span id="song"></span> of <span id="songs"></span>
-		<input type="button" onclick="nextSong()" value="&gt;" />
-	</div>
-	<div>
-		<input type="button" onclick="selectFile()" value="Open" />
-		<input type="button" onclick="stop()" value="Stop" />
-	</div>
-</body>
-</html>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/airasap.js kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/airasap.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/airasap.js	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/airasap.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/*
- * airasap.js - ASAP for Adobe AIR
- *
- * Copyright (C) 2010-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-var air = {
-	ByteArray : window.runtime.flash.utils.ByteArray,
-	Event : window.runtime.flash.events.Event,
-	File : window.runtime.flash.filesystem.File,
-	FileFilter : window.runtime.flash.net.FileFilter,
-	FileMode : window.runtime.flash.filesystem.FileMode,
-	FileStream : window.runtime.flash.filesystem.FileStream,
-	InvokeEvent : window.runtime.flash.events.InvokeEvent,
-	NativeApplication : window.runtime.flash.desktop.NativeApplication,
-	SampleDataEvent : window.runtime.flash.events.SampleDataEvent,
-	Sound : window.runtime.flash.media.Sound
-};
-
-var asap = new ASAP();
-var info;
-var soundChannel;
-var song;
-
-function stop()
-{
-	if (soundChannel != null) {
-		soundChannel.stop();
-		soundChannel = null;
-	}
-}
-
-function showTag(id, value)
-{
-	document.getElementById(id).innerText = value;
-}
-
-function generate(event)
-{
-	if (asap.generate(event.data, 8192, 0) < 8192)
-		soundChannel = null;
-}
-
-function playSong(i)
-{
-	song = i;
-	showTag("song", i + 1);
-	var duration = info.getLoop(i) ? -1 : info.getDuration(i);
-	asap.playSong(i, duration);
-	if (soundChannel == null) {
-		var sound = new air.Sound();
-		sound.addEventListener(air.SampleDataEvent.SAMPLE_DATA, generate);
-		soundChannel = sound.play();
-	}
-}
-
-function prevSong()
-{
-	if (song > 0)
-		playSong(song - 1);
-}
-
-function nextSong()
-{
-	if (song + 1 < info.getSongs())
-		playSong(song + 1);
-}
-
-function displaySongPanel(display)
-{
-	document.getElementById("song_panel").style.display = display;
-}
-
-function playFile(file)
-{
-	var s = new air.FileStream();
-	s.open(file, air.FileMode.READ);
-	var module = new air.ByteArray();
-	s.readBytes(module);
-	s.close();
-	stop();
-	try {
-		asap.load(file.nativePath, module, module.length);
-		info = asap.getInfo();
-	} catch (ex) {
-		displaySongPanel("none");
-		alert(ex);
-		return;
-	}
-	showTag("name", info.getTitleOrFilename());
-	showTag("author", info.getAuthor());
-	showTag("date", info.getDate());
-	if (info.getSongs() > 1) {
-		showTag("songs", info.getSongs());
-		displaySongPanel("block");
-	}
-	else
-		displaySongPanel("none");
-	playSong(info.getDefaultSong());
-}
-
-function onFileSelect(event)
-{
-	playFile(event.target);
-}
-
-function selectFile()
-{
-	var selector = new air.File();
-	selector.addEventListener(air.Event.SELECT, onFileSelect);
-	selector.browseForOpen("Select Atari 8-bit music", [
-		new air.FileFilter("All supported", "*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc"),
-		new air.FileFilter("Slight Atari Player (*.sap)", "*.sap"),
-		new air.FileFilter("Chaos Music Composer (*.cmc;*.cm3;*.cmr;*.cms;*.dmc)", "*.cmc;*.cm3;*.cmr;*.cms;*.dmc"),
-		new air.FileFilter("Delta Music Composer (*.dlt)", "*.dlt"),
-		new air.FileFilter("Music ProTracker (*.mpt;*.mpd)", "*.mpt;*.mpd"),
-		new air.FileFilter("Raster Music Tracker (*.rmt)", "*.rmt"),
-		new air.FileFilter("Theta Music Composer 1.x (*.tmc;*.tm8)", "*.tmc;*.tm8"),
-		new air.FileFilter("Theta Music Composer 2.x (*.tm2)", "*.tm2"),
-		new air.FileFilter("Future Composer (*.fc)", "*.fc")
-	]);
-}
-
-function onInvoke(event)
-{
-	if (event.arguments.length == 1)
-		playFile(new air.File(event.arguments[0]));
-}
-
-air.NativeApplication.nativeApplication.addEventListener(air.InvokeEvent.INVOKE, onInvoke);
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/air.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/air.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/air.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/air.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-ADL = adl.exe $<
-ADT = $(DO)adt.bat -package -storetype pkcs12 -keystore $(srcdir)javascript/air/pfusik-air.pfx -storepass walsie -tsa none $@
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "air.mk")
-endif
-
-run-air: $(srcdir)javascript/air/AIRASAP-app.xml javascript/air/asap.js
-	$(ADL)
-.PHONY: run-air
-
-release/asap-$(VERSION)-air.air: $(addprefix $(srcdir)javascript/air/,AIRASAP-app.xml airasap.html airasap.js asap16x16.png asap32x32.png) javascript/air/asap.js
-	$(ADT) $< -C $(srcdir)javascript/air airasap.html airasap.js asap16x16.png asap32x32.png -C javascript/air asap.js
-
-javascript/air/asap.js: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-	$(CITO) -D FLASH
-CLEAN += javascript/air/asap.js
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/asap16x16.png and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/asap16x16.png differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/asap32x32.png and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/asap32x32.png differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/fileTypes.pl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/fileTypes.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/air/fileTypes.pl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/air/fileTypes.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-for (qw(sap cmc cm3 cmr cms dmc dlt mpt mpd rmt tmc tm8 tm2 fc)) {
-	print qq{		<fileType>
-			<name>$_.file</name>
-			<extension>$_</extension>
-			<description>Atari 8-bit music</description>
-			<contentType>application/x-$_</contentType>
-		</fileType>
-};
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/asap2wav1.js kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/asap2wav1.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/asap2wav1.js	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/asap2wav1.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,380 +0,0 @@
-/*
- * asap2wav1.js - converter of ASAP-supported formats to WAV files
- *
- * Copyright (C) 2009-2011 Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-var usage;
-
-/*@cc_on
-@if (@_jscript_version >= 7)
-	// JScript .NET
-
-	import System;
-	import System.IO;
-
-	var arguments = new Array(Environment.GetCommandLineArgs());
-	usage = arguments.shift() + " [OPTIONS] INPUTFILE...";
-
-	function quit(code)
-	{
-		Environment.Exit(code);
-	}
-
-	function readBinaryFile(filename)
-	{
-		return File.ReadAllBytes(filename);
-	}
-
-	class BinaryFileOutput
-	{
-		var stream;
-
-		function BinaryFileOutput(filename)
-		{
-			this.stream = File.Create(filename);
-		}
-
-		function write(bytes, len)
-		{
-			this.stream.Write(bytes, 0, len);
-		}
-
-		function close()
-		{
-			this.stream.Close();
-		}
-	}
-@else @*/
-if (typeof(WScript) == "object") {
-	// WScript
-
-	var arguments = new Array();
-	for (var i = 0; i < WScript.Arguments.length; i++)
-		arguments[i] = WScript.Arguments(i);
-	usage = "cscript asap2wav.js [OPTIONS] INPUTFILE...";
-
-	var print = function(s)
-	{
-		WScript.Echo(s);
-	}
-
-	var quit = function(code)
-	{
-		WScript.Quit(code);
-	}
-
-	var BinaryFile_cp437ToUnicode = [
-		199, 252, 233, 226, 228, 224, 229, 231, 234, 235, 232, 239, 238, 236, 196, 197,
-		201, 230, 198, 244, 246, 242, 251, 249, 255, 214, 220, 162, 163, 165, 8359, 402,
-		225, 237, 243, 250, 241, 209, 170, 186, 191, 8976, 172, 189, 188, 161, 171, 187,
-		9617, 9618, 9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564, 9563, 9488,
-		9492, 9524, 9516, 9500, 9472, 9532, 9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552, 9580, 9575,
-		9576, 9572, 9573, 9561, 9560, 9554, 9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612, 9616, 9600,
-		945, 223, 915, 960, 931, 963, 181, 964, 934, 920, 937, 948, 8734, 966, 949, 8745,
-		8801, 177, 8805, 8804, 8992, 8993, 247, 8776, 176, 8729, 183, 8730, 8319, 178, 9632, 160
-	];
-
-	var BinaryFile_unicodeToCp437 = new Array(9633);
-	for (var c = 0; c < 128; c++) {
-		BinaryFile_unicodeToCp437[c] = c;
-		BinaryFile_unicodeToCp437[BinaryFile_cp437ToUnicode[c]] = 128 + c;
-	}
-
-	var createStream = function()
-	{
-		var stream = WScript.CreateObject("ADODB.Stream");
-		stream.Type = 2;
-		stream.CharSet = '437';
-		stream.Open();
-		return stream;
-	}
-
-	var readBinaryFile = function(filename)
-	{
-		var stream = createStream();
-		stream.LoadFromFile(filename);
-		var unicode = stream.ReadText();
-		stream.Close();
-		var bytes = new Array(unicode.length);
-		for (var i = 0; i < unicode.length; i++) {
-			var c = unicode.charCodeAt(i);
-			bytes[i] = BinaryFile_unicodeToCp437[c];
-		}
-		return bytes;
-	}
-
-	var BinaryFileOutput = function(filename)
-	{
-		this.filename = filename;
-		this.stream = createStream();
-
-		this.write = function(bytes, len)
-		{
-			for (var i = 0; i < len; i++) {
-				var c = bytes[i];
-				if (c >= 128)
-					c = BinaryFile_cp437ToUnicode[c - 128];
-				this.stream.WriteText(String.fromCharCode(c));
-			}
-		}
-
-		this.close = function()
-		{
-			this.stream.SaveToFile(filename, 2);
-			this.stream.Close();
-		}
-	}
-}
-else if (typeof(java) == "object") {
-	// Rhino
-
-	usage = "java -jar js.jar -opt -1 asap2wav.js [OPTIONS] INPUTFILE...";
-
-	var readBinaryFile = function(filename)
-	{
-		var stream = new java.io.FileInputStream(filename);
-		var bytes = new Array();
-		for (;;) {
-			var c = stream.read();
-			if (c < 0)
-				break;
-			bytes.push(c);
-		}
-		return bytes;
-	}
-
-	var BinaryFileOutput = function(filename)
-	{
-		this.stream = new java.io.BufferedOutputStream(new java.io.FileOutputStream(filename));
-
-		this.write = function(bytes, len)
-		{
-			for (var i = 0; i < len; i++)
-				this.stream.write(bytes[i]);
-		}
-
-		this.close = function()
-		{
-			this.stream.close();
-		}
-	}
-}
-else {
-	// DMDScript, JaegerMonkey or d8
-
-	if (typeof(readline) == "undefined") {
-		var readline = readln;
-		var write = print;
-		var args = getenv("ARGS");
-		arguments = args == null ? [] : args.split(" ");
-		usage = "\nset ARGS=[OPTIONS] INPUTFILE\nbase64 INPUTFILE | ds asap2wav.js | base64 -d > OUTFILE";
-	}
-	else if (typeof(write) == "undefined") {
-		var write = putstr;
-		usage = "base64 INPUTFILE | js asap2wav.js [OPTIONS] INPUTFILE | base64 -d > OUTFILE";
-	}
-	else
-		usage = "base64 INPUTFILE | d8 asap2wav.js -- [OPTIONS] INPUTFILE | base64 -d > OUTFILE";
-
-	var base64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-	var readBinaryFile = function(filename)
-	{
-		var bytes = new Array();
-		var prev;
-		var gotBits = 0;
-		for (;;) {
-			var line = readline();
-			if (line == null || line.length == 0)
-				break;
-			for (var i = 0; i < line.length; i++) {
-				var v = base64chars.indexOf(line.charAt(i));
-				if (v >= 0) {
-					gotBits = (gotBits + 6) & 6;
-					if (gotBits != 6)
-						bytes.push((prev << 6 | v) >> gotBits & 0xff);
-					prev = v;
-				}
-			}
-		}
-		return bytes;
-	}
-
-	var BinaryFileOutput = function(filename)
-	{
-		this.prev = 0;
-		this.gotBits = 0;
-
-		this.write = function(bytes, len)
-		{
-			for (var i = 0; i < len; i++) {
-				this.gotBits += 2;
-				var v = this.prev << 8 | bytes[i];
-				write(base64chars.charAt(v >> this.gotBits & 63));
-				if (this.gotBits == 6) {
-					write(base64chars.charAt(v & 63));
-					this.gotBits = 0;
-				}
-				this.prev = bytes[i];
-			}
-		}
-
-		this.close = function()
-		{
-			if (this.gotBits == 2) {
-				write(base64chars.charAt((this.prev & 3) << 4));
-				write("==");
-			}
-			else if (this.gotBits == 4) {
-				write(base64chars.charAt((this.prev & 15) << 2));
-				write("=");
-			}
-		}
-	}
-}
-/*@end @*/
-
-var outputFilename = null;
-var outputHeader = true;
-var song = -1;
-var format = ASAPSampleFormat.S16_L_E;
-var duration = -1;
-var muteMask = 0;
-
-function printHelp()
-{
-	print(
-		"Usage: " + usage + "\n" +
-		"Each INPUTFILE must be in a supported format:\n" +
-		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
-		"Options:\n" +
-		"-o FILE     --output=FILE      Set output file name\n" +
-		"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
-		"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
-		"-b          --byte-samples     Output 8-bit samples\n" +
-		"-w          --word-samples     Output 16-bit samples (default)\n" +
-		"            --raw              Output raw audio (no WAV header)\n" +
-		"-m CHANNELS --mute=CHANNELS    Mute POKEY channels (1-8)\n" +
-		"-h          --help             Display this information\n" +
-		"-v          --version          Display version information"
-	);
-}
-
-function setSong(s)
-{
-	song = parseInt(s, 10);
-}
-
-function setTime(s)
-{
-	duration = ASAP.parseDuration(s);
-}
-
-function setMuteMask(s)
-{
-	muteMask = 0;
-	for (var i = 0; i < s.length; i++) {
-		var ch = s.charCodeAt(i) - 49;
-		if (ch >= 0 && ch < 8)
-			muteMask |= 1 << ch;
-	}
-}
-
-function processFile(inputFilename)
-{
-	var module = readBinaryFile(inputFilename);
-	var asap = new ASAP();
-	asap.load(inputFilename, module, module.length);
-	var info = asap.getInfo();
-	if (song < 0)
-		song = info.getDefaultSong();
-	if (duration < 0) {
-		duration = info.getDuration(song);
-		if (duration < 0)
-			duration = 180 * 1000;
-	}
-	asap.playSong(song, duration);
-	asap.mutePokeyChannels(muteMask);
-	if (outputFilename == null) {
-		var i = inputFilename.lastIndexOf(".");
-		outputFilename = inputFilename.substring(0, i + 1) + (outputHeader ? "wav" : "raw");
-	}
-	var of = new BinaryFileOutput(outputFilename);
-	var buffer = new Array(8192);
-	var nBytes;
-	if (outputHeader) {
-		nBytes = asap.getWavHeader(buffer, format, false);
-		of.write(buffer, nBytes);
-	}
-	do {
-		nBytes = asap.generate(buffer, 8192, format);
-		of.write(buffer, nBytes);
-	} while (nBytes == 8192);
-	of.close();
-	outputFilename = null;
-	song = -1;
-	duration = -1;
-}
-
-var noInputFiles = true;
-for (var i = 0; i < arguments.length; i++) {
-	var arg = arguments[i];
-	if (arg.charAt(0) != "-") {
-		processFile(arg);
-		noInputFiles = false;
-	}
-	else if (arg == "-o")
-		outputFilename = arguments(++i);
-	else if (arg.substring(0, 9) == "--output=")
-		outputFilename = arg.substring(9, arg.length);
-	else if (arg == "-s")
-		setSong(arguments(++i));
-	else if (arg.substring(0, 7) == "--song=")
-		setSong(arg.substring(7, arg.length));
-	else if (arg == "-t")
-		setTime(arguments(++i));
-	else if (arg.substring(0, 7) ==  "--time=")
-		setTime(arg.substring(7, arg.length));
-	else if (arg == "-b" || arg == "--byte-samples")
-		format = ASAPSampleFormat.U8;
-	else if (arg == "-w" || arg == "--word-samples")
-		format = ASAPSampleFormat.S16_L_E;
-	else if (arg == "--raw")
-		outputHeader = false;
-	else if (arg == "-m")
-		setMuteMask(arguments(++i));
-	else if (arg.substring(0, 7) == "--mute=")
-		setMuteMask(arg.substring(7, arg.length));
-	else if (arg == "-h" || arg == "--help") {
-		printHelp();
-		noInputFiles = false;
-	}
-	else if (arg == "-v" || arg == "--version") {
-		print("ASAP2WAV (JavaScript) " + ASAPInfo.VERSION);
-		noInputFiles = false;
-	}
-	else
-		throw "unknown option: " + arg;
-}
-if (noInputFiles) {
-	printHelp();
-	quit(1);
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/asapweb.js kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/asapweb.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/asapweb.js	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/asapweb.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * asapweb.js - pure JavaScript ASAP for web browsers
- *
- * Copyright (C) 2009-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-var asap = {
-	timerId : null,
-	onLoad : new Function(),
-	onPlaybackEnd : new Function(),
-	stop : function()
-	{
-		if (window.asap.timerId) {
-			clearInterval(window.asap.timerId);
-			window.asap.timerId = null;
-		}
-	},
-	play : function(filename, module, song)
-	{
-		var asap = new ASAP();
-		asap.load(filename, module, module.length);
-		var info = asap.getInfo();
-		if (song == null)
-			song = info.getDefaultSong();
-		asap.playSong(song, info.getDuration(song));
-
-		var buffer = new Array(8192);
-
-		function audioCallback(samplesRequested)
-		{
-			buffer.length = asap.generate(buffer, samplesRequested, ASAPSampleFormat.U8);
-			for (var i = 0; i < buffer.length; i++)
-				buffer[i] = (buffer[i] - 128) / 128;
-			if (buffer.length == 0) {
-				window.asap.stop();
-				window.asap.onPlaybackEnd();
-			}
-			return buffer;
-		}
-		function failureCallback()
-		{
-			alert("Your browser doesn't support JavaScript audio");
-		}
-		var audio = new XAudioServer(info.getChannels(), ASAP.SAMPLE_RATE, 8192, 16384, audioCallback, 1, failureCallback);
-		function heartbeat()
-		{
-			audio.executeCallback();
-		}
-
-		window.asap.stop();
-		window.asap.author = info.getAuthor();
-		window.asap.title = info.getTitle();
-		window.asap.date = info.getDate();
-		window.asap.onLoad();
-		window.asap.timerId = setInterval(heartbeat, 50);
-	}
-};
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/binaryHttpRequest.js kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/binaryHttpRequest.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/binaryHttpRequest.js	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/binaryHttpRequest.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * binaryHttpRequest.js - download binary file from JavaScript
- *
- * Copyright (C) 2009-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-var binaryHttpRequestIEHack = false;
-
-if (/msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent)) {
-	document.write('<script type="text/vbscript">\n\
-		Function fromVBArray(vbArray)\n\
-			Dim i\n\
-			ReDim jsArray(LenB(vbArray) - 1)\n\
-			For i = 1 To LenB(vbArray)\n\
-				jsArray(i - 1) = AscB(MidB(vbArray, i, 1))\n\
-			Next\n\
-			fromVBArray = jsArray\n\
-		End Function\n\
-	</script>');
-	binaryHttpRequestIEHack = true;
-}
-
-function binaryHttpRequest(url, onload)
-{
-	var req;
-	if (window.XMLHttpRequest)
-		req = new XMLHttpRequest(); // Chrome/Mozilla/Safari/IE7+
-	else
-		req = new ActiveXObject("Microsoft.XMLHTTP"); // IE6
-	req.open("GET", url, true);
-	if (req.overrideMimeType)
-		req.overrideMimeType("text/plain; charset=x-user-defined");
-	else
-		req.setRequestHeader("Accept-Charset", "x-user-defined");
-	req.onreadystatechange = function() {
-		if (req.readyState == 4 && (req.status == 200 || req.status == 0)) {
-			var result;
-			if (binaryHttpRequestIEHack)
-				result = fromVBArray(req.responseBody).toArray();
-			else {
-				var response = req.responseText;
-				result = new Array(response.length);
-				for (var i = 0; i < response.length; i++)
-					result[i] = response.charCodeAt(i) & 0xff;
-			}
-			onload(url, result);
-		}
-	};
-	req.send(null);
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/javascript.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/javascript.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/javascript.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/javascript.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-JSC = $(DO)jsc -nologo -w:2 -out:$@ $<
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "javascript.mk")
-endif
-
-javascript: javascript/asap2wav.js
-.PHONY: javascript
-
-javascript/asap2wav.exe: javascript/asap2wav.js
-	$(JSC)
-CLEAN += javascript/asap2wav.exe
-
-javascript/asap2wav.js: javascript/asap.js $(srcdir)javascript/asap2wav1.js
-	$(DO)cat $^ > $@
-CLEAN += javascript/asap2wav.js
-
-javascript/asap.js: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-	$(CITO)
-CLEAN += javascript/asap.js
-
-include $(srcdir)javascript/air/air.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/USAGE kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/USAGE
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/javascript/USAGE	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/javascript/USAGE	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-How to use
-----------
-
-Command-line ASAP2WAV
-~~~~~~~~~~~~~~~~~~~~~
-
-Enter the following command line to see the syntax:
-
-[horizontal]
-http://en.wikipedia.org/wiki/Windows_Script_Host[Windows Script Host]:: `cscript asap2wav.js`
-https://developer.mozilla.org/en/Rhino_Shell[Rhino Shell]:: `java -jar js.jar -opt 1 asap2wav.js`
-http://code.google.com/p/v8/[V8 Shell]:: `d8 asap2wav.js`
-http://en.wikipedia.org/wiki/JScript_.NET[JScript .NET]:: `asap2wav`
-http://en.wikipedia.org/wiki/JaegerMonkey[JaegerMonkey]:: `js asap2wav.js`
-http://www.digitalmars.com/dscript/[DMDScript]:: `ds asap2wav.js`
-
-Unless you specify the `-o`/`--output` option, the output filename will be
-constructed from the input filename with the extension changed to `wav`.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/Makefile kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/Makefile
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/Makefile	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-prefix := /usr/local
-srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
-bindir = $(prefix)/bin
-libdir = $(prefix)/lib$(shell test -d $(prefix)/lib64 -a `uname -i` = x86_64 && echo 64)
-CC = $(DO)gcc -s -O2 -Wall -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(filter %.c,$^)
-AR = $(DO)ar rc $@ $^
-#CITO = #$(DO)cito -o $@ $(patsubst %,-I %,$(sort $(dir $(filter-out %.ci,$^)))) $(filter %.ci,$^)
-INSTALL = install
-INSTALL_PROGRAM = mkdir -p $(DESTDIR)$(2) && $(INSTALL) $(1) $(DESTDIR)$(2)/$(or $(3),$(1))
-INSTALL_DATA = mkdir -p $(DESTDIR)$(2) && $(INSTALL) -m 644 $(1) $(DESTDIR)$(2)/$(1)
-ASCIIDOC = $(DO)asciidoc -o - $(1) $< | sed -e "s/527bbd;/c02020;/" | xmllint --valid --nonet -o $@ -
-SDL_CFLAGS = `sdl-config --cflags`
-SDL_LIBS = `sdl-config --libs`
-SEVENZIP = 7z a -mx=9 -bd
-MAKEZIP = $(DO)$(RM) $@ && $(SEVENZIP) -tzip $@ $(^:%=./%) # "./" makes 7z don't store paths in the archive
-COPY = $(DO)cp $< $@
-XASM = $(DO)xasm -q -o $@ $<
-
-# no user-configurable paths below this line
-
-MAKEFLAGS = -r
-ifdef V
-DO = mkdir -p $(dir $@) && 
-else
-DO = @echo $@ && mkdir -p $(dir $@) && 
-endif
-src = $(addprefix $(srcdir),$(1:.[ch]=.c) $(patsubst %.[ch],%.h,$(filter %.[ch],$(1))))
-INCLUDEOPTS = $(patsubst %/,-I%,$(sort $(dir $(filter %.h,$^))))
-CLEAN :=
-CLEANDIR :=
-
-all: asapconv libasap.a
-.PHONY: all
-
-install: install-asapconv install-lib
-.PHONY: install
-
-include $(srcdir)6502/6502.mk
-include $(srcdir)www/www.mk
-include $(srcdir)release/release.mk
-include $(srcdir)test/test.mk
-
-# asapconv
-
-asapconv: $(call src,asapconv.c asap.[ch])
-	$(CC)
-CLEAN += asapconv
-
-install-asapconv: asapconv
-	$(call INSTALL_PROGRAM,asapconv,$(bindir))
-.PHONY: install-asapconv
-
-uninstall-asapconv:
-	$(RM) $(DESTDIR)$(bindir)/asapconv
-.PHONY: uninstall-asapconv
-
-# lib
-
-lib: libasap.a
-.PHONY: lib
-
-libasap.a: asap.o
-	$(AR)
-CLEAN += libasap.a
-
-asap.o: $(call src,asap.[ch])
-	$(CC) -c
-CLEAN += asap.o
-
-install-lib: libasap.a $(srcdir)asap.h
-	$(call INSTALL_DATA,$(srcdir)asap.h,$(prefix)/include)
-	$(call INSTALL_DATA,libasap.a,$(libdir))
-.PHONY: install-lib
-
-uninstall-lib:
-	$(RM) $(DESTDIR)$(prefix)/include/asap.h $(DESTDIR)$(libdir)/libasap.a
-.PHONY: uninstall-lib
-
-# SDL
-
-asap-sdl: $(call src,asap-sdl.c asap.[ch])
-	$(CC) $(SDL_CFLAGS) $(SDL_LIBS)
-CLEAN += asap-sdl
-
-install-sdl: asap-sdl
-	$(call INSTALL_PROGRAM,asap-sdl,$(bindir))
-.PHONY: install-sdl
-
-uninstall-sdl:
-	$(RM) $(DESTDIR)$(bindir)/asap-sdl
-.PHONY: uninstall-sdl
-
-# asapscan
-
-asapscan: $(srcdir)asapscan.c asap-asapscan.h
-	$(CC)
-CLEAN += asapscan asapscan.exe
-
-asap-asapscan.h: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX) | asap-asapscan.c
-
-#asap-asapscan.c: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-#	$(CITO) -D ASAPSCAN
-CLEAN += asap-asapscan.c asap-asapscan.h
-
-# asap.[ch]
-
-$(srcdir)asap.h: $(call src,asap.ci asap6502.ci asapinfo.ci asapwriter.ci cpu6502.ci flashpack.ci pokey.ci) $(ASM6502_OBX) | $(srcdir)asap.c
-
-#$(srcdir)asap.c: $(call src,asap.ci asap6502.ci asapinfo.ci asapwriter.ci cpu6502.ci flashpack.ci pokey.ci) $(ASM6502_OBX)
-#	$(CITO) -D C -D FLASHPACK
-
-# other
-
-$(srcdir)README.html: $(call src,README INSTALL CREDITS)
-	$(call ASCIIDOC,-a toc -a asapsrc -a asapports)
-
-sap-format.html: $(srcdir)sap-format.txt
-	$(call ASCIIDOC,-a toc)
-
-clean:
-	$(RM) $(CLEAN)
-	$(RM) -r $(CLEANDIR)
-.PHONY: clean
-
-.DELETE_ON_ERROR:
-
-include $(srcdir)audacious/audacious.mk
-include $(srcdir)gstreamer/gstreamer.mk
-include $(srcdir)moc/moc.mk
-include $(srcdir)vlc/vlc.mk
-include $(srcdir)xbmc/xbmc.mk
-include $(srcdir)xmms/xmms.mk
-
-include $(srcdir)csharp/csharp.mk
-include $(srcdir)d/d.mk
-include $(srcdir)flash/flash.mk
-include $(srcdir)java/java.mk
-include $(srcdir)javascript/javascript.mk
-include $(srcdir)perl/perl.mk
-include $(srcdir)win32/win32.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/MANIFEST kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/MANIFEST
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/MANIFEST	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/MANIFEST	1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-6502/6502.mk
-6502/cm3.obx
-6502/cmc.asx
-6502/cmc.obx
-6502/cmr.obx
-6502/cms.asx
-6502/cms.obx
-6502/dlt.as8
-6502/dlt.obx
-6502/fc.as8
-6502/fc.obx
-6502/fp3depk.asx
-6502/mpt.asx
-6502/mpt.obx
-6502/os.asx
-6502/rmt.asx
-6502/rmt4.obx
-6502/rmt8.obx
-6502/tm2.asx
-6502/tm2.obx
-6502/tmc.asx
-6502/tmc.obx
-6502/xexb.asx
-6502/xexb.obx
-6502/xexd.asx
-6502/xexd.obx
-6502/xexinfo.asx
-6502/xexinfo.obx
-COPYING
-CREDITS
-INSTALL
-MANIFEST
-Makefile
-NEWS
-PORTS.xml
-PORTS.xsl
-README
-README.html
-USAGE-WEB
-aatr.c
-aatr.h
-asap-sdl.c
-asap.c
-asap.ci
-asap.h
-asap.spec
-asap6502.ci
-asapconv.c
-asapinfo.ci
-asapscan.c
-asapwriter.ci
-astil.c
-astil.h
-audacious/asapplug.c
-audacious/audacious.mk
-chksap.pl
-cpu6502.ci
-csharp/AppManifest.xaml
-csharp/SilverASAP.cs
-csharp/asap2wav.cs
-csharp/asapplay.cs
-csharp/csharp.mk
-csharp/winrt/AppxManifest.xml
-csharp/winrt/MetroASAP.cs
-csharp/winrt/logo.svg
-csharp/winrt/winrt.mk
-d/alsa/pcm.d
-d/asap2wav.d
-d/asapplay.d
-d/d.mk
-d/waveout.d
-debian/asap-dev.install
-debian/asap-gstreamer0.10.install
-debian/asap-vlc.install
-debian/asap.install
-debian/changelog
-debian/compat
-debian/control
-debian/copyright
-debian/rules
-flash/ASAPPlayer.as
-flash/flash.mk
-flashpack.ci
-gstreamer/gstasapdec.c
-gstreamer/gstasapdec.h
-gstreamer/gstreamer.mk
-java/ASAP2WAV.java
-java/ASAPApplet.java
-java/ASAPMusicRoutine.java
-java/USAGE
-java/android/AndroidManifest.xml
-java/android/FileContainer.java
-java/android/FileSelector.java
-java/android/MediaButtonEventReceiver.java
-java/android/Player.java
-java/android/PlayerService.java
-java/android/Util.java
-java/android/ZipInputStream.java
-java/android/android.mk
-java/android/proguard.cfg
-java/android/res/drawable/icon.png
-java/android/res/layout/fileinfo_list_item.xml
-java/android/res/layout/filename_list_item.xml
-java/android/res/layout/playing.xml
-java/android/res/menu/file_selector.xml
-java/android/res/menu/playing.xml
-java/android/res/values/strings.xml
-java/android/res/values/themes.xml
-java/asap2wav.MF
-java/j2me/ASAPMIDlet.java
-java/j2me/MANIFEST.MF
-java/j2me/j2me.mk
-java/java.mk
-javascript/USAGE
-javascript/air/AIRASAP-app.xml
-javascript/air/air.mk
-javascript/air/airasap.html
-javascript/air/airasap.js
-javascript/air/asap16x16.png
-javascript/air/asap32x32.png
-javascript/air/fileTypes.pl
-javascript/asap2wav1.js
-javascript/asapweb.js
-javascript/binaryHttpRequest.js
-javascript/javascript.mk
-moc/libasap_decoder.c
-moc/moc.mk
-perl/asap2wav.pl
-perl/perl.mk
-pokey.ci
-release/release.mk
-sap-format.txt
-sap2ntsc.c
-sap2txt.c
-test/RESULTS.xml
-test/RESULTS.xsl
-test/antic_nmien.asx
-test/antic_nmires.asx
-test/antic_nmist.asx
-test/antic_vblki.asx
-test/antic_vcount.asx
-test/antic_wsync.asx
-test/benchmark/Drunk_Chessboard.sap
-test/benchmark/International_Karate.sap
-test/benchmark/Lasermania.sap
-test/benchmark/Lightness.sap
-test/benchmark/Montezumas_Revenge.sap
-test/benchmark/Overload.sap
-test/benchmark/Tempest_2000_Blue_Level.sap
-test/benchmark/benchmark.mk
-test/benchmark/benchmark.pl
-test/benchmark/gme_benchmark.c
-test/benchmark/sap_benchmark.cpp
-test/cpu_ane.asx
-test/cpu_anx.asx
-test/cpu_decimal.asx
-test/cpu_las.asx
-test/cpu_shx.asx
-test/crashsap.cs
-test/disasm/disasm.mk
-test/formats.asx
-test/gtia_consol.asx
-test/loadsap.cs
-test/pokey_irqst.asx
-test/pokey_pot.asx
-test/pokey_potst.asx
-test/pokey_pure.asx
-test/pokey_random.asx
-test/pokey_timerirq.asx
-test/sapd_player_iflag.asx
-test/test.mk
-test/timevsnative.c
-test/ultrasap.cs
-vlc/libasap_plugin.c
-vlc/vlc.mk
-win32/USAGE
-win32/apollo/ASAP_Apollo.cpp
-win32/apollo/InputPlugin.h
-win32/bass/bass-addon.h
-win32/bass/bass.h
-win32/bass/bass.lib
-win32/bass/bass_asap.c
-win32/diff-sap.js
-win32/dshow/asap_dsf.cpp
-win32/dshow/asap_dsf.def
-win32/foobar2000/foo_asap.cpp
-win32/gsplayer/gspasap.c
-win32/gsplayer/mapplugin.h
-win32/gui.rc
-win32/info_dlg.c
-win32/info_dlg.h
-win32/rmt/apokeysnd_dll.c
-win32/settings_dlg.c
-win32/settings_dlg.h
-win32/setup/Website.url
-win32/setup/asap-banner.jpg
-win32/setup/asap-dialog.jpg
-win32/setup/asap.wxs
-win32/setup/license.rtf
-win32/setup/wix_mutex.pl
-win32/shellex/ASAPShellEx.cpp
-win32/shellex/ASAPShellEx.propdesc
-win32/wasap/play.ico
-win32/wasap/stop.ico
-win32/wasap/wasap.c
-win32/wasap/wasap.h
-win32/wasap/wasap.ico
-win32/win32.mk
-win32/winamp/in2.h
-win32/winamp/in_asap.c
-win32/winamp/ipc_pe.h
-win32/winamp/out.h
-win32/winamp/wa_ipc.h
-win32/wince/USAGE
-win32/wince/asap.inf
-win32/xmplay/xmp-asap.c
-win32/xmplay/xmpfunc.h
-win32/xmplay/xmpin.h
-www/applet.txt
-www/flash.txt
-www/javascript.txt
-www/silverlight.txt
-www/www.mk
-xbmc/build_vctk.bat
-xbmc/xbmc.mk
-xbmc/xbmc_asap.c
-xmms/libasap-xmms.c
-xmms/libasap-xmms.map
-xmms/xmms.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/moc/libasap_decoder.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/moc/libasap_decoder.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/moc/libasap_decoder.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/moc/libasap_decoder.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-/*
- * libasap_decoder.c - ASAP plugin for MOC (Music On Console)
- *
- * Copyright (C) 2007-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "common.h"
-#include "decoder.h"
-#include "files.h"
-
-#include "asap.h"
-
-#define BITS_PER_SAMPLE      16
-#define DEFAULT_SONG_LENGTH  -1
-
-typedef struct {
-	ASAP *asap;
-	int duration;
-	struct decoder_error error;
-} ASAP_Decoder;
-
-static cibool asap_load(ASAP_Decoder *d, const char *filename)
-{
-	struct io_stream *s;
-	ssize_t module_len;
-	unsigned char *module;
-	cibool ok;
-	const ASAPInfo *info;
-	int song;
-	int duration;
-
-	d->asap = NULL;
-	decoder_error_init(&d->error);
-	s = io_open(filename, 0);
-	if (s == NULL) {
-		decoder_error(&d->error, ERROR_FATAL, 0, "Can't open %s", filename);
-		return FALSE;
-	}
-	module_len = io_file_size(s);
-	module = (unsigned char *) xmalloc(module_len);
-	module_len = io_read(s, module, module_len);
-	io_close(s);
-
-	d->asap = ASAP_New();
-	if (d->asap == NULL) {
-		decoder_error(&d->error, ERROR_FATAL, 0, "Out of memory");
-		return FALSE;
-	}
-
-	ok = ASAP_Load(d->asap, filename, module, module_len);
-	free(module);
-	if (!ok) {
-		decoder_error(&d->error, ERROR_FATAL, 0, "Unsupported file format");
-		return FALSE;
-	}
-	info = ASAP_GetInfo(d->asap);
-	song = ASAPInfo_GetDefaultSong(info);
-	duration = ASAPInfo_GetDuration(info, song);
-	if (duration < 0)
-		duration = DEFAULT_SONG_LENGTH * 1000;
-	d->duration = duration;
-	return TRUE;
-}
-
-static void asap_close(void *data)
-{
-	ASAP_Decoder *d = (ASAP_Decoder *) data;
-	ASAP_Delete(d->asap);
-	free(d);
-}
-
-static void *asap_open(const char *uri)
-{
-	ASAP_Decoder *d = (ASAP_Decoder *) xmalloc(sizeof(ASAP_Decoder));
-	if (!asap_load(d, uri) || !ASAP_PlaySong(d->asap, ASAPInfo_GetDefaultSong(ASAP_GetInfo(d->asap)), d->duration)) {
-		asap_close(d);
-		return NULL;
-	}
-	return d;
-}
-
-static int asap_decode(void *data, char *buf, int buf_len, struct sound_params *sound_params)
-{
-	ASAP_Decoder *d = (ASAP_Decoder *) data;
-	sound_params->channels = ASAPInfo_GetChannels(ASAP_GetInfo(d->asap));
-	sound_params->rate = ASAP_SAMPLE_RATE;
-	sound_params->fmt = BITS_PER_SAMPLE == 8 ? SFMT_U8 : (SFMT_S16 | SFMT_LE);
-	return ASAP_Generate(d->asap, (unsigned char *) buf, buf_len, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-}
-
-static int asap_seek(void *data, int sec)
-{
-	ASAP_Decoder *d = (ASAP_Decoder *) data;
-	ASAP_Seek(d->asap, sec * 1000);
-	return sec;
-}
-
-static void asap_info(const char *file, struct file_tags *tags, const int tags_sel)
-{
-	ASAP_Decoder d;
-	if (asap_load(&d, file)) {
-		if ((tags_sel & TAGS_COMMENTS) != 0) {
-			const ASAPInfo *info = ASAP_GetInfo(d.asap);
-			tags->title = xstrdup(ASAPInfo_GetTitleOrFilename(info));
-			tags->artist = xstrdup(ASAPInfo_GetAuthor(info));
-			tags->filled |= TAGS_COMMENTS;
-		}
-		if ((tags_sel & TAGS_TIME) != 0) {
-			tags->time = d.duration / 1000;
-			tags->filled |= TAGS_TIME;
-		}
-	}
-	ASAP_Delete(d.asap);
-}
-
-static int asap_get_bitrate(void *data)
-{
-	return -1;
-}
-
-static int asap_get_duration(void *data)
-{
-	const ASAP_Decoder *d = (const ASAP_Decoder *) data;
-	return d->duration / 1000;
-}
-
-static void asap_get_error(void *data, struct decoder_error *error)
-{
-	ASAP_Decoder *d = (ASAP_Decoder *) data;
-	decoder_error_copy(error, &d->error);
-}
-
-static int asap_our_format_ext(const char *ext)
-{
-	return ASAPInfo_IsOurExt(ext);
-}
-
-static void asap_get_name(const char *file, char buf[4])
-{
-	const char *ext = ext_pos(file);
-	int i = 0;
-	while (ext[i] != '\0' && i < 3) {
-		int c = ext[i];
-		if (c >= 'a' && c <= 'z')
-			c += 'A' - 'a';
-		buf[i++] = c;
-	}
-	buf[i] = '\0';
-}
-
-struct decoder *plugin_init()
-{
-	static struct decoder asap_decoder = {
-		DECODER_API_VERSION,
-		NULL,
-		NULL,
-		asap_open,
-		NULL,
-		NULL,
-		asap_close,
-		asap_decode,
-		asap_seek,
-		asap_info,
-		asap_get_bitrate,
-		asap_get_duration,
-		asap_get_error,
-		asap_our_format_ext,
-		NULL,
-		asap_get_name,
-		NULL,
-		NULL
-#if DECODER_API_VERSION >= 7
-		, NULL
-#endif
-	};
-	return &asap_decoder;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/moc/moc.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/moc/moc.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/moc/moc.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/moc/moc.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-MOC_INCLUDE = ../moc-2.4.4
-MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "moc.mk")
-endif
-
-asap-moc: libasap_decoder.so
-.PHONY: asap-moc
-
-libasap_decoder.so: $(call src,moc/libasap_decoder.c asap.[ch])
-	$(CC) -I$(MOC_INCLUDE)
-CLEAN += libasap_decoder.so
-
-install-moc: libasap_decoder.so
-	$(call INSTALL_PROGRAM,libasap_decoder.so,$(MOC_PLUGIN_DIR))
-.PHONY: install-moc
-
-uninstall-moc:
-	$(RM) $(DESTDIR)$(MOC_PLUGIN_DIR)/libasap_decoder.so
-.PHONY: uninstall-moc
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/NEWS kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/NEWS
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/NEWS	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/NEWS	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-ASAP - Another Slight Atari Player
-==================================
-
-:Compact-Option:
-
-link:/[Home]
-image:http://sflogo.sourceforge.net/sflogo.php?group_id=154391&amp;type=13["Get ASAP - Another Slight Atari Player at SourceForge.net. Fast, secure and Free Open Source software downloads",width=120,height=30,link="http://sourceforge.net/projects/asap/"]
-
-News
-----
-
-ASAP 3.1.5 (2013-08-17)::
-
-- Android: fixed playback on Android 4.1+, disconnecting headset pauses playback, updates position and avoids "process not responding" during seek, starts in root directory if there's no memory card.
-- GStreamer plugin gets autoplugged (read: SAPs play in GStreamer-based players).
-- WASAP plays music to its very end.
-- Fixed crash on malformed RMT files.
-- Restored Audacious 2.x compatibility.
-- DEB packages.
-- foobar2000 `*.fb2k-component` package.
-
-
-ASAP 3.1.4 (2013-04-29)::
-
-- Android: plays in background, can switch to next/previous/random file, opens M3U playlists, file selector can display metadata, "back" returns to parent directory.
-- WASAP fixed to avoid occasional deadlock when opening files during playback.
-- VLC plugin compiled for OS X.
-- 64-bit RPMs.
-- Fixed time detection for CMS.
-- Windows Explorer displays titles for RMT, TMC, TM2.
-- "Show information about the currently playing file" restored after Winamp/XMPlay restart.
-- TortoiseSVN and TortoiseGit plugins don't depend on libz-1.dll.
-- asapscan calculates SAP fingerprints (contributed by Jakub Husak).
-- Experimental ASAP2WAV in Perl.
-
-
-ASAP 3.1.3 (2012-12-04)::
-
-- foobar2000 plugin plays files inside ATR disk images.
-- VLC and AIMP 3 plugins support RMT and FC in addition to SAP.
-- Audacious plugin can edit AUTHOR, NAME and year, upgraded to Audacious 3.3.
-- GStreamer plugin handles TIME, AUTHOR, NAME, DATE and seek, compiled for Windows.
-- Fixed JAD file for the Java midlet.
-- Created RPMs for VLC and GStreamer.
-- Experimental Windows 8 port.
-
-
-ASAP 3.1.2 (2012-06-25)::
-
-- Created VLC plugin (SAP format only).
-- The JavaScript player now works in Chrome, Firefox, Internet Explorer 9 and 6, using https://github.com/grantgalitz/XAudioJS[XAudioJS].
-- Flash Player, Java applet, Silverlight and JavaScript players were put in a single "web" package.
-- UTF-8 encoding is supported for STIL.
-- Author is no longer hidden in the converted XEX files.
-- Winamp plugin opens ATR disk images and plays files inside them.
-- Audacious plugin updated to Audacious 3.2 and compiled for Windows.
-- BASS add-on updated to be compatible with AIMP 3 (SAP format only).
-- Enabled title/author/year in the BASS add-on (only selected BASS-based players use it,
-for example http://sourceforge.net/projects/encorebassing/[EncoreBassing]).
-- Windows Media Player codec supports subsongs, AUTHOR and NAME
-(this works at least with Media Player Classic Home Cinema).
-- JavaScript interface of the web players has been extended and now has identical functionality.
-- New TortoiseSVN and TortoiseGit plugins show changes in SAP tags.
-
-
-ASAP 3.1.1 (2011-10-26)::
-
-- Converted XEX files may optionally display information.
-- Fixed conversion of some TYPE D SAP files (e.g. Saturday_Demo.sap) to XEX.
-- Fixed time detection for some FC files.
-
-
-ASAP 3.1.0 (2011-09-24)::
-
-- WASAP/Winamp/Apollo/XMPlay file information window now includes STIL
-(SAP Tune Information List) and technical data.
-- Added Future Composer (*.fc) format (contributed by Jerzy Kut).
-- Written http://asap.sourceforge.net/sap-format.html[specification of the SAP format].
-- XMPlay displays STIL, tracker name and RMT instrument names.
-- The 64-bit setup package now includes the Windows Media Player plugin
-(useful for the Vista/7 http://gallery.live.com/liveItemDetail.aspx?li=3af0c591-260b-4721-b28f-fa0f1d929760[sidebar WMP gadget]).
-- Java release now includes `asap.jar` for http://wudsn.com[WUDSN IDE].
-- asapplay in the D programming language has been ported to Linux and 64-bit compilers (by Adrian Matoga).
-
-
-ASAP 3.0.1 (2011-07-15)::
-
-- Uses linear interpolation for resampling (try Toxic_Cream.sap).
-- Displays titles of RMT, TMC and TM2 files.
-- The GSPlayer plugin now works on new Windows Mobile versions.
-- The Android player can play files directly from ZIP archives.
-- asapconv can auto-detect the native format (`asapconv -o .%e *.sap`).
-- asapconv can relocate modules (`asapconv --address=a000 -o relocated.tmc original.tmc`).
-- asapconv can write metadata to WAV files.
-- Created an experimental plugin for GStreamer (requires GStreamer with https://bugzilla.gnome.org/show_bug.cgi?id=654295[this bug] fixed - 0.10.36 or newer).
-- Converted XEX files disable the built-in BASIC.
-- Converted XEX files clear the I flag for the TYPE D PLAYER routine.
-- Doublequotes and pipes are now allowed characters in the AUTHOR and NAME tags.
-
-
-ASAP 3.0.0 (2011-05-24)::
-
-New ports;;
-- Created a desktop player for the http://www.adobe.com/products/air/[Adobe AIR] platform.
-- Ported the Windows Media Player plugin to Windows CE.
-- Created a setup package with the Windows Explorer plugin for 64-bit Windows.
-- The Audacious plugin supports Audacious 2.5.
-- Created RPM packages with asapconv, ASAP C library and the XMMS plugin.
-- Created ASAP2WAV and a simple player in the D programming language.
-- JavaScript ASAP2WAV now runs in DMDScript and JScript.NET.
-
-Emulation accuracy;;
-- Corrected ANTIC and POKEY timings.
-- Implemented STIMER, NMIST and NMIRES hardware registers.
-- Made the CONSOL register readable.
-- Fixed and optimized undocumented 6502 instructions.
-
-Usability improvements;;
-- Conversion to Atari executables (XEX format, also known as COM).
-- RMT files can be extracted from SAP files created in Raster Music Tracker.
-- Implemented subsongs, seek bar and pause in the Android port.
-- Added a date picker in the WASAP/Winamp/Apollo/XMPlay file information window.
-- The FASTPLAY tag can be up to 32767 (previously 312).
-- Browser JavaScript player works on `file://` URLs.
-- asapscan uses a much faster length detection algorithm.
-
-Bug fixes;;
-- Many important fixes in the Audacious plugin.
-- Many fixes in the Android port.
-
-Cleanup;;
-- Rewritten ASAP core to the http://cito.sourceforge.net[Ć programming language].
-- Removed `defaultPlaybackTime` and `loopPlaybackTime` parameters
-from applet, Flash Player and Silverlight interfaces.
-
-
-ASAP 2.1.2 (2010-11-03)::
-
-- There are new ports: Android, Audacious plugin, Silverlight and a simple command-line player using SDL.
-- WASAP has been ported to Windows CE.
-- There's a new CAB package for Windows CE.
-- Re-running WASAP opens the file selector.
-- JavaScript ASAP2WAV now works in Rhino Shell, Google V8 shell, JScript.NET and JaegerMonkey.
-- A slight fix and an optimization have been applied to 6502 emulation.
-- "Show information about the currently playing file" is now available in XMPlay and has been fixed in Winamp.
-
-
-ASAP 2.1.1 (2010-05-05)::
-
-- The SAP file format has been extended with the "NTSC" tag.
-- A BASS add-on (works in AIMP) has been created.
-- A crash in XMPlay has been fixed.
-- The XMMS plugin now works correctly on big endian machines.
-- There's a new Windows Explorer extension which displays metadata
-(title, author, year, duration, mono/stereo, number of subsongs, PAL/NTSC)
-and on Windows Vista/7 can edit them.
-- A simple player in C# has been created.
-
-
-ASAP 2.1.0 (2010-02-02)::
-
-- ASAP2WAV has been replaced with asapconv which can additionally
-convert native modules to and from the SAP format, edit SAP tags
-and write MP3 files using http://lame.sourceforge.net/[LAME].
-- A plugin for XMPlay has been created.
-- The foobar2000 plugin has been updated to foobar2000 1.0.
-- Time detection in RMT files has been fixed.
-- PLAYER tag is now optional for TYPE D SAP files.
-- "File Information" window now includes a better validation.
-- Windows Media Player's "Open" now includes ASAP file types.
-- WASAP has a progress bar for writing WAV files.
-- Flash player uses DEFSONG.
-- Source code has been improved and moved from CVS to Git repository.
-
-
-ASAP 2.0.0 (2009-12-10)::
-
-- Windows setup has been created.
-- ASAP has been ported to Flash Player and experimentally to JavaScript.
-- New input formats: DLT, CMS and CM3 are supported.
-- GTIA sound and COVOX are emulated.
-- WASAP now includes "Save as WAV".
-- JavaScript interface of the Java applet has been changed.
-- There were huge changes in the build process: on Unix/Linux it no longer uses
-the "configure" script and on Windows it uses MinGW for almost all binaries
-(they are smaller than Visual C++ 2008's, compatible with Windows 9x,
-wildcards work in ASAP2WAV).
-
-
-ASAP 1.2.1 (2009-05-08)::
-
-- XBMC plugin and POKEY emulation DLL for RMT have been created.
-- The midlet has a progress bar, tags display, subsong selection and better performance.
-- SKCTL emulation has been slightly improved.
-- Documentation has been converted from plain text to HTML.
-
-
-ASAP 1.2.0 (2008-03-29)::
-
-- Plugins for Windows Media Player and Apollo have been created.
-- RMT duration detection has been improved.
-- A bug in TMC to SAP conversion has been fixed.
-- ASAP can be compiled as C#.
-
-
-ASAP 1.1.0 (2008-02-17)::
-
-- All formats supported by ASAP can be converted to and from the SAP format,
-using the file information window of WASAP or the Winamp plugin.
-Unlike SAP Maker, ASAP supports subsongs and TIME tags.
-- POKEY emulation has improved a little.
-- Bugs in the XMMS plugin, the foobar2000 plugin and the applet have been fixed.
-
-
-ASAP 1.0.2 (2007-11-02)::
-
-- TIME tags can be edited in the file information window of WASAP and the Winamp plugin.
-- A few emulation bugs have been fixed.
-- Some user interface issues in WASAP have been fixed.
-
-
-ASAP 1.0.1 (2007-06-10)::
-
-- Plugin for MOC (Music On Console) has been created.
-- WASAP, Winamp plugin and foobar2000 plugin can edit AUTHOR, NAME and DATE tags in SAP files.
-- Winamp and XMMS plugins format titles as specified by the player.
-- TMC files are now played in stereo.
-- A few minor bugs have been fixed.
-
-
-ASAP 1.0.0 (2007-05-28)::
-
-- This release introduces completely new 6502 and POKEY emulation.
-SAP files with samples are supported.
-- ASAP can be compiled as Java - an applet and an experimental midlet have been created.
-- Winamp, foobar2000 and GSPlayer plugins support silence detection and muting selected POKEY channels.
-- Winamp plugin supports subsongs and Winamp's equalizer.
-
-
-ASAP 0.3.0 (2007-05-06)::
-
-- Added support for AUTHOR, NAME, DATE and TIME tags in SAP files.
-- Winamp, foobar2000 and the new GSPlayer plugin have configurable playback time
-for songs with no TIME tag and songs marked with LOOP.
-- foobar2000 plugin has been updated for version 0.9 of foobar2000.
-- XMMS plugin supports the TM8 extension.
-
-
-ASAP 0.2.1 (2006-01-28)::
-
-- Added TM2 (Theta Music Composer 2.x) file format.
-- Compilation and installation on Unix-like systems have been improved.
-- foobar2000 plugin supports subsongs.
-
-
-ASAP 0.2.0 (2006-01-15)::
-
-- Added stereo and 16-bit audio output (enabled by default).
-- Compressed SAP files (for example Fractals.sap) are played correctly.
-- Subsongs are supported in RMT files.
-- There are new plugins: for XMMS and for foobar2000 version 0.8.
-- WASAP supports Windows Explorer's "Open with".
-
-
-ASAP 0.1.0 (2005-12-31)::
-
-- This initial release included: ASAP2WAV - portable command-line utility for converting
-Atari 8-bit music to WAV files, WASAP - a tiny player for Windows and in_asap - a Winamp plugin.
-- It supported the following formats: SAP (except for samples and stereo),
-CMC, CMR, DMC, MPT (without samples), MPD, RMT (mono) and TMC (mono).
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/perl/asap2wav.pl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/perl/asap2wav.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/perl/asap2wav.pl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/perl/asap2wav.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-# asap2wav.pl - converter of ASAP-supported formats to WAV files
-#
-# Copyright (C) 2013  Piotr Fusik
-#
-# This file is part of ASAP (Another Slight Atari Player),
-# see http://asap.sourceforge.net
-#
-# ASAP is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2 of the License,
-# or (at your option) any later version.
-#
-# ASAP is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ASAP; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-use Getopt::Long;
-use Asap;
-use strict;
-
-my $output_filename;
-my $output_header = 1;
-my $song;
-my $format = ASAPSampleFormat::S16_L_E();
-my $duration;
-my $mute_mask = 0;
-
-sub print_help() {
-	print <<END;
-Usage: perl asap2wav.pl [OPTIONS] INPUTFILE...
-Each INPUTFILE must be in a supported format:
-SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.
-Options:
--o FILE     --output=FILE      Set output file name
--s SONG     --song=SONG        Select subsong number (zero-based)
--t TIME     --time=TIME        Set output length (MM:SS format)
--b          --byte-samples     Output 8-bit samples
--w          --word-samples     Output 16-bit samples (default)
-            --raw              Output raw audio (no WAV header)
--m CHANNELS --mute=CHANNELS    Mute POKEY chanels (1-8)
--h          --help             Display this information
--v          --version          Display version information
-END
-}
-
-sub set_mute_mask($) {
-	my ($s) = @_;
-	$mute_mask = 0;
-	$mute_mask |= 1 << ($1 - 1) while $s =~ /([1-8])/g;
-}
-
-sub process_file($) {
-	my ($input_filename) = @_;
-	my $module;
-	open F, '<', $input_filename and binmode F and read F, $module, ASAPInfo::MAX_MODULE_LENGTH() and close F or die "$input_filename: $!\n";
-	my @module = unpack 'C*', $module;
-
-	my $asap = ASAP->new();
-	$asap->load($input_filename, \@module, scalar(@module));
-	my $info = $asap->get_info();
-	$song = $info->get_default_song() unless defined $song;
-	unless (defined $duration) {
-		$duration = $info->get_duration($song);
-		$duration = 180_000 if $duration < 0;
-	}
-	$asap->play_song($song, $duration);
-	$asap->mute_pokey_channels($mute_mask);
-
-	unless (defined $output_filename) {
-		($output_filename = $input_filename) =~ s/\.\w+$/$output_header ? '.wav' : '.raw'/e;
-	}
-	open F, '>', $output_filename and binmode F or die "$output_filename: $!\n";
-	my @buffer = [];
-	my $n;
-	if ($output_header) {
-		$n = $asap->get_wav_header(\@buffer, $format, 0);
-		print F pack 'C*', @buffer[0 .. $n - 1];
-	}
-	do {
-		$n = $asap->generate(\@buffer, 8192, $format);
-		print F pack 'C*', @buffer[0 .. $n - 1];
-	} while $n == 8192;
-	close F;
-
-	$output_filename = undef;
-	$song = undef;
-	$duration = undef;
-}
-
-GetOptions(
-	'output|o' => \$output_filename,
-	'song|s' => \$song,
-	'time|t' => sub { $duration = ASAPInfo::ParseDuration($_[1]); },
-	'byte-samples|b' => sub { $format = ASAPSampleFormat::U8(); },
-	'word-samples|w' => sub { $format = ASAPSampleFormat::S16_L_E(); },
-	'raw' => sub { $output_header = 0; },
-	'mute|m' => sub { set_mute_mask($_[1]); },
-	'help|h' => sub { print_help(); exit 0; },
-	'version|v' => sub { print 'ASAP2WAV (Perl) ', ASAPInfo::VERSION(), "\n"; exit 0; }
-) && @ARGV or print_help(), exit 1;
-
-process_file($_) for @ARGV;
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/perl/perl.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/perl/perl.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/perl/perl.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/perl/perl.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "perl.mk")
-endif
-
-perl: perl/Asap.pm
-.PHONY: perl
-
-perl/Asap.pm: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
-	$(CITO)
-CLEAN += perl/Asap.pm
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/pokey.ci kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/pokey.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/pokey.ci	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/pokey.ci	1970-01-01 00:00:00.000000000 +0000
@@ -1,716 +0,0 @@
-// pokey.ci - POKEY chip emulator
-//
-// Copyright (C) 2010-2012  Piotr Fusik
-//
-// This file is part of ASAP (Another Slight Atari Player),
-// see http://asap.sourceforge.net
-//
-// ASAP is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License,
-// or (at your option) any later version.
-//
-// ASAP is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty
-// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ASAP; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-/// Format of output samples.
-public enum ASAPSampleFormat
-{
-	/// Unsigned 8-bit.
-	U8,
-	/// Signed 16-bit little-endian.
-	S16LE,
-	/// Signed 16-bit big-endian.
-	S16BE
-}
-
-class Pokey
-{
-	// Registers:
-	int Audf1;
-	int Audf2;
-	int Audf3;
-	int Audf4;
-	int Audc1;
-	int Audc2;
-	int Audc3;
-	int Audc4;
-	int Audctl;
-	int Skctl;
-
-	// Computed from the registers:
-	bool Init;
-	int DivCycles;
-	int PeriodCycles1;
-	int PeriodCycles2;
-	int PeriodCycles3;
-	int PeriodCycles4;
-	int ReloadCycles1;
-	int ReloadCycles3;
-
-	// Internal counters:
-	int PolyIndex;
-	const int NeverCycle = 0x800000;
-	int TickCycle1;
-	int TickCycle2;
-	int TickCycle3;
-	int TickCycle4;
-
-	// Is channel muted?
-	const int MuteFrequency = 1;
-	const int MuteInit = 2;
-	const int MuteUser = 4;
-	const int MuteSerialInput = 8;
-	int Mute1;
-	int Mute2;
-	int Mute3;
-	int Mute4;
-
-	// Audio output:
-	int Out1;
-	int Out2;
-	int Out3;
-	int Out4;
-	int Delta1;
-	int Delta2;
-	int Delta3;
-	int Delta4;
-	// Sample rates from 32000 to 50000 should be fine,
-	// but weren't tested - please report your experience.
-	// For lower rates, you'll need to add a low-pass filter.
-	// The DC filter in PokeyPair.Generate should also be adjusted
-	// whenever the sample rate considerably differs from 44100.
-	const int SampleRate = 44100;
-	// Enough for one PAL frame == 312 * 114 cycles + some margin,
-	// as we emulate whole 6502 instructions and interpolate samples.
-	int[SampleRate * 312 * 114 / 1773447 + 4] DeltaBuffer;
-
-	void Initialize()
-	{
-		Audf1 = 0;
-		Audf2 = 0;
-		Audf3 = 0;
-		Audf4 = 0;
-		Audc1 = 0;
-		Audc2 = 0;
-		Audc3 = 0;
-		Audc4 = 0;
-		Audctl = 0;
-		Skctl = 3;
-		Init = false;
-		DivCycles = 28;
-		PeriodCycles1 = 28;
-		PeriodCycles2 = 28;
-		PeriodCycles3 = 28;
-		PeriodCycles4 = 28;
-		ReloadCycles1 = 28;
-		ReloadCycles3 = 28;
-		PolyIndex = 15 * 31 * 131071;
-		TickCycle1 = NeverCycle;
-		TickCycle2 = NeverCycle;
-		TickCycle3 = NeverCycle;
-		TickCycle4 = NeverCycle;
-		Mute1 = MuteFrequency;
-		Mute2 = MuteFrequency;
-		Mute3 = MuteFrequency;
-		Mute4 = MuteFrequency;
-		Out1 = 0;
-		Out2 = 0;
-		Out3 = 0;
-		Out4 = 0;
-		Delta1 = 0;
-		Delta2 = 0;
-		Delta3 = 0;
-		Delta4 = 0;
-		DeltaBuffer.Clear();
-	}
-
-	void AddDelta(PokeyPair pokeys, int cycle, int delta)
-	{
-		int i = cycle * pokeys.SampleFactor + pokeys.SampleOffset;
-		// too large value reduces the resolution of delta (if bigger than DeltaShiftCOVOX, DeltaShiftPOKEY)
-		// too small value reduces the resolution of interpolation
-		const int interpolationShift = 16;
-		int delta2 = (delta >> interpolationShift) * (i >> (PokeyPair.SampleFactorShift - interpolationShift) & ((1 << interpolationShift) - 1));
-		i >>= PokeyPair.SampleFactorShift;
-		DeltaBuffer[i] += delta - delta2;
-		DeltaBuffer[i + 1] += delta2;
-	}
-
-	/// Fills `DeltaBuffer` up to `cycleLimit` basing on current Audf/Audc/AudcTL values.
-	void GenerateUntilCycle(PokeyPair pokeys, int cycleLimit)
-	{
-		for (;;) {
-			int cycle = cycleLimit;
-			if (cycle > TickCycle1)
-				cycle = TickCycle1;
-			if (cycle > TickCycle2)
-				cycle = TickCycle2;
-			if (cycle > TickCycle3)
-				cycle = TickCycle3;
-			if (cycle > TickCycle4)
-				cycle = TickCycle4;
-			if (cycle == cycleLimit)
-				break;
-
-			const byte[15] poly4Lookup = { 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1 };
-			const byte[31] poly5Lookup = {
-				0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1,
-				0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1 };
-			macro DO_TICK(ch) {
-				if (Init) {
-					switch (Audc##ch >> 4) {
-					case 10:
-					case 14:
-						Out##ch ^= 1;
-						Delta##ch = -Delta##ch;
-						AddDelta(pokeys, cycle, Delta##ch);
-						break;
-					default:
-						break;
-					}
-				}
-				else {
-					int poly = cycle + PolyIndex - (ch - 1);
-					int newOut = Out##ch;
-					switch (Audc##ch >> 4) {
-					case 0:
-						if (poly5Lookup[poly % 31] != 0) {
-							if ((Audctl & 0x80) != 0)
-								newOut = pokeys.Poly9Lookup[poly % 511] & 1;
-							else {
-								poly %= 131071;
-								newOut = (pokeys.Poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-							}
-						}
-						break;
-					case 2:
-					case 6:
-						newOut ^= poly5Lookup[poly % 31];
-						break;
-					case 4:
-						if (poly5Lookup[poly % 31] != 0)
-							newOut = poly4Lookup[poly % 15];
-						break;
-					case 8:
-						if ((Audctl & 0x80) != 0)
-							newOut = pokeys.Poly9Lookup[poly % 511] & 1;
-						else {
-							poly %= 131071;
-							newOut = (pokeys.Poly17Lookup[poly >> 3] >> (poly & 7)) & 1;
-						}
-						break;
-					case 10:
-					case 14:
-						newOut ^= 1;
-						break;
-					case 12:
-						newOut = poly4Lookup[poly % 15];
-						break;
-					default:
-						break;
-					}
-					if (newOut != Out##ch) {
-						Out##ch = newOut;
-						Delta##ch = -Delta##ch;
-						AddDelta(pokeys, cycle, Delta##ch);
-					}
-				}
-			}
-
-			if (cycle == TickCycle3) {
-				TickCycle3 += PeriodCycles3;
-				if ((Audctl & 4) != 0 && Delta1 > 0 && Mute1 == 0) {
-					Delta1 = -Delta1;
-					AddDelta(pokeys, cycle, Delta1);
-				}
-				DO_TICK(3);
-			}
-			if (cycle == TickCycle4) {
-				TickCycle4 += PeriodCycles4;
-				if ((Audctl & 8) != 0)
-					TickCycle3 = cycle + ReloadCycles3;
-				if ((Audctl & 2) != 0 && Delta2 > 0 && Mute2 == 0) {
-					Delta2 = -Delta2;
-					AddDelta(pokeys, cycle, Delta2);
-				}
-				DO_TICK(4);
-			}
-			if (cycle == TickCycle1) {
-				TickCycle1 += PeriodCycles1;
-				if ((Skctl & 0x88) == 8) // two-tone, sending 1 (i.e. timer1)
-					TickCycle2 = cycle + PeriodCycles2;
-				DO_TICK(1);
-			}
-			if (cycle == TickCycle2) {
-				TickCycle2 += PeriodCycles2;
-				if ((Audctl & 0x10) != 0)
-					TickCycle1 = cycle + ReloadCycles1;
-				else if ((Skctl & 8) != 0) // two-tone
-					TickCycle1 = cycle + PeriodCycles1;
-				DO_TICK(2);
-			}
-		}
-	}
-
-	void EndFrame(PokeyPair pokeys, int cycle)
-	{
-		GenerateUntilCycle(pokeys, cycle);
-		PolyIndex += cycle;
-		int m = (Audctl & 0x80) != 0 ? 15 * 31 * 511 : 15 * 31 * 131071;
-		if (PolyIndex >= 2 * m)
-			PolyIndex -= m;
-		if (TickCycle1 != NeverCycle)
-			TickCycle1 -= cycle;
-		if (TickCycle2 != NeverCycle)
-			TickCycle2 -= cycle;
-		if (TickCycle3 != NeverCycle)
-			TickCycle3 -= cycle;
-		if (TickCycle4 != NeverCycle)
-			TickCycle4 -= cycle;
-	}
-
-	bool IsSilent()
-	{
-		return ((Audc1 | Audc2 | Audc3 | Audc4) & 0xf) == 0;
-	}
-
-	macro MUTE_CHANNEL(pokey, ch, cond, mask, cycle) {
-		if (cond) {
-			pokey.Mute##ch |= mask;
-			pokey.TickCycle##ch = NeverCycle;
-		}
-		else {
-			pokey.Mute##ch &= ~mask;
-			if (pokey.TickCycle##ch == NeverCycle && pokey.Mute##ch == 0)
-				pokey.TickCycle##ch = cycle;
-		}
-	}
-
-	void Mute(int mask)
-	{
-		MUTE_CHANNEL(this, 1, (mask & 1) != 0, MuteUser, 0);
-		MUTE_CHANNEL(this, 2, (mask & 2) != 0, MuteUser, 0);
-		MUTE_CHANNEL(this, 3, (mask & 4) != 0, MuteUser, 0);
-		MUTE_CHANNEL(this, 4, (mask & 8) != 0, MuteUser, 0);
-	}
-}
-
-#if APOKEYSND
-public
-#endif
-class PokeyPair
-{
-	byte[511] Poly9Lookup;
-	byte[16385] Poly17Lookup;
-	int ExtraPokeyMask;
-	int Timer1Cycle;
-	int Timer2Cycle;
-	int Timer4Cycle;
-	int Irqst;
-	Pokey() BasePokey;
-	Pokey() ExtraPokey;
-
-	// DeltaBuffer.Length << SampleFactorShift shouldn't overflow int.
-	// SampleFactorShift could be 21, but that wouldn't improve
-	// accuracy because SampleFactor would be even.
-	const int SampleFactorShift = 20;
-	int SampleFactor;
-	int SampleOffset;
-
-	int ReadySamplesStart;
-	int ReadySamplesEnd;
-
-	int IirAccLeft;
-	int IirAccRight;
-
-#if APOKEYSND
-	public
-#endif
-	PokeyPair()
-	{
-		int reg = 0x1ff;
-		for (int i = 0; i < 511; i++) {
-			reg = (((reg >> 5 ^ reg) & 1) << 8) + (reg >> 1);
-			Poly9Lookup[i] = reg.LowByte;
-		}
-		reg = 0x1ffff;
-		for (int i = 0; i < 16385; i++) {
-			reg = (((reg >> 5 ^ reg) & 0xff) << 9) + (reg >> 8);
-			Poly17Lookup[i] = (reg >> 1).LowByte;
-		}
-	}
-
-#if APOKEYSND
-	public
-#endif
-	void Initialize(bool ntsc, bool stereo)
-	{
-		ExtraPokeyMask = stereo ? 0x10 : 0;
-		Timer1Cycle = Pokey.NeverCycle;
-		Timer2Cycle = Pokey.NeverCycle;
-		Timer4Cycle = Pokey.NeverCycle;
-		Irqst = 0xff;
-		BasePokey.Initialize();
-		ExtraPokey.Initialize();
-
-		// What we really need here is:
-		// macro SAMPLE_FACTOR(clock) (((Pokey.SampleRate << SampleFactorShift) + (clock >> 1)) / clock)
-		// unfortunately cito provides only 32-bit arithmetic for the moment,
-		// so I shift by 5 to avoid overflow.
-		macro SAMPLE_FACTOR(clock) (((Pokey.SampleRate << SampleFactorShift - 5) + (clock >> 6)) / (clock >> 5))
-		SampleFactor = ntsc ? SAMPLE_FACTOR(1789772) : SAMPLE_FACTOR(1773447);
-
-		SampleOffset = 0;
-		ReadySamplesStart = 0;
-		ReadySamplesEnd = 0;
-		IirAccLeft = 0;
-		IirAccRight = 0;
-	}
-
-#if APOKEYSND
-	public
-#endif
-	void Poke(int addr, int data, int cycle)
-	{
-		Pokey pokey = (addr & ExtraPokeyMask) != 0 ? ExtraPokey : BasePokey;
-
-		macro DO_STORE(reg) {
-			if (data == pokey.reg)
-				break;
-			pokey.GenerateUntilCycle(this, cycle);
-			pokey.reg = data;
-		}
-		macro MUTE_CHANNEL(ch, cond, mask) {
-			if (cond) {
-				pokey.Mute##ch |= mask;
-				pokey.TickCycle##ch = Pokey.NeverCycle;
-			}
-			else {
-				pokey.Mute##ch &= ~mask;
-				if (pokey.TickCycle##ch == Pokey.NeverCycle && pokey.Mute##ch == 0)
-					pokey.TickCycle##ch = cycle;
-			}
-		}
-
-		const int DeltaShiftPOKEY = 20;
-		switch (addr & 0xf) {
-		case 0x00:
-			DO_STORE(Audf1);
-			const int UltrasoundCycles = 112;
-			macro DO_ULTRASOUND(ch) {
-				MUTE_CHANNEL(ch, pokey.PeriodCycles##ch <= UltrasoundCycles
-					&& (pokey.Audc##ch >> 4 == 10 || pokey.Audc##ch >> 4 == 14), Pokey.MuteFrequency);
-			}
-			switch (pokey.Audctl & 0x50) {
-			case 0x00:
-				pokey.PeriodCycles1 = pokey.DivCycles * (data + 1);
-				break;
-			case 0x10:
-				pokey.PeriodCycles2 = pokey.DivCycles * (data + (pokey.Audf2 << 8) + 1);
-				pokey.ReloadCycles1 = pokey.DivCycles * (data + 1);
-				DO_ULTRASOUND(2);
-				break;
-			case 0x40:
-				pokey.PeriodCycles1 = data + 4;
-				break;
-			case 0x50:
-				pokey.PeriodCycles2 = data + (pokey.Audf2 << 8) + 7;
-				pokey.ReloadCycles1 = data + 4;
-				DO_ULTRASOUND(2);
-				break;
-			}
-			DO_ULTRASOUND(1);
-			break;
-		case 0x01:
-			macro DO_AUDC(ch) {
-				DO_STORE(Audc##ch);
-				if ((data & 0x10) != 0) {
-					data = (data & 0xf) << DeltaShiftPOKEY;
-					if ((pokey.Mute##ch & Pokey.MuteUser) == 0)
-						pokey.AddDelta(this, cycle, pokey.Delta##ch > 0 ? data - pokey.Delta##ch : data);
-					pokey.Delta##ch = data;
-				}
-				else {
-					data = (data & 0xf) << DeltaShiftPOKEY;
-					DO_ULTRASOUND(ch);
-					if (pokey.Delta##ch > 0) {
-						if ((pokey.Mute##ch & Pokey.MuteUser) == 0)
-							pokey.AddDelta(this, cycle, data - pokey.Delta##ch);
-						pokey.Delta##ch = data;
-					}
-					else
-						pokey.Delta##ch = -data;
-				}
-				break;
-			}
-			DO_AUDC(1);
-		case 0x02:
-			DO_STORE(Audf2);
-			switch (pokey.Audctl & 0x50) {
-			case 0x00:
-			case 0x40:
-				pokey.PeriodCycles2 = pokey.DivCycles * (data + 1);
-				break;
-			case 0x10:
-				pokey.PeriodCycles2 = pokey.DivCycles * (pokey.Audf1 + (data << 8) + 1);
-				break;
-			case 0x50:
-				pokey.PeriodCycles2 = pokey.Audf1 + (data << 8) + 7;
-				break;
-			}
-			DO_ULTRASOUND(2);
-			break;
-		case 0x03:
-			DO_AUDC(2);
-		case 0x04:
-			DO_STORE(Audf3);
-			switch (pokey.Audctl & 0x28) {
-			case 0x00:
-				pokey.PeriodCycles3 = pokey.DivCycles * (data + 1);
-				break;
-			case 0x08:
-				pokey.PeriodCycles4 = pokey.DivCycles * (data + (pokey.Audf4 << 8) + 1);
-				pokey.ReloadCycles3 = pokey.DivCycles * (data + 1);
-				DO_ULTRASOUND(4);
-				break;
-			case 0x20:
-				pokey.PeriodCycles3 = data + 4;
-				break;
-			case 0x28:
-				pokey.PeriodCycles4 = data + (pokey.Audf4 << 8) + 7;
-				pokey.ReloadCycles3 = data + 4;
-				DO_ULTRASOUND(4);
-				break;
-			}
-			DO_ULTRASOUND(3);
-			break;
-		case 0x05:
-			DO_AUDC(3);
-		case 0x06:
-			DO_STORE(Audf4);
-			switch (pokey.Audctl & 0x28) {
-			case 0x00:
-			case 0x20:
-				pokey.PeriodCycles4 = pokey.DivCycles * (data + 1);
-				break;
-			case 0x08:
-				pokey.PeriodCycles4 = pokey.DivCycles * (pokey.Audf3 + (data << 8) + 1);
-				break;
-			case 0x28:
-				pokey.PeriodCycles4 = pokey.Audf3 + (data << 8) + 7;
-				break;
-			}
-			DO_ULTRASOUND(4);
-			break;
-		case 0x07:
-			DO_AUDC(4);
-		case 0x08:
-			DO_STORE(Audctl);
-			pokey.DivCycles = (data & 1) != 0 ? 114 : 28;
-			// TODO: TickCycles
-			switch (data & 0x50) {
-			case 0x00:
-				pokey.PeriodCycles1 = pokey.DivCycles * (pokey.Audf1 + 1);
-				pokey.PeriodCycles2 = pokey.DivCycles * (pokey.Audf2 + 1);
-				break;
-			case 0x10:
-				pokey.PeriodCycles1 = pokey.DivCycles << 8;
-				pokey.PeriodCycles2 = pokey.DivCycles * (pokey.Audf1 + (pokey.Audf2 << 8) + 1);
-				pokey.ReloadCycles1 = pokey.DivCycles * (pokey.Audf1 + 1);
-				break;
-			case 0x40:
-				pokey.PeriodCycles1 = pokey.Audf1 + 4;
-				pokey.PeriodCycles2 = pokey.DivCycles * (pokey.Audf2 + 1);
-				break;
-			case 0x50:
-				pokey.PeriodCycles1 = 256;
-				pokey.PeriodCycles2 = pokey.Audf1 + (pokey.Audf2 << 8) + 7;
-				pokey.ReloadCycles1 = pokey.Audf1 + 4;
-				break;
-			}
-			DO_ULTRASOUND(1);
-			DO_ULTRASOUND(2);
-			switch (data & 0x28) {
-			case 0x00:
-				pokey.PeriodCycles3 = pokey.DivCycles * (pokey.Audf3 + 1);
-				pokey.PeriodCycles4 = pokey.DivCycles * (pokey.Audf4 + 1);
-				break;
-			case 0x08:
-				pokey.PeriodCycles3 = pokey.DivCycles << 8;
-				pokey.PeriodCycles4 = pokey.DivCycles * (pokey.Audf3 + (pokey.Audf4 << 8) + 1);
-				pokey.ReloadCycles3 = pokey.DivCycles * (pokey.Audf3 + 1);
-				break;
-			case 0x20:
-				pokey.PeriodCycles3 = pokey.Audf3 + 4;
-				pokey.PeriodCycles4 = pokey.DivCycles * (pokey.Audf4 + 1);
-				break;
-			case 0x28:
-				pokey.PeriodCycles3 = 256;
-				pokey.PeriodCycles4 = pokey.Audf3 + (pokey.Audf4 << 8) + 7;
-				pokey.ReloadCycles3 = pokey.Audf3 + 4;
-				break;
-			}
-			DO_ULTRASOUND(3);
-			DO_ULTRASOUND(4);
-			macro DO_INIT(ch, cond) { MUTE_CHANNEL(ch, pokey.Init && cond, Pokey.MuteInit); }
-			DO_INIT(1, (data & 0x40) == 0);
-			DO_INIT(2, (data & 0x50) != 0x50);
-			DO_INIT(3, (data & 0x20) == 0);
-			DO_INIT(4, (data & 0x28) != 0x28);
-			break;
-		case 0x09:
-			// TODO: ReloadCycles, out
-			macro DO_STIMER(ch) {
-				if (pokey.TickCycle##ch != Pokey.NeverCycle)
-					pokey.TickCycle##ch = cycle + pokey.PeriodCycles##ch;
-			}
-			DO_STIMER(1);
-			DO_STIMER(2);
-			DO_STIMER(3);
-			DO_STIMER(4);
-			break;
-		case 0x0f:
-			DO_STORE(Skctl);
-			bool init = (data & 3) == 0;
-			if (pokey.Init && !init)
-				pokey.PolyIndex = ((pokey.Audctl & 0x80) != 0 ? 15 * 31 * 511 - 1 : 15 * 31 * 131071 - 1) - cycle;
-			pokey.Init = init;
-			DO_INIT(1, (pokey.Audctl & 0x40) == 0);
-			DO_INIT(2, (pokey.Audctl & 0x50) != 0x50);
-			DO_INIT(3, (pokey.Audctl & 0x20) == 0);
-			DO_INIT(4, (pokey.Audctl & 0x28) != 0x28);
-			MUTE_CHANNEL(3, (data & 0x10) != 0, Pokey.MuteSerialInput);
-			MUTE_CHANNEL(4, (data & 0x10) != 0, Pokey.MuteSerialInput);
-			break;
-		default:
-			break;
-		}
-	}
-
-#if APOKEYSND
-	public
-#endif
-	int GetRandom(int addr, int cycle)
-	{
-		Pokey pokey = (addr & ExtraPokeyMask) != 0 ? ExtraPokey : BasePokey;
-		if (pokey.Init)
-			return 0xff;
-		int i = cycle + pokey.PolyIndex;
-		if ((pokey.Audctl & 0x80) != 0)
-			return Poly9Lookup[i % 511];
-		i %= 131071;
-		int j = i >> 3;
-		i &= 7;
-		return ((Poly17Lookup[j] >> i) + (Poly17Lookup[j + 1] << (8 - i))) & 0xff;
-	}
-
-#if APOKEYSND
-	public
-#endif
-	void StartFrame()
-	{
-		BasePokey.DeltaBuffer.Clear();
-		if (ExtraPokeyMask != 0)
-			ExtraPokey.DeltaBuffer.Clear();
-	}
-
-#if APOKEYSND
-	public
-#endif
-	int EndFrame(int cycle)
-	{
-		BasePokey.EndFrame(this, cycle);
-		if (ExtraPokeyMask != 0)
-			ExtraPokey.EndFrame(this, cycle);
-		SampleOffset += cycle * SampleFactor;
-		ReadySamplesStart = 0;
-		ReadySamplesEnd = SampleOffset >> SampleFactorShift;
-		SampleOffset &= (1 << SampleFactorShift) - 1;
-		return ReadySamplesEnd;
-	}
-
-	/// Fills buffer with samples from `DeltaBuffer`.
-#if APOKEYSND
-	public
-#endif
-	int Generate(byte[] buffer, int bufferOffset, int blocks, ASAPSampleFormat format)
-	{
-		int i = ReadySamplesStart;
-		int samplesEnd = ReadySamplesEnd;
-		if (blocks < samplesEnd - i)
-			samplesEnd = i + blocks;
-		else
-			blocks = samplesEnd - i;
-		int accLeft = IirAccLeft;
-		int accRight = IirAccRight;
-		for (; i < samplesEnd; i++) {
-			accLeft += BasePokey.DeltaBuffer[i] - (accLeft * 3 >> 10);
-#if FLASH
-			native {
-				var sample
-//#if ACTIONSCRIPT
-//					: Number
-//#endif
-					= accLeft / 33553408;
-				buffer.writeFloat(sample);
-				if (this.extraPokeyMask != 0) {
-					accRight += this.extraPokey.deltaBuffer[i] - (accRight * 3 >> 10);
-					sample = accRight / 33553408;
-				}
-				buffer.writeFloat(sample);
-			}
-#else
-			int sample = accLeft >> 10;
-			macro STORE_SAMPLE() {
-				if (sample < -32767)
-					sample = -32767;
-				else if (sample > 32767)
-					sample = 32767;
-				switch (format) {
-				case ASAPSampleFormat.U8:
-					buffer[bufferOffset++] = (sample >> 8) + 128;
-					break;
-				case ASAPSampleFormat.S16LE:
-					buffer[bufferOffset++] = sample.LowByte;
-					buffer[bufferOffset++] = (sample >> 8).LowByte;
-					break;
-				case ASAPSampleFormat.S16BE:
-					buffer[bufferOffset++] = (sample >> 8).LowByte;
-					buffer[bufferOffset++] = sample.LowByte;
-					break;
-				}
-			}
-			STORE_SAMPLE();
-			if (ExtraPokeyMask != 0) {
-				accRight += ExtraPokey.DeltaBuffer[i] - (accRight * 3 >> 10);
-				sample = accRight >> 10;
-				STORE_SAMPLE();
-			}
-#endif // FLASH
-		}
-		if (i == ReadySamplesEnd) {
-			accLeft += BasePokey.DeltaBuffer[i] + BasePokey.DeltaBuffer[i + 1];
-			accRight += ExtraPokey.DeltaBuffer[i] + ExtraPokey.DeltaBuffer[i + 1];
-		}
-		ReadySamplesStart = i;
-		IirAccLeft = accLeft;
-		IirAccRight = accRight;
-#if APOKEYSND
-		return bufferOffset;
-#else
-		return blocks;
-#endif
-	}
-
-	bool IsSilent()
-	{
-		return BasePokey.IsSilent() && ExtraPokey.IsSilent();
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/PORTS.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/PORTS.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/PORTS.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/PORTS.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,589 +0,0 @@
-<?xml-stylesheet type="text/xsl" href="PORTS.xsl" ?>
-<ports>
-	<port name="WASAP">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>GUI</interface>
-		<since>0.1.0</since>
-		<status>stable</status>
-		<output>16-bit, sound or WAV file</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>yes</edit-info>
-		<convert-sap>yes</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>yes</stil>
-		<lang>C</lang>
-	</port>
-	<port name="Winamp plugin">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>player plugin</interface>
-		<since>0.1.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>yes</edit-info>
-		<convert-sap>yes</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>yes</stil>
-		<comment class="good">Plays from ATR disk images</comment>
-		<lang>C</lang>
-		<a href="http://www.winamp.com/">Winamp</a>
-	</port>
-	<port name="XMMS plugin">
-		<bin>Linux</bin>
-		<platform>Linux</platform>
-		<interface>player plugin</interface>
-		<since>0.2.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>no</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://xmms.org/">XMMS</a>
-	</port>
-	<port name="foobar2000 plugin">
-		<bin>Windows, foo_asap</bin>
-		<platform>Windows</platform>
-		<interface>player plugin</interface>
-		<since>0.2.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>AUTHOR, NAME, DATE, but not TIME</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<comment class="good">Plays from ATR disk images</comment>
-		<lang>C, C++</lang>
-		<a href="http://foobar2000.org/">foobar2000</a>
-	</port>
-	<port name="GSPlayer">
-		<bin>Windows CE, Windows</bin>
-		<platform>Windows CE, Windows</platform>
-		<interface>player plugin</interface>
-		<since>0.3.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>no</subsongs>
-		<file-info>AUTHOR, NAME</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://hp.vector.co.jp/authors/VA032810/">GSPlayer</a>
-	</port>
-	<port name="Java applet">
-		<bin>Web</bin>
-		<platform>web browser</platform>
-		<interface>via HTML or JavaScript</interface>
-		<since>1.0.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>Java</lang>
-		<a href="http://asap.sourceforge.net/applet.html">online demo</a>
-	</port>
-	<port name="Java midlet">
-		<bin>Java</bin>
-		<platform>mobile devices</platform>
-		<interface>GUI</interface>
-		<since>1.0.0</since>
-		<status>stable</status>
-		<output>8-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>Java</lang>
-	</port>
-	<port name="MOC plugin">
-		<bin></bin>
-		<platform>Linux</platform>
-		<interface>player plugin</interface>
-		<since>1.0.1</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>no</subsongs>
-		<file-info>AUTHOR, NAME</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://moc.daper.net/">MOC</a>
-	</port>
-	<port name="Windows Media Player plugin">
-		<bin>Windows, Windows CE</bin>
-		<platform>Windows, Windows CE</platform>
-		<interface>player plugin</interface>
-		<since>1.2.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>experi&#173;mental</subsongs>
-		<file-info>AUTHOR, NAME (experi&#173;mental)</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<comment class="partial">No subsongs or file infor&#173;mation in the standard Windows Media Player</comment>
-		<lang>C, C++</lang>
-		<a href="http://www.microsoft.com/windows/windowsmedia/player/">Windows Media Player</a>
-	</port>
-	<port name="Apollo plugin">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>player plugin</interface>
-		<since>1.2.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>no</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>yes</edit-info>
-		<convert-sap>yes</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>yes</stil>
-		<lang>C, C++</lang>
-		<a href="http://koti.welho.com/hylinen/apollo/">Apollo</a>
-	</port>
-	<port name="XBMC plugin">
-		<bin>Windows</bin>
-		<platform>XBox, Windows, Linux</platform>
-		<interface>player plugin</interface>
-		<since>1.2.1</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://xbmc.org/">XBMC</a>
-	</port>
-	<port name="POKEY DLL for RMT">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>composer plugin</interface>
-		<since>1.2.1</since>
-		<status>stable</status>
-		<output>8 or 16-bit sound</output>
-		<subsongs>N/A</subsongs>
-		<file-info>N/A</file-info>
-		<edit-info>N/A</edit-info>
-		<convert-sap>N/A</convert-sap>
-		<config-time>N/A</config-time>
-		<mute-pokey>N/A</mute-pokey>
-		<stil>N/A</stil>
-		<lang>C</lang>
-		<a href="http://raster.infos.cz/atari/rmt/rmt.htm">Raster Music Tracker</a>
-	</port>
-	<port name="Browser JavaScript player">
-		<bin>Web</bin>
-		<platform>web browsers</platform>
-		<interface>via JavaScript</interface>
-		<since>2.0.0</since>
-		<status>stable</status>
-		<output>floating-point sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>JavaScript</lang>
-		<a href="http://asap.sourceforge.net/javascript.html">online demo</a>
-	</port>
-	<port name="Flash player">
-		<bin>Web</bin>
-		<platform>Flash Player</platform>
-		<interface>via HTML or JavaScript</interface>
-		<since>2.0.0</since>
-		<status>stable</status>
-		<output>32-bit floating-point sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>Action&#173;Script 3</lang>
-		<a href="http://asap.sourceforge.net/flash.html">online demo</a>
-	</port>
-	<port name="asapconv">
-		<bin>Windows, Linux</bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>2.1.0</since>
-		<status>stable</status>
-		<output>8 or 16-bit, WAV, raw or MP3, file or stdout</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>yes, multi-file</edit-info>
-		<convert-sap>yes, multi-file</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-	</port>
-	<port name="XMPlay plugin">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>player plugin</interface>
-		<since>2.1.0</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>yes</edit-info>
-		<convert-sap>yes</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>yes</stil>
-		<comment class="good">Displays RMT instrument names</comment>
-		<lang>C</lang>
-		<a href="http://www.un4seen.com/xmplay.html">XMPlay</a>
-	</port>
-	<port name="BASS add-on">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>library add-on</interface>
-		<since>2.1.1</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>no</subsongs>
-		<file-info>AUTHOR, NAME, DATE (year)</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://www.un4seen.com/bass.html">BASS</a>
-	</port>
-	<port name="Windows Explorer extension">
-		<bin>Windows</bin>
-		<platform>Windows</platform>
-		<interface>Windows Explorer</interface>
-		<since>2.1.1</since>
-		<status>stable</status>
-		<output>N/A</output>
-		<subsongs>N/A</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>only on Windows Vista and newer: AUTHOR, NAME, DATE (year), multi-file</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>N/A</config-time>
-		<mute-pokey>N/A</mute-pokey>
-		<stil>no</stil>
-		<lang>C, C++</lang>
-	</port>
-	<port name="SilverASAP">
-		<bin>Web</bin>
-		<platform>Silverlight</platform>
-		<interface>via HTML or JavaScript</interface>
-		<since>2.1.2</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C#</lang>
-		<a href="http://asap.sourceforge.net/silverlight.html">online demo</a>
-	</port>
-	<port name="Audacious plugin">
-		<bin>Windows</bin>
-		<platform>Linux, Windows</platform>
-		<interface>player plugin</interface>
-		<since>2.1.2</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>AUTHOR, NAME, DATE (year)</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://audacious-media-player.org/">Audacious</a>
-	</port>
-	<port name="WASAP (Windows CE)">
-		<bin>Windows CE</bin>
-		<platform>Windows CE</platform>
-		<interface>GUI</interface>
-		<since>2.1.2</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-	</port>
-	<port name="AndroidASAP">
-		<bin>Android</bin>
-		<platform>Android</platform>
-		<interface>GUI</interface>
-		<since>2.1.2</since>
-		<status>in develop&#173;ment</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<comment class="good">Plays from ZIP archives and M3U playlists</comment>
-		<lang>Java</lang>
-	</port>
-	<port name="AIRASAP">
-		<bin>AIR</bin>
-		<platform>Adobe AIR</platform>
-		<interface>GUI</interface>
-		<since>3.0.0</since>
-		<status>in develop&#173;ment</status>
-		<output>32-bit floating-point sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>JavaScript</lang>
-	</port>
-	<port name="GStreamer plugin">
-		<bin>Linux, Windows</bin>
-		<platform>Linux, Windows</platform>
-		<interface>library plugin</interface>
-		<since>3.0.1</since>
-		<status>in develop&#173;ment</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<comment class="bad">SAP format only</comment>
-		<lang>C</lang>
-		<a href="http://gstreamer.freedesktop.org/">GStreamer</a>
-	</port>
-	<port name="VLC plugin">
-		<bin>Windows, OS X, Linux</bin>
-		<platform>Windows, OS X, Linux</platform>
-		<interface>player plugin</interface>
-		<since>3.1.2</since>
-		<status>stable</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<comment class="bad">SAP, FC, RMT formats only</comment>
-		<lang>C</lang>
-		<a href="http://www.videolan.org/vlc/">VLC</a>
-	</port>
-	<port name="MetroASAP">
-		<bin></bin><!-- TODO -->
-		<platform>Windows 8</platform>
-		<interface>Metro</interface>
-		<since>3.1.3</since>
-		<status>experi&#173;mental</status>
-		<output>16-bit sound</output>
-		<subsongs>no</subsongs><!-- TODO: yes -->
-		<file-info>no</file-info><!-- TODO: yes -->
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C#</lang>
-	</port>
-	<port name="ASAP2WAV (Java)">
-		<bin>Java</bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>1.0.0</since>
-		<status>sample</status>
-		<output>8 or 16-bit, WAV or raw, file or stdout</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>Java</lang>
-	</port>
-	<port name="ASAP2WAV (C#)">
-		<bin></bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>1.2.0</since>
-		<status>sample</status>
-		<output>8 or 16-bit, WAV or raw file</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>C#</lang>
-	</port>
-	<port name="ASAP2WAV (JavaScript)">
-		<bin></bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>2.0.0</since>
-		<status>sample</status>
-		<output>8 or 16-bit, WAV or raw file</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>JavaScript</lang>
-	</port>
-	<port name="ASAP2WAV (Perl)">
-		<bin></bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>3.1.4</since>
-		<status>sample</status>
-		<output>8 or 16-bit, WAV or raw file</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>Perl</lang>
-	</port>
-	<port name="ASAP2WAV (D)">
-		<bin></bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>3.0.0</since>
-		<status>sample</status>
-		<output>8 or 16-bit, WAV or raw file</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>D</lang>
-	</port>
-	<port name="asapplay (C#)">
-		<bin></bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>2.1.1</since>
-		<status>sample</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C#</lang>
-	</port>
-	<port name="asap-sdl">
-		<bin></bin>
-		<platform>desktop operating systems</platform>
-		<interface>command line</interface>
-		<since>2.1.2</since>
-		<status>sample</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>yes</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>no</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-		<a href="http://www.libsdl.org/">SDL</a>
-	</port>
-	<port name="asapplay (D)">
-		<bin></bin>
-		<platform>Windows, Linux</platform>
-		<interface>command line</interface>
-		<since>3.0.0</since>
-		<status>sample</status>
-		<output>16-bit sound</output>
-		<subsongs>yes</subsongs>
-		<file-info>AUTHOR, NAME, TIME</file-info>
-		<edit-info>no</edit-info>
-		<convert-sap>no</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>no</mute-pokey>
-		<stil>no</stil>
-		<lang>D</lang>
-	</port>
-	<port name="asapconv (Android)">
-		<bin></bin>
-		<platform>Android</platform>
-		<interface>command line</interface>
-		<since>3.1.5</since>
-		<status>sample</status>
-		<output>8 or 16-bit, WAV or raw, file or stdout</output>
-		<subsongs>yes</subsongs>
-		<file-info>no</file-info>
-		<edit-info>yes, multi-file</edit-info>
-		<convert-sap>yes, multi-file</convert-sap>
-		<config-time>yes</config-time>
-		<mute-pokey>yes</mute-pokey>
-		<stil>no</stil>
-		<lang>C</lang>
-	</port>
-</ports>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/PORTS.xsl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/PORTS.xsl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/PORTS.xsl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/PORTS.xsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-<?xml version="1.0" ?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:output method="html" />
-
-	<xsl:template match="/ports">
-		<html>
-			<head>
-				<title>ASAP ports list</title>
-				<style>
-					table { border-collapse: collapse; }
-					th, td { border: solid black 1px; }
-					th, .name { background-color: #ccf; }
-					.good { background-color: #cfc; }
-					.bad { background-color: #fcc; }
-					.partial { background-color: #ffc; }
-					.good, .bad, .partial { text-align: center; }
-				</style>
-			</head>
-			<body>
-				<table>
-					<thead>
-						<tr>
-							<th>Name</th>
-							<th>Binary release</th>
-							<th>Platform</th>
-							<th>User interface</th>
-							<th>First appeared in&#160;ASAP</th>
-							<th>Develop&#173;ment status<sup><a href="#status_note">[1]</a></sup></th>
-							<th>Output</th>
-							<th>Supports sub&#173;songs?</th>
-							<th>Shows file infor&#173;mation?</th>
-							<th>Edits file infor&#173;mation?</th>
-							<th>Converts to and from SAP?</th>
-							<th>Configu&#173;rable play&#173;back time?</th>
-							<th>Mute POKEY chan&#173;nels?</th>
-							<th>Shows STIL?</th>
-							<th>Comment</th>
-							<th>Program&#173;ming lan&#173;guage</th>
-							<th>Related website</th>
-						</tr>
-					</thead>
-					<tbody>
-						<xsl:apply-templates />
-					</tbody>
-				</table>
-				<ol>
-					<li id="status_note">Development status:
-						<ul>
-							<li><span class="good">stable</span> - complete</li>
-							<li><span class="partial">in development</span> - working, but incomplete or buggy</li>
-							<li><span class="bad">experimental</span> - initial implementation</li>
-							<li><span class="bad">sample</span> - sample code for developers, not recommended for end-users</li>
-						</ul>
-					</li>
-				</ol>
-			</body>
-		</html>
-	</xsl:template>
-
-	<xsl:template match="port">
-		<tr>
-			<td class="name"><xsl:value-of select="@name" /></td>
-			<td><xsl:value-of select="bin" /></td>
-			<td><xsl:value-of select="platform" /></td>
-			<td><xsl:value-of select="interface" /></td>
-			<td><xsl:value-of select="since" /></td>
-			<td>
-				<xsl:attribute name="class">
-					<xsl:choose>
-						<xsl:when test="status = 'stable'">good</xsl:when>
-						<xsl:when test="status = 'experi&#173;mental' or status = 'sample'">bad</xsl:when>
-						<xsl:otherwise>partial</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				<xsl:value-of select="status" />
-			</td>
-			<td><xsl:value-of select="output" /></td>
-			<td><xsl:apply-templates select="subsongs" /></td>
-			<td><xsl:apply-templates select="file-info" /></td>
-			<td><xsl:apply-templates select="edit-info" /></td>
-			<td><xsl:apply-templates select="convert-sap" /></td>
-			<td><xsl:apply-templates select="config-time" /></td>
-			<td><xsl:apply-templates select="mute-pokey" /></td>
-			<td><xsl:apply-templates select="stil" /></td>
-			<td><xsl:apply-templates select="comment" /></td>
-			<td><xsl:value-of select="lang" /></td>
-			<td><xsl:copy-of select="a" /></td>
-		</tr>
-	</xsl:template>
-
-	<xsl:template match="subsongs|file-info|edit-info|convert-sap|config-time|mute-pokey|stil|comment">
-		<xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="@class"><xsl:value-of select="@class" /></xsl:when>
-				<xsl:when test="starts-with(., 'yes')">good</xsl:when>
-				<xsl:when test=". = 'no'">bad</xsl:when>
-				<xsl:otherwise>partial</xsl:otherwise>
-			</xsl:choose>
-		</xsl:attribute>
-		<xsl:value-of select="." />
-	</xsl:template>
-</xsl:stylesheet>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/README kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/README
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/README	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,235 +0,0 @@
-ASAP - Another Slight Atari Player
-==================================
-
-// This file is in AsciiDoc format. It is converted to README.html.
-:Compact-Option:
-
-ifdef::asapwww[]
-link:NEWS.html[News] |
-http://sourceforge.net/p/asap/code[Browse source code (Git)] |
-http://sourceforge.net/projects/asap/[SourceForge project page]
-image:http://sflogo.sourceforge.net/sflogo.php?group_id=154391&amp;type=13["Get ASAP - Another Slight Atari Player at SourceForge.net. Fast, secure and Free Open Source software downloads",width=120,height=30,link="http://sourceforge.net/projects/asap/"]
-endif::asapwww[]
-
-ASAP is a player of http://en.wikipedia.org/wiki/Atari_8-bit_family[Atari 8-bit]
-music for modern computers and mobile devices.
-It emulates the http://en.wikipedia.org/wiki/POKEY[POKEY sound chip]
-and the http://en.wikipedia.org/wiki/6502[6502 processor].
-The project was initially based on the routines from the
-http://atari800.sourceforge.net/[Atari800 emulator],
-but the current version has original emulation core.
-
-ifdef::asapwww[]
-
-Download
---------
-
-[horizontal]
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-win32.msi/download[asap-3.1.5-win32.msi]::
-Installer for all versions of desktop Windows (32-bit and 64-bit).
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/foo_asap-3.1.5.fb2k-component/download[foo_asap-3.1.5.fb2k-component]::
-If you only want the http://foobar2000.org/[foobar2000] plugin.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-android.apk/download[asap-3.1.5-android.apk]::
-Android application.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-wince-arm.cab/download[asap-3.1.5-wince-arm.cab]::
-WASAP, Windows Media Player and GSPlayer plugins for Windows Mobile.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-web.zip/download[asap-3.1.5-web.zip]::
-Embed ASAP on your web page.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-java.zip/download[asap-3.1.5-java.zip]::
-Java midlet for mobile phones.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-air.air/download[asap-3.1.5-air.air]::
-Desktop player in JavaScript (requires http://www.adobe.com/products/air/[Adobe AIR]).
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-win64.msi/download[asap-3.1.5-win64.msi]::
-View and edit SAP file tags in your 64-bit Windows Explorer. Listen in 64-bit Windows Media Player.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-win32.zip/download[asap-3.1.5-win32.zip]::
-For Windows people allergic to installers.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-wince-arm.zip/download[asap-3.1.5-wince-arm.zip]::
-For Windows Mobile people allergic to installers.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-vlc-3.1.5-osx.dmg/download[asap-vlc-3.1.5-osx.dmg]::
-VLC plugin for OS X (Intel 32-bit and 64-bit). Drag `libasap_plugin.dylib` to `plugins`.
-
-asap_3.1.5-1_\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap_3.1.5-1_i386.deb/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap_3.1.5-1_amd64.deb/download[amd64]\}.deb::
-Linux binary of asapconv.
-
-asap-3.1.5-1.\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-1.i386.rpm/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5-1.x86_64.rpm/download[x86_64]\}.rpm::
-Linux binary of asapconv.
-
-asap-gstreamer0.10_3.1.5-1_\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-gstreamer0.10_3.1.5-1_i386.rpm/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-gstreamer0.10_3.1.5-1_amd64.deb/download[amd64]\}.deb::
-Linux binary of the GStreamer 0.10 plugin.
-
-asap-gstreamer0.10-3.1.5-1.\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-gstreamer0.10-3.1.5-1.i386.rpm/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-gstreamer0.10-3.1.5-1.x86_64.rpm/download[x86_64]\}.rpm::
-Linux binary of the GStreamer 0.10 plugin.
-
-asap-vlc_3.1.5-1_\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-vlc_3.1.5-1_i386.deb/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-vlc_3.1.5-1_amd64.deb/download[amd64]\}.deb::
-Linux binary of the VLC plugin.
-
-asap-vlc-3.1.5-1.\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-vlc-3.1.5-1.i386.rpm/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-vlc-3.1.5-1.x86_64.rpm/download[x86_64]\}.rpm::
-Linux binary of the VLC plugin.
-
-asap-dev_3.1.5-1_\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-dev_3.1.5-1_i386.deb/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-dev_3.1.5-1_amd64.deb/download[amd64]\}.deb::
-Linux library for embedding ASAP in other applications.
-
-asap-devel-3.1.5-1.\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-devel-3.1.5-1.i386.rpm/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-devel-3.1.5-1.x86_64.rpm/download[x86_64]\}.rpm::
-Linux library for embedding ASAP in other applications.
-
-asap-xmms-3.1.5-1.\{http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-xmms-3.1.5-1.i386.rpm/download[i386],http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-xmms-3.1.5-1.x86_64.rpm/download[x86_64]\}.rpm::
-Linux binary of the XMMS plugin.
-
-http://sourceforge.net/projects/asap/files/asap/3.1.5/asap-3.1.5.tar.gz/download[asap-3.1.5.tar.gz]::
-Full source code (use for the Audacious plugin on Linux).
-
-All released files are available http://sourceforge.net/projects/asap/files/asap/[here].
-
-endif::asapwww[]
-
-Input formats
--------------
-
-ASAP supports the following file formats:
-
-SAP (Slight Atari Player)::
-Designed for playing Atari 8-bit music on PCs.
-All other formats can be converted to SAP.
-http://asma.atari.org/[Atari SAP Music Archive (ASMA)]
-is a single big collection of SAP files.
-
-CMC (Chaos Music Composer)::
-Atari music editor from early 1990s.
-
-CM3 (CMC "3/4")::
-CMC with modified pattern length.
-
-CMR (CMC "Rzog")::
-CMC with modified bass sounds.
-
-CMS (Stereo Double CMC)::
-Stereo CMC.
-
-DMC (DoublePlay CMC)::
-CMC with 6502 routine executed at double rate of the original CMC.
-
-DLT (Delta Music Composer)::
-Atari music editor from 1990s.
-
-FC (Future Composer)::
-Atari music editor from 1990s.
-
-MPT (Music ProTracker)::
-Atari music editor from 1990s.
-
-MPD (MPT DoublePlay)::
-MPT with 6502 routine executed at double rate of the original MPT.
-
-RMT (http://raster.infos.cz/atari/rmt/rmt.htm[Raster Music Tracker])::
-Modern Atari music editor running on Windows.
-
-TMC, TM8 (http://jaskier.atari8.info/[Theta Music Composer] 1.x)::
-Atari music editor from late 1990s.
-The two file extensions are treated identically and played in stereo.
-TM8 means it's stereo (8-channel) music while TMC can be either mono or stereo.
-
-TM2 (http://jaskier.atari8.info/[Theta Music Composer] 2.x)::
-Modern Atari music editor.
-
-STIL (SAP Tune Information List)::
-This isn't a music format.
-It's a text file that contains cover information and comments for many music files.
-This format is identical to http://www.hvsc.de/download/C64Music/DOCUMENTS/STIL.faq[C64 STIL].
-`STIL.txt` is distributed with ASMA (see above).
-
-You can find some example files in http://asap.sourceforge.net/examples.zip[examples.zip].
-
-For viewing Atari pictures check out our sister project http://fail.sourceforge.net[FAIL].
-
-Ports
------
-
-ASAP runs on Windows, Linux, in web browsers and mobile devices.
-This remarkable portability is possible thanks to the http://cito.sourceforge.net[Ć programming language].
-
-ASAP includes the following programs:
-
-- plugins for Windows/Linux players: http://audacious-media-player.org/[Audacious], http://www.videolan.org/vlc/[VLC], http://xbmc.org/[XBMC], http://gstreamer.freedesktop.org/[GStreamer]
-- plugins for Windows players: http://www.microsoft.com/windows/windowsmedia/player/[Windows Media Player], http://www.winamp.com/[Winamp], http://foobar2000.org/[foobar2000], http://www.un4seen.com/xmplay.html[XMPlay], http://koti.welho.com/hylinen/apollo/[Apollo], http://hp.vector.co.jp/authors/VA032810/[GSPlayer]
-- plugins for Linux players: http://xmms.org/[XMMS], http://moc.daper.net/[MOC]
-- add-on for Windows library http://www.un4seen.com/bass.html[BASS] (for http://www.aimp.ru/[AIMP] and http://www.un4seen.com/bass_showcase.php[other players])
-- asapconv - portable command-line converter
-- WASAP - tiny player for Windows (desktop and mobile)
-- POKEY sound emulation DLL for http://raster.infos.cz/atari/rmt/rmt.htm[Raster Music Tracker]
-- Windows Explorer extension - shows and edits metadata
-- AIRASAP - simple desktop player in the http://www.adobe.com/products/air/[Adobe AIR] technology
-- AndroidASAP - player for mobile devices
-- Java midlet - player for mobile phones
-- Flash player - for web pages {asapwww?(see link:flash.html[online demo])}
-- Java applet - for web pages {asapwww?(see link:applet.html[online demo])}
-- JavaScript player - for web pages {asapwww?(see link:javascript.html[online demo])}
-- http://www.silverlight.net/[Silverlight] player - for web pages {asapwww?(see link:silverlight.html[online demo])}
-- MetroASAP - experimental player for Windows 8
-- ASAP2WAV - command-line converters to WAV files implemented in Java, C#, JavaScript, Perl and http://dlang.org/[D]
-- simple command-line players implemented in C/SDL, C# and D
-
-{asapports}link:PORTS.xml[This table] summarizes differences between the above versions.
-
-To play the music on an Atari 8-bit, convert the music to an Atari program (XEX) using asapconv, WASAP, Winamp, Apollo or XMPlay.
-
-There are other projects which use ASAP:
-
-- http://mmsap.sourceforge.net/[mmSAP 2] - standalone player for GNU/Linux with GTK+ user interface
-- http://www.rockbox.org/[Rockbox] - open source firmware for MP3 players
-- http://bzrplayer.blazer.nu[BZR Player] - player for Windows
-- Game Music Gear MX - player for PlayStation Portable
-- http://yoyofr.blogspot.com/p/modizer.html[Modizer] - player for iPhone, iPod and iPad
-- http://www.chipamp.org/[Chipamp] - bundle of plugins for Winamp
-- http://atari-sounds.fatmagnus.ppa.pl/[Atari Sounds For The Masses] - GUI frontend to asapconv for Mac OS X
-- http://dangerousprototypes.com/forum/viewtopic.php?t=3944[Atari POKEY 8-bit Computer Sound on PIC32] - ASAP on a microcontroller
-- http://mxplay.atari.org/[mxPlay] - audio player for Atari Falcon
-
-ifdef::asapsrc[]
-include::INSTALL[]
-endif::asapsrc[]
-
-ifdef::asapjava[]
-include::java/USAGE[]
-endif::asapjava[]
-
-ifdef::asapjavascript[]
-include::javascript/USAGE[]
-endif::asapjavascript[]
-
-ifdef::asapweb[]
-include::USAGE-WEB[]
-endif::asapweb[]
-
-ifdef::asapwin[]
-include::win32/USAGE[]
-endif::asapwin[]
-
-ifdef::asapwince[]
-include::win32/wince/USAGE[]
-endif::asapwince[]
-
-include::CREDITS[]
-
-
-Feedback
---------
-
-If you are interested in the ASAP project, please subscribe its
-https://lists.sourceforge.net/lists/listinfo/asap-users[mailing list].
-This list is for users and developers.
-Once you subscribe, you can post comments, ideas and questions about ASAP.
-They will be answered ASAP. ;-)
-
-Use http://sourceforge.net/p/asap/_list/tickets[tracker]
-to submit bug reports, feature requests and small code patches.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/README.html kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/README.html
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/README.html	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/README.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,1557 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
-<meta name="generator" content="AsciiDoc 8.6.3"/>
-<title>ASAP - Another Slight Atari Player</title>
-<style type="text/css">
-/* Sans-serif font. */
-h1, h2, h3, h4, h5, h6,
-div.title, caption.title,
-thead, p.table.header,
-div#toctitle,
-span#author, span#revnumber, span#revdate, span#revremark,
-div#footer {
-  font-family: Arial,Helvetica,sans-serif;
-}
-
-/* Serif font. */
-div.sectionbody {
-  font-family: Georgia,"Times New Roman",Times,serif;
-}
-
-/* Monospace font. */
-tt {
-  font-size: inherit;
-}
-
-body {
-  margin: 1em 5% 1em 5%;
-}
-
-a {
-  color: blue;
-  text-decoration: underline;
-}
-a:visited {
-  color: fuchsia;
-}
-
-em {
-  font-style: italic;
-  color: navy;
-}
-
-strong {
-  font-weight: bold;
-  color: #083194;
-}
-
-tt {
-  font-size: inherit;
-  color: navy;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  color: #c02020;
-  margin-top: 1.2em;
-  margin-bottom: 0.5em;
-  line-height: 1.3;
-}
-
-h1, h2, h3 {
-  border-bottom: 2px solid silver;
-}
-h2 {
-  padding-top: 0.5em;
-}
-h3 {
-  float: left;
-}
-h3 + * {
-  clear: left;
-}
-
-div.sectionbody {
-  margin-left: 0;
-}
-
-hr {
-  border: 1px solid silver;
-}
-
-p {
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-}
-
-ul, ol, li &gt; p {
-  margin-top: 0;
-}
-ul &gt; li     { color: #aaa; }
-ul &gt; li &gt; * { color: black; }
-
-pre {
-  padding: 0;
-  margin: 0;
-}
-
-span#author {
-  color: #c02020;
-  font-weight: bold;
-  font-size: 1.1em;
-}
-span#email {
-}
-span#revnumber, span#revdate, span#revremark {
-}
-
-div#footer {
-  font-size: small;
-  border-top: 2px solid silver;
-  padding-top: 0.5em;
-  margin-top: 4.0em;
-}
-div#footer-text {
-  float: left;
-  padding-bottom: 0.5em;
-}
-div#footer-badges {
-  float: right;
-  padding-bottom: 0.5em;
-}
-
-div#preamble {
-  margin-top: 1.5em;
-  margin-bottom: 1.5em;
-}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
-div.admonitionblock {
-  margin-top: 1.0em;
-  margin-bottom: 1.5em;
-}
-div.admonitionblock {
-  margin-top: 2.0em;
-  margin-bottom: 2.0em;
-  margin-right: 10%;
-  color: #606060;
-}
-
-div.content { /* Block element content. */
-  padding: 0;
-}
-
-/* Block element titles. */
-div.title, caption.title {
-  color: #c02020;
-  font-weight: bold;
-  text-align: left;
-  margin-top: 1.0em;
-  margin-bottom: 0.5em;
-}
-div.title + * {
-  margin-top: 0;
-}
-
-td div.title:first-child {
-  margin-top: 0.0em;
-}
-div.content div.title:first-child {
-  margin-top: 0.0em;
-}
-div.content + div.title {
-  margin-top: 0.0em;
-}
-
-div.sidebarblock &gt; div.content {
-  background: #ffffee;
-  border: 1px solid #dddddd;
-  border-left: 4px solid #f0f0f0;
-  padding: 0.5em;
-}
-
-div.listingblock &gt; div.content {
-  border: 1px solid #dddddd;
-  border-left: 5px solid #f0f0f0;
-  background: #f8f8f8;
-  padding: 0.5em;
-}
-
-div.quoteblock, div.verseblock {
-  padding-left: 1.0em;
-  margin-left: 1.0em;
-  margin-right: 10%;
-  border-left: 5px solid #f0f0f0;
-  color: #777777;
-}
-
-div.quoteblock &gt; div.attribution {
-  padding-top: 0.5em;
-  text-align: right;
-}
-
-div.verseblock &gt; pre.content {
-  font-family: inherit;
-  font-size: inherit;
-}
-div.verseblock &gt; div.attribution {
-  padding-top: 0.75em;
-  text-align: left;
-}
-/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
-div.verseblock + div.attribution {
-  text-align: left;
-}
-
-div.admonitionblock .icon {
-  vertical-align: top;
-  font-size: 1.1em;
-  font-weight: bold;
-  text-decoration: underline;
-  color: #c02020;
-  padding-right: 0.5em;
-}
-div.admonitionblock td.content {
-  padding-left: 0.5em;
-  border-left: 3px solid #dddddd;
-}
-
-div.exampleblock &gt; div.content {
-  border-left: 3px solid #dddddd;
-  padding-left: 0.5em;
-}
-
-div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
-a.image:visited { color: white; }
-
-dl {
-  margin-top: 0.8em;
-  margin-bottom: 0.8em;
-}
-dt {
-  margin-top: 0.5em;
-  margin-bottom: 0;
-  font-style: normal;
-  color: navy;
-}
-dd &gt; *:first-child {
-  margin-top: 0.1em;
-}
-
-ul, ol {
-    list-style-position: outside;
-}
-ol.arabic {
-  list-style-type: decimal;
-}
-ol.loweralpha {
-  list-style-type: lower-alpha;
-}
-ol.upperalpha {
-  list-style-type: upper-alpha;
-}
-ol.lowerroman {
-  list-style-type: lower-roman;
-}
-ol.upperroman {
-  list-style-type: upper-roman;
-}
-
-div.compact ul, div.compact ol,
-div.compact p, div.compact p,
-div.compact div, div.compact div {
-  margin-top: 0.1em;
-  margin-bottom: 0.1em;
-}
-
-div.tableblock &gt; table {
-  border: 3px solid #c02020;
-}
-thead, p.table.header {
-  font-weight: bold;
-  color: #c02020;
-}
-tfoot {
-  font-weight: bold;
-}
-td &gt; div.verse {
-  white-space: pre;
-}
-p.table {
-  margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock &gt; table[frame="void"] {
-  border-style: none;
-}
-div.tableblock &gt; table[frame="hsides"] {
-  border-left-style: none;
-  border-right-style: none;
-}
-div.tableblock &gt; table[frame="vsides"] {
-  border-top-style: none;
-  border-bottom-style: none;
-}
-
-
-div.hdlist {
-  margin-top: 0.8em;
-  margin-bottom: 0.8em;
-}
-div.hdlist tr {
-  padding-bottom: 15px;
-}
-dt.hdlist1.strong, td.hdlist1.strong {
-  font-weight: bold;
-}
-td.hdlist1 {
-  vertical-align: top;
-  font-style: normal;
-  padding-right: 0.8em;
-  color: navy;
-}
-td.hdlist2 {
-  vertical-align: top;
-}
-div.hdlist.compact tr {
-  margin: 0;
-  padding-bottom: 0;
-}
-
-.comment {
-  background: yellow;
-}
-
-.footnote, .footnoteref {
-  font-size: 0.8em;
-}
-
-span.footnote, span.footnoteref {
-  vertical-align: super;
-}
-
-#footnotes {
-  margin: 20px 0 20px 0;
-  padding: 7px 0 0 0;
-}
-
-#footnotes div.footnote {
-  margin: 0 0 5px 0;
-}
-
-#footnotes hr {
-  border: none;
-  border-top: 1px solid silver;
-  height: 1px;
-  text-align: left;
-  margin-left: 0;
-  width: 20%;
-  min-width: 100px;
-}
-
-div.colist td {
-  padding-right: 0.5em;
-  padding-bottom: 0.3em;
-  vertical-align: top;
-}
-div.colist td img {
-  margin-top: 0.3em;
-}
-
-@media print {
-  div#footer-badges { display: none; }
-}
-
-div#toc {
-  margin-bottom: 2.5em;
-}
-
-div#toctitle {
-  color: #c02020;
-  font-size: 1.1em;
-  font-weight: bold;
-  margin-top: 1.0em;
-  margin-bottom: 0.1em;
-}
-
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-div.toclevel2 {
-  margin-left: 2em;
-  font-size: 0.9em;
-}
-div.toclevel3 {
-  margin-left: 4em;
-  font-size: 0.9em;
-}
-div.toclevel4 {
-  margin-left: 6em;
-  font-size: 0.9em;
-}
-
-</style>
-<script type="text/javascript">
-/*<![CDATA[*/
-window.onload = function(){asciidoc.footnotes(); asciidoc.toc(2);}
-var asciidoc = {  // Namespace.
-
-/////////////////////////////////////////////////////////////////////
-// Table Of Contents generator
-/////////////////////////////////////////////////////////////////////
-
-/* Author: Mihai Bazon, September 2002
- * http://students.infoiasi.ro/~mishoo
- *
- * Table Of Content generator
- * Version: 0.4
- *
- * Feel free to use this script under the terms of the GNU General Public
- * License, as long as you do not remove or alter this notice.
- */
-
- /* modified by Troy D. Hanson, September 2006. License: GPL */
- /* modified by Stuart Rackham, 2006, 2009. License: GPL */
-
-// toclevels = 1..4.
-toc: function (toclevels) {
-
-  function getText(el) {
-    var text = "";
-    for (var i = el.firstChild; i != null; i = i.nextSibling) {
-      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
-        text += i.data;
-      else if (i.firstChild != null)
-        text += getText(i);
-    }
-    return text;
-  }
-
-  function TocEntry(el, text, toclevel) {
-    this.element = el;
-    this.text = text;
-    this.toclevel = toclevel;
-  }
-
-  function tocEntries(el, toclevels) {
-    var result = new Array;
-    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
-    // Function that scans the DOM tree for header elements (the DOM2
-    // nodeIterator API would be a better technique but not supported by all
-    // browsers).
-    var iterate = function (el) {
-      for (var i = el.firstChild; i != null; i = i.nextSibling) {
-        if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
-          var mo = re.exec(i.tagName);
-          if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
-            result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
-          }
-          iterate(i);
-        }
-      }
-    }
-    iterate(el);
-    return result;
-  }
-
-  var toc = document.getElementById("toc");
-  var entries = tocEntries(document.getElementById("content"), toclevels);
-  for (var i = 0; i < entries.length; ++i) {
-    var entry = entries[i];
-    if (entry.element.id == "")
-      entry.element.id = "_toc_" + i;
-    var a = document.createElement("a");
-    a.href = "#" + entry.element.id;
-    a.appendChild(document.createTextNode(entry.text));
-    var div = document.createElement("div");
-    div.appendChild(a);
-    div.className = "toclevel" + entry.toclevel;
-    toc.appendChild(div);
-  }
-  if (entries.length == 0)
-    toc.parentNode.removeChild(toc);
-},
-
-
-/////////////////////////////////////////////////////////////////////
-// Footnotes generator
-/////////////////////////////////////////////////////////////////////
-
-/* Based on footnote generation code from:
- * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
- */
-
-footnotes: function () {
-  var cont = document.getElementById("content");
-  var noteholder = document.getElementById("footnotes");
-  var spans = cont.getElementsByTagName("span");
-  var refs = {};
-  var n = 0;
-  for (i=0; i<spans.length; i++) {
-    if (spans[i].className == "footnote") {
-      n++;
-      // Use [\s\S] in place of . so multi-line matches work.
-      // Because JavaScript has no s (dotall) regex flag.
-      note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
-      noteholder.innerHTML +=
-        "<div class='footnote' id='_footnote_" + n + "'>" +
-        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
-        n + "</a>. " + note + "</div>";
-      spans[i].innerHTML =
-        "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
-        "' title='View footnote' class='footnote'>" + n + "</a>]";
-      var id =spans[i].getAttribute("id");
-      if (id != null) refs["#"+id] = n;
-    }
-  }
-  if (n == 0)
-    noteholder.parentNode.removeChild(noteholder);
-  else {
-    // Process footnoterefs.
-    for (i=0; i<spans.length; i++) {
-      if (spans[i].className == "footnoteref") {
-        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
-        href = href.match(/#.*/)[0];  // Because IE return full URL.
-        n = refs[href];
-        spans[i].innerHTML =
-          "[<a href='#_footnote_" + n +
-          "' title='View footnote' class='footnote'>" + n + "</a>]";
-      }
-    }
-  }
-}
-
-}
-/*]]>*/
-</script>
-</head>
-<body class="article">
-<div id="header">
-<h1>ASAP - Another Slight Atari Player</h1>
-<div id="toc">
-  <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
-</div>
-</div>
-<div id="content">
-<div id="preamble">
-<div class="sectionbody">
-<div class="paragraph"><p>ASAP is a player of <a href="http://en.wikipedia.org/wiki/Atari_8-bit_family">Atari 8-bit</a>
-music for modern computers and mobile devices.
-It emulates the <a href="http://en.wikipedia.org/wiki/POKEY">POKEY sound chip</a>
-and the <a href="http://en.wikipedia.org/wiki/6502">6502 processor</a>.
-The project was initially based on the routines from the
-<a href="http://atari800.sourceforge.net/">Atari800 emulator</a>,
-but the current version has original emulation core.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_input_formats">Input formats</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>ASAP supports the following file formats:</p></div>
-<div class="dlist compact"><dl>
-<dt class="hdlist1">
-SAP (Slight Atari Player)
-</dt>
-<dd>
-<p>
-Designed for playing Atari 8-bit music on PCs.
-All other formats can be converted to SAP.
-<a href="http://asma.atari.org/">Atari SAP Music Archive (ASMA)</a>
-is a single big collection of SAP files.
-</p>
-</dd>
-<dt class="hdlist1">
-CMC (Chaos Music Composer)
-</dt>
-<dd>
-<p>
-Atari music editor from early 1990s.
-</p>
-</dd>
-<dt class="hdlist1">
-CM3 (CMC "3/4")
-</dt>
-<dd>
-<p>
-CMC with modified pattern length.
-</p>
-</dd>
-<dt class="hdlist1">
-CMR (CMC "Rzog")
-</dt>
-<dd>
-<p>
-CMC with modified bass sounds.
-</p>
-</dd>
-<dt class="hdlist1">
-CMS (Stereo Double CMC)
-</dt>
-<dd>
-<p>
-Stereo CMC.
-</p>
-</dd>
-<dt class="hdlist1">
-DMC (DoublePlay CMC)
-</dt>
-<dd>
-<p>
-CMC with 6502 routine executed at double rate of the original CMC.
-</p>
-</dd>
-<dt class="hdlist1">
-DLT (Delta Music Composer)
-</dt>
-<dd>
-<p>
-Atari music editor from 1990s.
-</p>
-</dd>
-<dt class="hdlist1">
-FC (Future Composer)
-</dt>
-<dd>
-<p>
-Atari music editor from 1990s.
-</p>
-</dd>
-<dt class="hdlist1">
-MPT (Music ProTracker)
-</dt>
-<dd>
-<p>
-Atari music editor from 1990s.
-</p>
-</dd>
-<dt class="hdlist1">
-MPD (MPT DoublePlay)
-</dt>
-<dd>
-<p>
-MPT with 6502 routine executed at double rate of the original MPT.
-</p>
-</dd>
-<dt class="hdlist1">
-RMT (<a href="http://raster.infos.cz/atari/rmt/rmt.htm">Raster Music Tracker</a>)
-</dt>
-<dd>
-<p>
-Modern Atari music editor running on Windows.
-</p>
-</dd>
-<dt class="hdlist1">
-TMC, TM8 (<a href="http://jaskier.atari8.info/">Theta Music Composer</a> 1.x)
-</dt>
-<dd>
-<p>
-Atari music editor from late 1990s.
-The two file extensions are treated identically and played in stereo.
-TM8 means it&#x2019;s stereo (8-channel) music while TMC can be either mono or stereo.
-</p>
-</dd>
-<dt class="hdlist1">
-TM2 (<a href="http://jaskier.atari8.info/">Theta Music Composer</a> 2.x)
-</dt>
-<dd>
-<p>
-Modern Atari music editor.
-</p>
-</dd>
-<dt class="hdlist1">
-STIL (SAP Tune Information List)
-</dt>
-<dd>
-<p>
-This isn&#x2019;t a music format.
-It&#x2019;s a text file that contains cover information and comments for many music files.
-This format is identical to <a href="http://www.hvsc.de/download/C64Music/DOCUMENTS/STIL.faq">C64 STIL</a>.
-<tt>STIL.txt</tt> is distributed with ASMA (see above).
-</p>
-</dd>
-</dl></div>
-<div class="paragraph"><p>You can find some example files in <a href="http://asap.sourceforge.net/examples.zip">examples.zip</a>.</p></div>
-<div class="paragraph"><p>For viewing Atari pictures check out our sister project <a href="http://fail.sourceforge.net">FAIL</a>.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ports">Ports</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>ASAP runs on Windows, Linux, in web browsers and mobile devices.
-This remarkable portability is possible thanks to the <a href="http://cito.sourceforge.net">&#x106; programming language</a>.</p></div>
-<div class="paragraph"><p>ASAP includes the following programs:</p></div>
-<div class="ulist compact"><ul>
-<li>
-<p>
-plugins for Windows/Linux players: <a href="http://audacious-media-player.org/">Audacious</a>, <a href="http://www.videolan.org/vlc/">VLC</a>, <a href="http://xbmc.org/">XBMC</a>, <a href="http://gstreamer.freedesktop.org/">GStreamer</a>
-</p>
-</li>
-<li>
-<p>
-plugins for Windows players: <a href="http://www.microsoft.com/windows/windowsmedia/player/">Windows Media Player</a>, <a href="http://www.winamp.com/">Winamp</a>, <a href="http://foobar2000.org/">foobar2000</a>, <a href="http://www.un4seen.com/xmplay.html">XMPlay</a>, <a href="http://koti.welho.com/hylinen/apollo/">Apollo</a>, <a href="http://hp.vector.co.jp/authors/VA032810/">GSPlayer</a>
-</p>
-</li>
-<li>
-<p>
-plugins for Linux players: <a href="http://xmms.org/">XMMS</a>, <a href="http://moc.daper.net/">MOC</a>
-</p>
-</li>
-<li>
-<p>
-add-on for Windows library <a href="http://www.un4seen.com/bass.html">BASS</a> (for <a href="http://www.aimp.ru/">AIMP</a> and <a href="http://www.un4seen.com/bass_showcase.php">other players</a>)
-</p>
-</li>
-<li>
-<p>
-asapconv - portable command-line converter
-</p>
-</li>
-<li>
-<p>
-WASAP - tiny player for Windows (desktop and mobile)
-</p>
-</li>
-<li>
-<p>
-POKEY sound emulation DLL for <a href="http://raster.infos.cz/atari/rmt/rmt.htm">Raster Music Tracker</a>
-</p>
-</li>
-<li>
-<p>
-Windows Explorer extension - shows and edits metadata
-</p>
-</li>
-<li>
-<p>
-AIRASAP - simple desktop player in the <a href="http://www.adobe.com/products/air/">Adobe AIR</a> technology
-</p>
-</li>
-<li>
-<p>
-AndroidASAP - player for mobile devices
-</p>
-</li>
-<li>
-<p>
-Java midlet - player for mobile phones
-</p>
-</li>
-<li>
-<p>
-Flash player - for web pages 
-</p>
-</li>
-<li>
-<p>
-Java applet - for web pages 
-</p>
-</li>
-<li>
-<p>
-JavaScript player - for web pages 
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.silverlight.net/">Silverlight</a> player - for web pages 
-</p>
-</li>
-<li>
-<p>
-MetroASAP - experimental player for Windows 8
-</p>
-</li>
-<li>
-<p>
-ASAP2WAV - command-line converters to WAV files implemented in Java, C#, JavaScript, Perl and <a href="http://dlang.org/">D</a>
-</p>
-</li>
-<li>
-<p>
-simple command-line players implemented in C/SDL, C# and D
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><a href="PORTS.xml">This table</a> summarizes differences between the above versions.</p></div>
-<div class="paragraph"><p>To play the music on an Atari 8-bit, convert the music to an Atari program (XEX) using asapconv, WASAP, Winamp, Apollo or XMPlay.</p></div>
-<div class="paragraph"><p>There are other projects which use ASAP:</p></div>
-<div class="ulist compact"><ul>
-<li>
-<p>
-<a href="http://mmsap.sourceforge.net/">mmSAP 2</a> - standalone player for GNU/Linux with GTK+ user interface
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rockbox.org/">Rockbox</a> - open source firmware for MP3 players
-</p>
-</li>
-<li>
-<p>
-<a href="http://bzrplayer.blazer.nu">BZR Player</a> - player for Windows
-</p>
-</li>
-<li>
-<p>
-Game Music Gear MX - player for PlayStation Portable
-</p>
-</li>
-<li>
-<p>
-<a href="http://yoyofr.blogspot.com/p/modizer.html">Modizer</a> - player for iPhone, iPod and iPad
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.chipamp.org/">Chipamp</a> - bundle of plugins for Winamp
-</p>
-</li>
-<li>
-<p>
-<a href="http://atari-sounds.fatmagnus.ppa.pl/">Atari Sounds For The Masses</a> - GUI frontend to asapconv for Mac OS X
-</p>
-</li>
-<li>
-<p>
-<a href="http://dangerousprototypes.com/forum/viewtopic.php?t=3944">Atari POKEY 8-bit Computer Sound on PIC32</a> - ASAP on a microcontroller
-</p>
-</li>
-<li>
-<p>
-<a href="http://mxplay.atari.org/">mxPlay</a> - audio player for Atari Falcon
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_asapconv">Using asapconv</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Run the program from the command line to see the syntax.
-The <tt>-o</tt>/<tt>--output</tt> option selects the output format and is mandatory.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_using_libasap">Using libasap</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The library is documented in the <tt>asap.h</tt> header file.
-Be warned there might be breaking changes in the future versions of the library.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_compilation_instructions">Compilation instructions</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_required_tools">Required tools</h3>
-<div class="paragraph"><p>For all builds you will need:</p></div>
-<div class="dlist compact"><dl>
-<dt class="hdlist1">
-GNU Make
-</dt>
-<dd>
-<p>
-On Linux this program is called <tt>make</tt>. On other systems it may be called <tt>gmake</tt>
-(if this is the case, type <tt>gmake</tt> instead of <tt>make</tt> in the following instructions).
-On Windows you may install GNU Make from <a href="http://cygwin.com/">Cygwin</a> or <a href="http://www.mingw.org/">MinGW</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-Standard Unix tools
-</dt>
-<dd>
-<p>
-I mean <tt>sh</tt>, <tt>cat</tt>, <tt>cp</tt>, <tt>rm</tt>, <tt>mkdir</tt>. On Windows you can find them in Cygwin.
-</p>
-</dd>
-<dt class="hdlist1">
-xasm and MADS
-</dt>
-<dd>
-<p>
-If you are compiling latest source code from Git, install
-<a href="http://xasm.atari.org/">xasm</a> and <a href="http://mads.atari8.info/">MADS</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-&#x106; Translator
-</dt>
-<dd>
-<p>
-The core of ASAP is written in the &#x106; programming language.
-You&#x2019;ll need <a href="http://cito.sourceforge.net">cito</a>.
-For your convenience, this is not needed for most of the C and C++ ports.
-</p>
-</dd>
-</dl></div>
-<div class="paragraph"><p>Make sure these tools are on your <tt>PATH</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_getting_officially_released_source_code">Getting officially released source code</h3>
-<div class="paragraph"><p>If you want to compile an official release of ASAP, download a source distribution
-(<tt>asap-*.tar.gz</tt>) and uncompress it to a directory of your choice.</p></div>
-<div class="paragraph"><p>On Unix-like systems:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>tar zxf asap-*.tar.gz</tt></pre>
-</div></div>
-<div class="paragraph"><p>On Windows you may use <a href="http://7-zip.org/">7-Zip</a>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_getting_latest_source_code">Getting latest source code</h3>
-<div class="paragraph"><p>Alternatively you may get the latest version from the Git repository.
-To do this using a command-line Git client:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>git clone git://git.code.sf.net/p/asap/code asap-code</tt></pre>
-</div></div>
-<div class="paragraph"><p>This will fetch the latest code into a new directory called <tt>asap-code</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_asapconv_and_libasap_on_unix_like_systems">Building asapconv and libasap on Unix-like systems</h3>
-<div class="paragraph"><p>From your shell prompt navigate to the directory which contains <tt>asap.c</tt>.</p></div>
-<div class="paragraph"><p>To compile and install, run the following commands:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make
-sudo make install</tt></pre>
-</div></div>
-<div class="paragraph"><p>The latter command installs the command-line converter and the C library
-in <tt>/usr/local</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_audacious_plugin_on_unix_like_systems">Building the Audacious plugin on Unix-like systems</h3>
-<div class="paragraph"><p>Install <tt>audacious-dev</tt> or <tt>audacious-devel</tt>.
-To compile, run the following command:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-audacious</tt></pre>
-</div></div>
-<div class="paragraph"><p>To install:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sudo make install-audacious</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_gstreamer_plugin_on_unix_like_systems">Building the GStreamer plugin on Unix-like systems</h3>
-<div class="paragraph"><p>To compile, run the following command:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-gstreamer</tt></pre>
-</div></div>
-<div class="paragraph"><p>To install in <tt>/usr/lib/gstreamer-0.10</tt>:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sudo make install-gstreamer</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_moc_plugin_on_unix_like_systems">Building the MOC plugin on Unix-like systems</h3>
-<div class="paragraph"><p>You need source code of MOC. The plugin is compatible with MOC 2.4.x
-and MOC 2.5.0 alpha.</p></div>
-<div class="paragraph"><p>Check <tt>MOC_INCLUDE</tt> and <tt>MOC_PLUGIN_DIR</tt> in the <tt>moc/moc.mk</tt> file.
-These should be the directory with MOC sources
-and the directory with the installed MOC plugins, respectively.</p></div>
-<div class="paragraph"><p>If the defaults are correct, use the following commands:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-moc
-sudo make install-moc</tt></pre>
-</div></div>
-<div class="paragraph"><p>If you need to specify different directories, use:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-moc MOC_INCLUDE=path/to/moc/sources
-sudo make install-moc MOC_PLUGIN_DIR=/path/to/moc/plugins</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_vlc_plugin_on_linux">Building the VLC plugin on Linux</h3>
-<div class="paragraph"><p>Install <tt>vlc-devel</tt>. Verify paths at the top of <tt>vlc/vlc.mk</tt>.
-To compile, run the following command:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-vlc</tt></pre>
-</div></div>
-<div class="paragraph"><p>To install:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sudo make install-vlc</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_vlc_plugin_on_os_x">Building the VLC plugin on OS X</h3>
-<div class="paragraph"><p>Install Xcode Command Line Tools.</p></div>
-<div class="paragraph"><p>You need <tt>vlc_plugin.h</tt> and other header files.
-Unfortunately they are not installed with the VLC on Mac.
-You can find them in VLC source code. I copied them from my Windows VLC
-(<tt>C:\Program Files (x86)\VideoLAN\VLC\sdk\include\vlc\plugins</tt>). ;)
-Make sure <tt>VLC_OSX_CFLAGS</tt> in <tt>vlc/vlc.mk</tt> points to the directory
-with these header files.</p></div>
-<div class="paragraph"><p>To compile, run the following command:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-vlc-osx</tt></pre>
-</div></div>
-<div class="paragraph"><p>To install:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make install-vlc-osx</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_xbmc_plugin_on_linux">Building the XBMC plugin on Linux</h3>
-<div class="paragraph"><p>You need source code of the Linux port of XBMC.</p></div>
-<div class="paragraph"><p>Run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-xbmc XBMC_DLL_LOADER_EXPORTS=path/to/dir/in/xbmc/sources</tt></pre>
-</div></div>
-<div class="paragraph"><p><tt>XBMC_DLL_LOADER_EXPORTS</tt> must point to the directory in XBMC sources
-which contains <tt>wrapper.def</tt> and <tt>wrapper.o</tt>.
-You should get <tt>xbmc_asap-i486-linux.so</tt>.</p></div>
-<div class="paragraph"><p>Recently I wasn&#x2019;t able to enable the ASAP plugin in XBMC.
-This seems to be an XBMC issue.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_xmms_plugin_on_unix_like_systems">Building the XMMS plugin on Unix-like systems</h3>
-<div class="paragraph"><p>You need <tt>xmms</tt> and <tt>xmms-devel</tt> packages.</p></div>
-<div class="paragraph"><p>To compile, run the following command:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make asap-xmms</tt></pre>
-</div></div>
-<div class="paragraph"><p>If the compilation finished successfully, you can install the plugin
-in your home directory:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make install-xmms-user</tt></pre>
-</div></div>
-<div class="paragraph"><p>or for all users:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sudo make install-xmms</tt></pre>
-</div></div>
-<div class="paragraph"><p>If you have another XMMS plugin that supports Atari 8-bit music,
-remove it in order to avoid conflicts.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_asapconv_wasap_winamp_gsplayer_apollo_xmplay_bass_plugins_rmt_dll_asapscan_shell_extension_and_libasap_on_windows">Building asapconv, WASAP, Winamp/GSPlayer/Apollo/XMPlay/BASS plugins, RMT DLL, asapscan, shell extension and libasap on Windows</h3>
-<div class="paragraph"><p>Install the C and C++ compilers from <a href="http://www.mingw.org/">MinGW</a>.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make mingw</tt></pre>
-</div></div>
-<div class="paragraph"><p>You should get <tt>asapconv.exe</tt>, <tt>wasap.exe</tt>, <tt>in_asap.dll</tt>, <tt>gspasap.dll</tt>,
-<tt>ASAP_Apollo.dll</tt>, <tt>xmp-asap.dll</tt>, <tt>bass_asap.dll</tt>, <tt>apokeysnd.dll</tt>,
-<tt>asapscan.exe</tt>, <tt>ASAPShellEx.dll</tt> and <tt>libasap.a</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_windows_media_player_plugin_and_asap_lib_on_windows">Building Windows Media Player plugin and asap.lib on Windows</h3>
-<div class="paragraph"><p>You additionally need Windows SDK
-(install native C++ compiler, headers, libraries and samples).
-Set <tt>Path</tt>, <tt>INCLUDE</tt> and <tt>LIB</tt> environment variables
-to point to the right locations in the Windows SDK.
-Make sure <tt>DSHOW_BASECLASSES_DIR</tt> is set correctly in <tt>win32\win32.mk</tt>.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make win32/asap_dsf.dll win32/asap.lib</tt></pre>
-</div></div>
-<div class="paragraph"><p>You will get <tt>asap_dsf.dll</tt> and <tt>asap.lib</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_gstreamer_plugin_on_windows">Building the GStreamer plugin on Windows</h3>
-<div class="paragraph"><p>Install <a href="http://www.gstreamer.com/">GStreamer SDK</a> 32-bit development files.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make win32/libgstasapdec.dll</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_audacious_plugin_on_windows">Building the Audacious plugin on Windows</h3>
-<div class="paragraph"><p>Too bad Audacious doesn&#x2019;t provide an SDK for Windows.</p></div>
-<div class="paragraph"><p>Unpack <a href="http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip">GTK+ 2 bundle</a>
-and make sure <tt>GTK_DIR</tt> in <tt>win32/win32.mk</tt> points to it.</p></div>
-<div class="paragraph"><p>Install Audacious and make sure <tt>AUDACIOUS_LIB</tt> points inside it.</p></div>
-<div class="paragraph"><p>Unpack Audacious source code and make sure <tt>AUDACIOUS_INCLUDE</tt> points inside it.</p></div>
-<div class="paragraph"><p>Now comes the tricky part: configure Audacious for Windows.
-You&#x2019;ll need to install <tt>gettext</tt> and <tt>libgnurx</tt> in MinGW
-(that&#x2019;s probably not an exhaustive list, <tt>configure</tt> will complain about missing things).
-From the Audacious source directory run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>bash configure PKG_CONFIG=../gtk/bin/pkg-config</tt></pre>
-</div></div>
-<div class="paragraph"><p>After it finishes with no errors (warnings are fine), go to ASAP and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make win32/asapplug.dll</tt></pre>
-</div></div>
-<div class="paragraph"><p>Put the DLL in <tt>lib/audacious/Input</tt> of the Windows binary distribution of Audacious.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_foobar2000_plugin_on_windows">Building the foobar2000 plugin on Windows</h3>
-<div class="paragraph"><p>In addition to the common prerequisites and Windows SDK you need
-foobar2000 SDK - extract it to a new directory called
-<tt>foobar2000_SDK</tt> next to (not inside!) the ASAP directory.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make win32/foo_asap.dll</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>foo_asap.dll</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_vlc_plugin_on_windows">Building the VLC plugin on Windows</h3>
-<div class="paragraph"><p>Install VLC as usual, it includes the SDK.
-<tt>VLC_SDK_DIR</tt> in <tt>win32/win32.mk</tt> is fine for the default installation
-directory on 64-bit Windows - edit it if necessary.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make win32/libasap_plugin.dll</tt></pre>
-</div></div>
-<div class="paragraph"><p>You will get <tt>libasap_plugin.dll</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_the_xbmc_plugin_on_windows">Building the XBMC plugin on Windows</h3>
-<div class="paragraph"><p>You need Visual C++ Toolkit (it used to be a free download from Microsoft,
-now search the internet for <tt>VCToolkitSetup.exe</tt>)
-and .NET Framework SDK Version 1.1.
-Microsoft Visual C++ 2003 might work, but wasn&#x2019;t tested.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make win32/xbmc_asap.dll</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>xbmc_asap.dll</tt>, which you can use with XBox
-or Windows version of XBMC. The XBMC must include support for ASAP.</p></div>
-<div class="paragraph"><p>Alternatively, you may use the <tt>build_vctk.bat</tt> script in the <tt>xbmc</tt> directory.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_wasap_gsplayer_and_windows_media_player_plugins_for_windows_ce">Building WASAP, GSPlayer and Windows Media Player plugins for Windows CE</h3>
-<div class="paragraph"><p>For WASAP and GSPlayer plugins you need <a href="http://cegcc.sourceforge.net/">CeGCC</a>.
-For the Windows Media Player plugin you need Visual Studio 2008
-(2005 might work, but wasn&#x2019;t checked, 2010 won&#x2019;t work).</p></div>
-<div class="paragraph"><p>Edit the <tt>WINCE_...</tt> paths at the top of <tt>win32/win32.mk</tt> so that they point to your installed tools.
-Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make wince</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>wasap.exe</tt>, <tt>gspasap.dll</tt> and <tt>asap_dsf.dll</tt>
-in the <tt>win32/wince</tt> directory.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_java_asap2wav_and_java_applet">Building Java ASAP2WAV and Java applet</h3>
-<div class="paragraph"><p>You need Java Development Kit (JDK).</p></div>
-<div class="paragraph"><p>If necessary, edit the paths at the top of <tt>java/java.mk</tt> so that they point to your installed tools.
-Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make java/asap2wav.jar java/asap_applet.jar</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>asap2wav.jar</tt> and <tt>asap_applet.jar</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_java_midlet">Building Java midlet</h3>
-<div class="paragraph"><p>You need a Java ME SDK - I use Oracle Java ME SDK.</p></div>
-<div class="paragraph"><p>Edit the WTK path at the top of <tt>java/j2me/j2me.mk</tt> so that they point to your installed Java ME SDK.
-Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make java/j2me/asap_midlet.jad</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>asap_midlet.jar</tt> and <tt>asap_midlet.jad</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_androidasap">Building AndroidASAP</h3>
-<div class="paragraph"><p>Install <a href="http://developer.android.com/sdk/">Android SDK</a>
-with an Android platform(s) (I compile with 2.2 and test with 1.6).</p></div>
-<div class="paragraph"><p>Edit the paths at the top of <tt>java/android/android.mk</tt> so that they point to your installed SDK.
-Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make android-debug</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>AndroidASAP-debug.apk</tt>.
-AndroidASAP integrates with file managers and the web browser.
-It uses the internet connection only for files clicked in the web browser.
-It reads phone state only to pause playback on incoming phone calls.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_c_asap2wav_asapplay_and_silverasap_on_windows">Building C# ASAP2WAV, asapplay and SilverASAP on Windows</h3>
-<div class="paragraph"><p>You need the .NET Framework, of course.
-For SilverASAP you need Silverlight and 7-Zip.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make csharp</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>asap2wav.exe</tt>, <tt>asapplay.exe</tt> and <tt>SilverASAP.xap</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_metroasap_for_windows_8">Building MetroASAP for Windows 8</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">Windows 8 is not yet generally available and this port is work in progress.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>Install .NET Framework 4.5 (Windows 8 already has it).
-Install Windows SDK for Windows 8 or Visual Studio 2012 (any edition should be fine).
-Verify the paths at the top of <tt>csharp/winrt/winrt.mk</tt>.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make csharp/winrt/MetroASAP.appx</tt></pre>
-</div></div>
-<div class="paragraph"><p>If you&#x2019;re not on Windows 8, the last step (creating the appx) will fail,
-but you&#x2019;ll have the application in the <tt>csharp/winrt/obj</tt> directory.
-Copy it to Windows 8 and install from PowerShell:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Add-AppxPackage AppxManifest.xml -Register</tt></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_building_javascript_command_line_asap2wav_and_the_web_browser_player">Building JavaScript command-line ASAP2WAV and the web browser player</h3>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make javascript</tt></pre>
-</div></div>
-<div class="paragraph"><p><tt>asap2wav.js</tt> is the command-line script.
-<tt>asapweb.js</tt> plus <tt>asap.js</tt> are the browser player (you&#x2019;ll probably need <tt>binaryHttpRequest.js</tt> as well).</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_flash_player_version_of_asap">Building Flash player version of ASAP</h3>
-<div class="paragraph"><p>You need <a href="http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK">Flex SDK</a>.
-Add its <tt>bin</tt> directory to your <tt>PATH</tt>.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make flash/asap.swf</tt></pre>
-</div></div>
-<div class="paragraph"><p>You should get <tt>asap.swf</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_perl_command_line_asap2wav">Building Perl command-line ASAP2WAV</h3>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make perl</tt></pre>
-</div></div>
-<div class="paragraph"><p><tt>asap2wav.pl</tt> is the Perl script which uses the <tt>Asap.pm</tt> module you have just built.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_d_asap2wav_and_asapplay_on_windows_and_linux">Building D ASAP2WAV and asapplay on Windows and Linux</h3>
-<div class="paragraph"><p>You need DMD 2.054 or compatible D compiler.
-To build asapplay on Windows, you need <a href="http://www.dsource.org/projects/bindings/wiki/WindowsApi">D Windows API bindings</a>.
-On Linux, you need ALSA development libraries (e.g. libasound2-dev package in Ubuntu).
-D bindings for ALSA are currently included in ASAP sources.</p></div>
-<div class="paragraph"><p>Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make d</tt></pre>
-</div></div>
-<div class="paragraph"><p>This should produce <tt>asap2wav.exe</tt> and <tt>asapplay.exe</tt>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_building_android_command_line_asapconv">Building Android command-line asapconv</h3>
-<div class="paragraph"><p>You need <a href="http://developer.android.com/tools/sdk/ndk/index.html">Android NDK</a>.</p></div>
-<div class="paragraph"><p>Edit the paths at the top of <tt>java/android/android.mk</tt> so that they point to your installed NDK.
-Open the command prompt in the root directory of ASAP sources and run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>make java/android/asapconv</tt></pre>
-</div></div>
-<div class="paragraph"><p>Now you need to put the binary (<tt>java/android/asapconv</tt>) on your device and make it executable.
-It&#x2019;s not possible on a FAT-formatted SD card. I was able to do that in <tt>/data/local/tmp/</tt>.
-If you use USB debugging, <tt>make android-push-asapconv</tt> will copy the file,
-but you have to do the <tt>chmod</tt> part.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_authors">Authors</h2>
-<div class="sectionbody">
-<div class="hdlist compact"><table>
-<tr>
-<td class="hdlist1">
-Piotr Fusik &lt;<a href="mailto:fox@scene.pl">fox@scene.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Creator and main developer.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Atari800 Emulator Developers (<a href="http://atari800.sourceforge.net">http://atari800.sourceforge.net</a>)
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-6502 and POKEY emulation used in 0.x.y versions of ASAP.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Zdenek Eisenhammer &lt;<a href="mailto:pg@pinknet.cz">pg@pinknet.cz</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Testing.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Jakub Husak &lt;<a href="mailto:jakub.husak@gmail.com">jakub.husak@gmail.com</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-SAP fingerprint calculation. asapscan fixes.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Henryk Karpowicz &lt;<a href="mailto:henkar@poczta.tygrys.net">henkar@poczta.tygrys.net</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-CMC routine modified for the CM3 format.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Maciek Konecki &lt;<a href="mailto:maciusk1@wp.pl">maciusk1@wp.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Porting to C#.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Marek Konopka &lt;<a href="mailto:konop11@poczta.onet.pl">konop11@poczta.onet.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-6502 routine for playing DLT.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Daniel Kozminski &lt;<a href="mailto:daniel.kozminski@gmail.com">daniel.kozminski@gmail.com</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Ideas.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Jerzy Kut &lt;<a href="mailto:mono@atari.pl">mono@atari.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-FC format.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Marcin Lewandowski &lt;<a href="mailto:jaskier@atari8.info">jaskier@atari8.info</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-6502 routines for playing CMC, MPT, TMC and TM2.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Ian Luck &lt;<a href="mailto:il@un4seen.com">il@un4seen.com</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Guided development of XMPlay and BASS plugins.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Adrian Matoga &lt;<a href="mailto:epi@atari8.info">epi@atari8.info</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-COVOX information and test files. Testing. Porting to D.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Perry McFarlane &lt;<a href="mailto:perry_m@fastmail.fm">perry_m@fastmail.fm</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-POKEY reverse-engineering.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Kostas Nakos &lt;<a href="mailto:knakos@gmail.com">knakos@gmail.com</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Windows CE testing.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Mariusz Rozwadowski &lt;<a href="mailto:ramosc64@o2.pl">ramosc64@o2.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Suggested CMS, CM3, DLT and STIL format support.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Slawomir Sledz &lt;<a href="mailto:slaves@scene.pl">slaves@scene.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Windows Mobile setup. Thorough testing.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-David Spilka
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-6502 routine for playing CMS.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Radek Sterba
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-6502 routine for playing RMT.
-Testing.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Lukasz Sychowicz &lt;<a href="mailto:xray@scene.pl">xray@scene.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Windows icons.
-Testing.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Pawel Szewczyk &lt;<a href="mailto:ripek@op.pl">ripek@op.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Windows setup graphics.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Michal Szpilowski &lt;<a href="mailto:miker@atari.pl">miker@atari.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-Testing.
-</p>
-</td>
-</tr>
-<tr>
-<td class="hdlist1">
-Grzegorz Zyla &lt;<a href="mailto:gsunr@poczta.onet.pl">gsunr@poczta.onet.pl</a>&gt;
-<br/>
-</td>
-<td class="hdlist2">
-<p style="margin-top: 0;">
-XBMC plugin testing.
-</p>
-</td>
-</tr>
-</table></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_feedback">Feedback</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>If you are interested in the ASAP project, please subscribe its
-<a href="https://lists.sourceforge.net/lists/listinfo/asap-users">mailing list</a>.
-This list is for users and developers.
-Once you subscribe, you can post comments, ideas and questions about ASAP.
-They will be answered ASAP. ;-)</p></div>
-<div class="paragraph"><p>Use <a href="http://sourceforge.net/p/asap/_list/tickets">tracker</a>
-to submit bug reports, feature requests and small code patches.</p></div>
-</div>
-</div>
-</div>
-<div id="footnotes"><hr/></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2013-08-17 18:08:37 CEDT
-</div>
-</div>
-</body>
-</html>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/release/release.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/release/release.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/release/release.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/release/release.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-GIT = git
-TAR = tar
-UNIX2DOS = $(DO)unix2dos <$< >$@
-GREP = @grep -H
-
-# no user-configurable paths below this line
-
-VERSION = 3.1.5
-
-ifndef DO
-$(error Use "Makefile" instead of "release.mk")
-endif
-
-dist: \
-	release/asap-$(VERSION)-air.air \
-	release/asap-$(VERSION)-android.apk \
-	release/asap-$(VERSION)-java.zip \
-	release/asap-$(VERSION)-web.zip \
-	release/asap-$(VERSION)-win32.msi \
-	release/asap-$(VERSION)-win32.zip \
-	release/asap-$(VERSION)-win64.msi \
-	release/asap-$(VERSION)-wince-arm.cab \
-	release/asap-$(VERSION)-wince-arm.zip \
-	release/foo_asap-$(VERSION).fb2k-component \
-	srcdist
-.PHONY: dist
-
-srcdist: $(srcdir)MANIFEST $(srcdir)README.html $(srcdir)asap.c $(srcdir)asap.h $(ASM6502_OBX)
-	$(RM) release/asap-$(VERSION).tar.gz && $(TAR) -c --numeric-owner --owner=0 --group=0 --mode=644 -T MANIFEST --transform=s,,asap-$(VERSION)/, | $(SEVENZIP) -tgzip -si release/asap-$(VERSION).tar.gz
-.PHONY: srcdist
-
-$(srcdir)MANIFEST:
-	$(DO)if test -e $(srcdir).git; then \
-		($(GIT) ls-tree -r --name-only --full-tree master | grep -vF .gitignore \
-			&& echo MANIFEST && echo README.html && echo asap.c && echo asap.h \
-			&& for obx in $(ASM6502_OBX); do echo $$obx; done) | sort -u >$@; \
-	fi
-.PHONY: $(srcdir)MANIFEST
-
-release/asap-$(VERSION)-java.zip: release/COPYING.txt release/README_Java.html \
-	java/asap2wav.jar java/j2me/asap_midlet.jad java/j2me/asap_midlet.jar java/asap.jar
-	$(MAKEZIP)
-
-release/asap-$(VERSION)-web.zip: release/COPYING.txt release/README_Web.html \
-	flash/asap.swf java/asap_applet.jar javascript/asap.js $(srcdir)javascript/asapweb.js $(srcdir)javascript/binaryHttpRequest.js csharp/SilverASAP.xap
-	$(MAKEZIP)
-
-release/asap-$(VERSION)-win32.zip: release/COPYING.txt release/README_Windows.html \
-	$(addprefix win32/,asapconv.exe asapscan.exe wasap.exe in_asap.dll foo_asap.dll gspasap.dll asap_dsf.dll install_dsf.bat uninstall_dsf.bat ASAP_Apollo.dll apokeysnd.dll xbmc_asap.dll xmp-asap.dll bass_asap.dll ASAPShellEx.dll asapplug.dll libasap_plugin.dll libgstasapdec.dll)
-	$(MAKEZIP)
-
-release/asap-$(VERSION)-wince-arm.zip: release/COPYING.txt release/README_WindowsCE.html \
-	win32/wince/wasap.exe win32/wince/gspasap.dll
-	$(MAKEZIP)
-
-release/foo_asap-$(VERSION).fb2k-component: win32/foo_asap.dll
-	$(MAKEZIP)
-
-release/asap-vlc-$(VERSION)-osx.dmg: release/osx/libasap_plugin.dylib release/osx/plugins
-	$(DO)hdiutil create -volname asap-vlc-$(VERSION)-osx -srcfolder release/osx -imagekey zlib-level=9 -ov $@
-
-release/osx/libasap_plugin.dylib: libasap_plugin.dylib
-	$(COPY) && chmod 644 $@
-CLEANDIR += release/osx
-
-release/osx/plugins:
-	$(DO)ln -s /Applications/VLC.app/Contents/MacOS/plugins $@
-
-deb:
-	debuild -b -us -uc
-.PHONY: deb
-
-release/COPYING.txt: $(srcdir)COPYING
-	$(UNIX2DOS)
-CLEAN += release/COPYING.txt
-
-release/README_Web.html: $(call src,README USAGE-WEB CREDITS)
-	$(call ASCIIDOC,-a toc -a asapweb)
-CLEAN += release/README_Web.html
-
-release/README_Java.html: $(call src,README java/USAGE CREDITS)
-	$(call ASCIIDOC,-a asapjava)
-CLEAN += release/README_Java.html
-
-release/README_JavaScript.html: $(call src,README javascript/USAGE CREDITS)
-	$(call ASCIIDOC,-a asapjavascript)
-CLEAN += release/README_JavaScript.html
-
-release/README_Windows.html: $(call src,README win32/USAGE CREDITS)
-	$(call ASCIIDOC,-a asapwin)
-CLEAN += release/README_Windows.html
-
-release/README_WindowsCE.html: $(call src,README win32/wince/USAGE CREDITS)
-	$(call ASCIIDOC,-a asapwince)
-CLEAN += release/README_WindowsCE.html
-
-version:
-	@echo ./release/release.mk: VERSION=$(VERSION)
-	$(GREP) -m 1 ^ASAP $(srcdir)NEWS
-	$(GREP) "<since>" $(srcdir)PORTS.xml | sort -ru | head -1
-	$(GREP) Version: $(srcdir)asap.spec
-	$(GREP) -m 1 ^asap $(srcdir)debian/changelog
-	$(GREP) "int Version" $(srcdir)asapinfo.ci
-	$(GREP) "VERSION =" $(srcdir)chksap.pl
-	$(GREP) "Version=" $(srcdir)csharp/winrt/AppxManifest.xml
-	$(GREP) android:versionName $(srcdir)java/android/AndroidManifest.xml
-	$(GREP) about_title $(srcdir)java/android/res/values/strings.xml
-	$(GREP) MIDlet-Version $(srcdir)java/j2me/MANIFEST.MF
-	$(GREP) version $(srcdir)javascript/air/AIRASAP-app.xml
-	$(GREP) ", v" $(srcdir)win32/rmt/apokeysnd_dll.c
-.PHONY: version
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/sap2ntsc.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/sap2ntsc.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/sap2ntsc.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/sap2ntsc.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,159 +0,0 @@
-/*
- * sap2ntsc.c - convert PAL SAP files to NTSC
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* public API doesn't allow us to set NTSC or FASTPLAY */
-#include "asap.c"
-
-static void fatal_error(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	fprintf(stderr, "sap2ntsc: ");
-	vfprintf(stderr, format, args);
-	fputc('\n', stderr);
-	va_end(args);
-	exit(1);
-}
-
-static void write_byte(void *obj, int data)
-{
-	putc(data, (FILE *) obj);
-}
-
-static void process_file(const char *filename)
-{
-	const char *ext;
-	FILE *fp;
-	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAPInfo *info;
-	ByteWriter bw;
-	int i;
-	int warnings;
-
-	/* check filename */
-	ext = strrchr(filename, '.');
-	if (ext == NULL || strcasecmp(ext, ".sap") != 0)
-		fatal_error("%s: filename must be *.sap", filename);
-
-	/* read file */
-	fp = fopen(filename, "rb");
-	if (fp == NULL)
-		fatal_error("cannot open %s", filename);
-	module_len = fread(module, 1, sizeof(module), fp);
-	fclose(fp);
-
-	/* parse file */
-	info = ASAPInfo_New();
-	if (info == NULL)
-		fatal_error("out of memory");
-	if (!ASAPInfo_Load(info, filename, module, module_len))
-		fatal_error("%s: unsupported file", filename);
-
-	/* check if conversion possible */
-	if (ASAPInfo_IsNtsc(info))
-		fatal_error("%s: is already NTSC", filename);
-	if (ASAPInfo_GetPlayerRateScanlines(info) != 312)
-		fatal_error("%s: uses FASTPLAY", filename);
-
-	/* do the conversion */
-	info->ntsc = TRUE;
-	info->fastplay = 262;
-	for (i = 0; i < ASAPInfo_GetSongs(info); i++) {
-		int duration = ASAPInfo_GetDuration(info, i);
-		if (duration > 0)
-			ASAPInfo_SetDuration(info, i, (int) (duration * (1773447 / 1789772.5 * 262 / 312)));
-	}
-
-	/* write file */
-	fp = fopen(filename, "wb");
-	if (fp == NULL)
-		fatal_error("cannot write %s", filename);
-	bw.obj = fp;
-	bw.func = write_byte;
-	if (!ASAPWriter_Write(filename, bw, info, module, module_len, TRUE)) {
-		fclose(fp);
-		remove(filename); /* "unlink" is less portable */
-		fatal_error("%s: write error", filename);
-	}
-	fclose(fp);
-
-	/* print summary */
-	printf("%s: ", filename);
-	warnings = 0;
-
-	/* issue a warning for samples - they may break on NTSC */
-	/* TYPE S has FASTPLAY!=312, so it has been rejected earlier */
-	if (ASAPInfo_GetTypeLetter(info) == 'D') {
-		printf("WARNING: TYPE D");
-		warnings++;
-	}
-	
-	/* issue a warning if the 6502 code possibly reads the PAL/NTSC flag of GTIA
-	   (LDA/LDX/LDY $D014, e.g. Ghostbusters.sap).
-	   This is just a guess - false positives are possible and other code may be used for NTSC detection. */
-	for (i = 0; i < module_len - 2; i++) {
-		if (module[i] >= 0xac && module[i] <= 0xae && module[i + 1] == 0x14 && module[i + 2] == 0xd0) {
-			if (warnings++ > 0)
-				printf(", ");
-			printf("WARNING: possible PAL/NTSC detection code");
-			break;
-		}
-	}
-
-	ASAPInfo_Delete(info);
-	if (warnings == 0)
-		printf("ok");
-	printf("\n");
-}
-
-int main(int argc, char **argv)
-{
-	cibool usage = TRUE;
-	int i;
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
-		if (strcmp(arg, "--help") == 0) {
-			usage = TRUE;
-			break;
-		}
-		if (strcmp(arg, "--version") == 0) {
-			printf("sap2ntsc " ASAPInfo_VERSION "\n");
-			return 0;
-		}
-		process_file(arg);
-		usage = FALSE;
-	}
-	if (usage) {
-		printf(
-			"Usage: sap2ntsc FILE.sap...\n"
-			"Replaces FILE.sap with an NTSC version\n"
-		);
-	}
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/sap2txt.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/sap2txt.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/sap2txt.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/sap2txt.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-/*
- * sap2txt.c - write plain text summary of a SAP file
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <string.h>
-#ifdef _WIN32
-#include <fcntl.h>
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-#endif
-#include <zlib.h>
-
-static void usage(void)
-{
-	fprintf(stderr,
-		"Usage:\n"
-		"sap2txt INPUT.sap             - dump to stdout\n"
-		"sap2txt INPUT.txt OUTPUT.sap  - replace header in SAP\n");
-}
-
-static int get_word(FILE *fp)
-{
-	int lo = getc(fp);
-	int hi;
-	if (lo == EOF)
-		return -1;
-	hi = getc(fp);
-	if (hi == EOF)
-		return -2;
-	return lo | (hi << 8);
-}
-
-static int sap2txt(const char *sap_file)
-{
-	FILE *fp = fopen(sap_file, "rb");
-	if (fp == NULL) {
-		fprintf(stderr, "sap2txt: cannot open %s\n", sap_file);
-		return 1;
-	}
-#ifdef _WIN32
-	_setmode(_fileno(stdout), _O_BINARY);
-#endif
-
-	/* copy header */
-	for (;;) {
-		int c = getc(fp);
-		if (c == EOF)
-			return 0;
-		else if (c == 0xff)
-			break;
-		putchar(c);
-	}
-	if (getc(fp) != 0xff)
-		return 0;
-
-	for (;;) {
-		int ffff = 0;
-		int start_address = get_word(fp);
-		int end_address;
-		Byte buffer[65536];
-		int len;
-		uLong crc;
-
-		switch (start_address) {
-		case -1:
-			/* ok */
-			return 0;
-		case -2:
-			printf("Unexpected end of file in a binary header\n");
-			return 0;
-		case 0xffff:
-			ffff = 1;
-			start_address = get_word(fp);
-			break;
-		default:
-			break;
-		}
-		end_address = get_word(fp);
-		if (end_address < 0) {
-			printf("Unexpected end of file in a binary header\n");
-			return 0;
-		}
-		if (end_address < start_address) {
-			printf("Invalid binary header\n");
-			return 0;
-		}
-		len = end_address - start_address + 1;
-		if (fread(buffer, 1, len, fp) != len) {
-			printf("Unexpected end of file in a binary block\n");
-			return 0;
-		}
-		crc = crc32(0, Z_NULL, 0);
-		crc = crc32(crc, buffer, len);
-		if (ffff)
-			printf("FFFF ");
-		printf("LOAD %04X-%04X CRC32=%08lX\r\n", start_address, end_address, crc);
-	}
-}
-
-static size_t slurp(const char *input_file, Byte *buffer, size_t len)
-{
-	FILE *fp = fopen(input_file, "rb");
-	size_t result;
-	if (fp == NULL) {
-		fprintf(stderr, "sap2txt: cannot open %s\n", input_file);
-		return 0;
-	}
-	result = fread(buffer, 1, len, fp);
-	fclose(fp);
-	if (result == len) {
-		fprintf(stderr, "sap2txt: %s: file too long\n", input_file);
-		return 0;
-	}
-	return result;
-}
-
-static int txt2sap(const char *txt_file, const char *sap_file)
-{
-	Byte txt_buf[65536];
-	size_t txt_len;
-	Byte sap_buf[65536];
-	size_t sap_len;
-	const void *bin_ptr;
-	size_t i;
-	FILE *fp;
-
-	txt_len = slurp(txt_file, txt_buf, sizeof(txt_buf));
-	if (txt_len == 0)
-		return 1;
-	sap_len = slurp(sap_file, sap_buf, sizeof(sap_buf));
-	if (sap_len == 0)
-		return 1;
-
-	bin_ptr = memchr(sap_buf, 0xff, sap_len);
-	if (bin_ptr == NULL) {
-		fprintf(stderr, "sap2txt: missing binary part in %s\n", sap_file);
-		return 1;
-	}
-
-	for (i = 0; i < txt_len; ) {
-		if (memcmp(txt_buf + i, "LOAD ", 5) == 0)
-			break;
-		if (txt_buf[i] == 0xff && txt_buf[i + 1] == 0xff)
-			break;
-		while (i < txt_len && txt_buf[i++] != 0x0a) { }
-	}
-
-	if (i == (const Byte *) bin_ptr - sap_buf && memcmp(txt_buf, sap_buf, i) == 0)
-		return 0; /* same */
-
-	fp = fopen(sap_file, "wb");
-	if (fp == NULL) {
-		fprintf(stderr, "sap2txt: cannot write %s\n", sap_file);
-		return 1;
-	}
-	fwrite(txt_buf, 1, i, fp);
-	fwrite(bin_ptr, 1, sap_len - ((const Byte *) bin_ptr - sap_buf), fp);
-	fclose(fp);
-	return 0;
-}
-
-int main(int argc, char **argv)
-{
-	switch (argc) {
-	case 2:
-		if (strcmp(argv[1], "--help") == 0) {
-			usage();
-			return 0;
-		}
-		return sap2txt(argv[1]);
-	case 3:
-		return txt2sap(argv[1], argv[2]);
-	default:
-		usage();
-		return 1;
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/sap-format.txt kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/sap-format.txt
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/sap-format.txt	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/sap-format.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,362 +0,0 @@
-SAP File Format
-===============
-:author: Piotr Fusik
-
-This is the specification of the SAP (Slight Atari Player) file format.
-SAP files contain chip music of the Atari 8-bit computers.
-
-
-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 so that other players appeared.
-
-At the time of writing there are four independent players of the SAP format:
-
-- Slight Atari Player (SAP) by Adam Bienias
-- http://asap.sourceforge.net/[Another Slight Atari Player (ASAP)] by Piotr Fusik (me)
-- http://code.google.com/p/game-music-emu/[Game_Music_Emu (GME)] by Shay Green
-- http://epi.atari8.info/sapemu.php[sapemu] by Adrian Matoga
-
-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.
-
-
-Concept
--------
-
-The SAP format contains the original data and code used 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,
-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
-as new players improve their emulation. The downside is that SAP files
-are generally hard to create. Creating SAP files from Atari software
-is called ripping and requires knowledge of the 6502 assembly language.
-On the other hand, Atari music in popular formats such as CMC or RMT
-can be easily converted to SAP (and back) using ASAP.
-
-One SAP file may contain multiple independent tunes - these are called
-"subsongs". For example, several songs from one game may be ripped
-into one SAP file. Over 90% SAP files contain just one song.
-Unfortunately many audio players do not support the concept of multiple
-subsongs per file.
-
-
-File Contents
--------------
-
-SAP file always consists of two parts: plain-text header,
-followed by binary data. It is possible to create a SAP file
-by concatenating a text file with a binary file, for example:
-
-On DOS/Windows:
--------------------------------------------------------------
-copy /b music.txt+music.bin music.sap
--------------------------------------------------------------
-
-On Unix/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).
-A line consists of an uppercase tag name and an optional argument, which may be
-a string, a decimal integer, a hexadecimal integer or a single letter.
-The argument should be separated from tag name with a single space.
-Extra whitespace is not allowed.
-
-Example of the header:
--------------------------------------------------------------
-SAP
-AUTHOR "Jakub Husak"
-NAME "Inside"
-DATE "1990"
-SONGS 3
-TYPE B
-INIT 0F80
-PLAYER 247F
-TIME 06:37.62
-TIME 02:34.02 LOOP
-TIME 00:15.40 LOOP
--------------------------------------------------------------
-
-The first line must consist of the word "SAP" immediately followed by CR/LF,
-for format identification.
-
-It is recommended, but not required, that tags are specified in the order
-described here. Note that format identification in GStreamer
-requires the AUTHOR tag be placed right after the "SAP" line.
-
-The arguments to AUTHOR, NAME and DATE must be wrapped in doublequotes.
-Allowed characters are those identical in ASCII and ATASCII (ATari ASCII),
-which are: 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.
-It is recommended to avoid doublequotes inside the arguments,
-as not all SAP players handle them.
-The arguments should be limited to 120 characters (plus the outer quotes).
-
-It is strongly recommended that all SAP files contain
-the AUTHOR, NAME and DATE tags. Use `"<?>"` for unknown values.
-
-AUTHOR::
-Name of the composer. The name should consist of a real name
-and optionally nickname (scene handle, no scene group) in parentheses.
-If song has been composed by many authors, separate them with " & ". Examples:
-+
--------------------------------------------------------------
-AUTHOR "Dariusz Duma (Dhor)"
-AUTHOR "Lukasz Sychowicz (X-Ray) & Piotr Swierszcz (Samurai)"
-AUTHOR "<?> (Trzcinowy Zakapior)"
-AUTHOR "Bill Williams <?>"
--------------------------------------------------------------
-+
-The last two examples are respecively: known nickname with unknown real name
-and an uncertain author.
-
-NAME::
-Song title. Examples:
-+
--------------------------------------------------------------
-NAME "Jocky Wilson's Darts Challenge"
-NAME "<?>"
--------------------------------------------------------------
-
-DATE::
-Copyright year or year of creation.
-If exact date is known, it can be included in the DD/MM/YYYY format.
-Examples:
-+
--------------------------------------------------------------
-DATE "1986"
-DATE "1993-1994"
-DATE "28/08/1997"
-DATE "12/2001" 
-DATE "23-26/07/2010"
-DATE "199?"
--------------------------------------------------------------
-+
-The last example means some unknown year in the 1990s.
-
-SONG::
-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.
-
-DEFSONG::
-Zero-based index of the subsong that should be played first
-when the file is opened. Defaults to zero.
-
-STEREO::
-Specifies that the file uses dual POKEY configuration. Takes no argument.
-
-NTSC::
-Specifies that the file should be played on an NTSC machine
-instead of the default PAL. Takes no argument.
-This tag is only supported on ASAP 2.1.1 and above.
-
-TYPE::
-Player type. The argument should be one uppercase letter: B, C, D or S.
-See below for an explanation.
-
-FASTPLAY::
-Number of scanlines between calls of the player routine.
-A scanline is defined to be 114 Atari clock cycles.
-FASTPLAY defaults to one frame: 312 scanlines for PAL (about 50 Hz),
-262 for NTSC (about 60 Hz).
-Most songs don't include this tag. Common values are 156 (twice per frame),
-104 (three times per frame) and 78 (four times per frame).
-ASAP 3.0.0 and above supports FASTPLAY up to 32767.
-Other SAP players may limit the value to 312.
-
-INIT::
-Hexadecimal address of a 6502 routine that initializes the player.
-Required for player types B, D and S. Invalid for type C.
-The address should be specified as four uppercase hexadecimal digits,
-although players usually forgive lowercase and fewer digits.
-
-MUSIC::
-Hexadecimal address of the music data.
-Required for type C. Invalid for other types.
-
-PLAYER::
-Hexadecimal address of the player routine.
-
-COVOX::
-Specifies that the file uses the COVOX hardware expansion
-at the specified hexadecimal address.
-COVOX offers better quality of digitalized sounds than the POKEY, in stereo.
-Currently only ASAP supports this and the only possible address is D600.
-
-TIME::
-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).
-The optional LOOP modifier specifies that the song starts looping endlessly
-at the specified moment.
-The exact format of the argument is:
-+
-- one or two digits specifying minutes
-- colon
-- two digits specifying seconds
-- optionally: decimal point (dot) followed by one to three digits (fraction of a second)
-- optionally: one space followed by four uppercase letters "LOOP"
-
-
-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.
-
-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
-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.
-
-
-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.
-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).
-
-Memory map:
-
-- 0000-CFFF - RAM.
-- 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.
-- D100-D1FF - reserved for parallel devices connected to the Atari, do not use.
-- D200-D2FF - POKEY chip mirrored 16 times
-or two POKEY chips (stereo) mirrored 8 times.
-At least the AUDF1-4, AUDC1-4, AUDCTL and RANDOM registers must be implemented
-in a SAP player.
-Emulation of timer interrupts via IRQEN and IRQST is strongly recommended.
-SAP by Adam Bienias emulates only timer 1 interrupts.
-- D300-D3FF - reserved for the PIA chip, do not use.
-- D400-D4FF - ANTIC chip mirrored 16 times.
-SAP files may rely on WSYNC (D40A) and VCOUNT (D40B) registers.
-ASAP also implements NMIST/NMIRES (D40F), but not NMIEN (D40E).
-The playback routine should be driven by the PLAYER/FASTPLAY mechanism
-instead of directly programming ANTIC interrupts.
-- D500-D5FF - reserved for cartridge, do not use.
-- D600-D6FF - COVOX chip if enabled via the COVOX tag (ASAP only).
-The COVOX consists of four unsigned 8-bit DACs:
-0 and 3 for the left channel, 1 and 2 for the right channel.
-- D700-D7FF - reserved for expansions, do not use.
-- D800-FFFF - RAM.
-FFFE/FFFF is 6502's interrupt vector for POKEY timer interrupts.
-
-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
-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.
-
-Player Types
-~~~~~~~~~~~~
-
-The value of the TYPE tag determines how the player routine
-gets called by the SAP player:
-
-TYPE B::
-The player is initialized by loading the zero-based subsong number
-into the accumulator and calling the routine specified in the INIT tag.
-The routine must return with an RTS.
-Then, every FASTPLAY scanlines (312 being the default)
-the PLAYER routine is called. It must return with an RTS as well.
-
-TYPE C::
-This type is for easy handling CMC (Chaos Music Composer) music.
-The player is initialized using the values
-of MUSIC, PLAYER and DEFSONG as follows:
-+
--------------------------------------------------------------
-    lda #$70
-    ldx #<MUSIC
-    ldy #>MUSIC
-    jsr PLAYER+3
-    lda #$00
-    ldx #DEFSONG
-    jsr PLAYER+3
--------------------------------------------------------------
-+
-Then, in FASTPLAY intervals, PLAYER+6 is called.
-When switching subsongs, the above procedure is repeated with
-the subsong number instead of DEFSONG.
-
-TYPE D::
-This is similar to TYPE B, but used for digitalized music.
-The difference is that the INIT routine must not return.
-It should play the digitalized music. It can use WSYNC and VCOUNT registers
-and/or POKEY timer interrupts for timing. The POKEY interrupts
-can be programmed via IRQEN/IRQST/AUDF1-4/AUDCTL registers,
-the FFFE/FFFF interrupt vector and the I 6502 flag (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.
-
-TYPE S::
-This is a convenience type for SoftSynth music.
-The PLAYER tag is not used here, yet some SAP players require it.
-Instead of the PLAYER routine, at FASTPLAY intervals the memory location 0x45
-is decreased and if reaches zero, the memory location 0xb07b is increased.
-The default FASTPLAY for this type is 78.
-
-TYPE R::
-The data part is a raw dump of the POKEY registers (D200-D208)
-in FASTPLAY intervals, instead of an Atari executable.
-No mainstream SAP player supports this type at the time of writing.
-
-Game_Music_Emu supports only types B and C.
-
-When 6502 routines get called, don't assume register values except for
-the specified above. For example, don't assume that the INIT routine starts
-with zero in the X register. Also, don't assume that 6502 registers
-are unchanged between the calls to PLAYER or from INIT to PLAYER.
-
-When starting a song, a SAP player must initialize POKEY registers to:
-AUDF1-4 = AUDC1-4 = AUDCTL = IRQEN = 0, SKCTL = 3.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_nmien.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_nmien.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_nmien.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_nmien.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	$3000
-main
-	lda	<title
-	ldx	>title
-	jsr	print
-
-	mva	#0	^4e
-	lda	#100
-	cmp:rne	^4b
-	mwa	#nmi	$fffa
-
-	ldy	#$40
-	lda	#123
-	cmp:req	^4b
-	cmp:rne	^4b
-	sta	^4a
-	lda	20
-	sta	^4a
-:2	cmp	(0,x)
-	cmp	0
-	sty	^4e
-:2	sta	^4a
-	cmp	20
-	jne	error
-
-	mva	#0	^4e
-	lda	#123
-	cmp:rne	^4b
-	sta	^4a
-	lda	20
-	sta	^4a
-:2	cmp	(0,x)
-	nop
-	sty	^4e
-:2	sta	^4a
-	cmp	20
-	beq	error
-
-	ldy	#0
-	lda	#123
-	cmp:rne	^4b
-	sta	^4a
-	lda	20
-	sta	^4a
-	cmp	(0,x)
-	cmp	0,x
-	cmp	0,x
-	sty	^4e
-:2	sta	^4a
-	cmp	20
-	beq	error
-
-	mva	#$40	^4e
-	lda	#123
-	cmp:rne	^4b
-	sta	^4a
-	lda	20
-	sta	^4a
-	cmp	(0,x)
-	cmp	0,x
-	cmp	0
-	sty	^4e
-:2	sta	^4a
-	cmp	20
-	bne	error
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-nmi
-	inc	20
-	rti
-
-title	dta	c'ANTIC: NMIEN...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	run	main
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_nmires.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_nmires.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_nmires.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_nmires.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "ANTIC NMIRES Test"',13,10
-	dta	c'DATE "11/12/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-	lda:rne ^4b
-	sta	^4f
-	lda	#123
-	cmp:rne	^4b
-	sta:sta	^4a
-	cmp	(0,x)
-	cmp	(0,x)
-	nop
-	sta	^4f
-	lda	^4f
-	cmp	#$5f
-	bne	error
-
-	lda	#123
-	cmp:rne	^4b
-	sta:sta	^4a
-	cmp	(0,x)
-	cmp	(0,x)
-	cmp	0
-	sta	^4f
-	lda	^4f
-	cmp	#$1f
-	bne	error
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'ANTIC: NMIRES...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_nmist.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_nmist.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_nmist.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_nmist.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "ANTIC NMIST Test"',13,10
-	dta	c'DATE "07/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-	ldx	#0
-test_loop
-	lda:rne ^4b
-	sta	^4f,x
-	lda	#123
-	cmp:rne	^4b
-	sta:sta	^4a
-	cmp	(0,x)
-	cmp	0,x
-	cmp	0,x
-	lda	^4f,x
-	cmp	#$5f
-	bne	error
-
-	lda:rne	^4b
-	lda	^4f,x
-	cmp	#$5f
-	bne	error
-
-	lda	#64
-	cmp:rne	^4b
-	lda	^4f,x
-	cmp	#$5f
-	bne	error
-
-	sta	^4f,x
-	lda	^4f,x
-	cmp	#$1f
-	bne	error
-
-	lda	#123
-	cmp:rne	^4b
-	sta:sta	^4a
-	cmp	(0,x)
-	cmp	0,x
-	cmp	0
-	lda	^4f,x
-	cmp	#$1f
-	bne	error
-
-	txa
-	add	#$10
-	tax
-	bcc	test_loop
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'ANTIC: NMIST...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_vblki.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_vblki.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_vblki.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_vblki.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	$3000
-main
-	lda	<title
-	ldx	>title
-	jsr	print
-
-	lda	#100
-	cmp:rne	^4b
-	mwa	#nmi	$fffa
-	mva	#$40	^4e
-
-	ldx	#0
-	lda	#123
-	cmp:rne	^4b
-	lda	20
-:3	sta	^4a
-	cmp	20,x
-	bne	error
-
-	lda	#123
-	cmp:rne	^4b
-	lda	20
-:3	sta	^4a
-	nop
-	cmp	20
-	beq	error
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	mvx	#11	$342
-	mwx	#0	$348
-	rts	;FIXME jmp	$e456
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-nmi
-	inc	20
-	rti
-
-title	dta	c'ANTIC: VBLKI...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	run	main
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_vcount.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_vcount.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_vcount.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_vcount.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "ANTIC VCOUNT Test"',13,10
-	dta	c'DATE "10/12/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-:NTSC	dta	c'NTSC',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-	lda:rne ^4b
-	ldy	#155
-	lda	^14
-	lsr	@
-	seq:ldy	#130
-	cpy:rne	^4b
-	sta:sta	^4a
-	cmp	0
-	cpy	^4b
-	bne	error
-	cpy:rne	^4b
-	sta:sta	^4a
-	nop
-	iny
-	cpy	^4b
-	bne	error
-	dey
-	cpy:rne	^4b
-	sta:sta	^4a
-	nop
-	cmp	0
-	lda	^4b
-	bne	error
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'ANTIC: VCOUNT'
-	ift	SAP
-:NTSC	dta	c' NTSC'
-:!NTSC	dta	c' PAL'
-	eif
-	dta	c'...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_wsync.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_wsync.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/antic_wsync.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/antic_wsync.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "ANTIC WSYNC Test"',13,10
-	dta	c'DATE "19/05/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-div5	equ	$80
-mod5	equ	$81
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-:!SAP	inc	^40
-
-	ldx	#1
-	stx	div5
-	dex
-	stx	0
-	stx	^28
-	ldy	#0
-test_loop
-	stx	mod5
-	mva	cmps,x	cmpd
-	sta	cmpd2
-	sta	cmpd3
-	sta	cmpd4
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-	ldx	div5
-	dex:rne
-cmpd	cmp	#0
-	sta	^4a
-	lda	^2a
-	cmp	sta_wsync,y
-	jne	error
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-	ldx	div5
-	dex:rne
-cmpd2	cmp	#0
-	sta	^4a,x
-	lda	^2a
-	cmp	sta_wsync+1,y
-	bne	error
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-	ldx	div5
-	dex:rne
-cmpd3	cmp	#0
-	inc	^4a
-	lda	^2a
-	cmp	inc_wsync,y
-	bne	error
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-	ldx	div5
-	dex:rne
-cmpd4	cmp	#0
-	inc	^4a,x
-	lda	^2a
-	cmp	inc_wsync+1,y
-	bne	error
-
-	ldx	mod5
-	inx
-	cpx	#5
-	bcc	same5
-	inc	div5
-	ldx	#0
-same5	iny
-	jne	test_loop
-
-	lsr:cli	^4e
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lsr:cli	^4e
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'ANTIC: WSYNC...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
-
-sta_wsync
-	dta	$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21
-	dta	$10,$21,$21,$10,$21,$21,$10,$21,$21,$10,$21,$21,$10,$21,$21,$10
-	dta	$21,$21,$10,$21,$21,$10,$21,$21,$10,$21,$21,$21,$21,$21,$21,$21
-	dta	$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21
-	dta	$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21
-	dta	$21,$21,$21,$21,$21,$21,$21,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
-	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
-	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B
-	dta	$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B,$F6
-	dta	$F6,$7B,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
-	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
-	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
-	dta	$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9
-	dta	$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9
-	dta	$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9
-	dta	$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$D9,$D9,$D9
-	dta	$D9
-inc_wsync
-	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
-	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
-	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
-	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
-	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
-	dta	$10,$10,$10,$10,$10,$F6,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
-	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
-	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
-	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
-	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
-	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
-	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$D9,$6C
-	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
-	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
-	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
-	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
-	dta	$6C
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/benchmark.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/benchmark.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/benchmark.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/benchmark.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-GME_PATH = ../game-music-emu
-SAP_PATH = ../sap.src
-
-benchmark: test/benchmark/BENCHMARK.html
-.PHONY: benchmark
-
-test/benchmark/BENCHMARK.html: test/benchmark/BENCHMARK.txt
-	$(call ASCIIDOC,)
-
-test/benchmark/BENCHMARK.txt: $(srcdir)test/benchmark/benchmark.pl win32/msvc/asapconv.exe win32/asapconv.exe win32/x64/asapconv.exe java/asap2wav.jar csharp/asap2wav.exe d/asap2wav.exe test/benchmark/gme_benchmark.exe test/benchmark/sap_benchmark.exe
-	perl $< > $@
-
-test/benchmark/gme_benchmark.exe: $(call src,test/benchmark/gme_benchmark.c asap.[ch]) $(GME_PATH)/gme/*.cpp $(GME_PATH)/gme/*.h
-	$(WIN32_CXX)
-CLEAN += test/benchmark/gme_benchmark.exe
-
-test/benchmark/sap_benchmark.exe: $(call src,test/benchmark/sap_benchmark.cpp asap.[ch]) $(SAP_PATH)/pokey0.cpp $(SAP_PATH)/pokey1.cpp $(SAP_PATH)/sapCpu.cpp $(SAP_PATH)/sapEngine.cpp $(SAP_PATH)/sapLib.h $(SAP_PATH)/sapPokey.cpp
-	$(WIN32_CXX)
-CLEAN += test/benchmark/sap_benchmark.exe
-
-profile: gmon.out
-	gprof -bpQ test/benchmark/asapconv-profile.exe
-
-gmon.out: test/benchmark/asapconv-profile.exe
-	$(DO)./test/benchmark/asapconv-profile.exe -b -o .wav test/benchmark/Drunk_Chessboard.sap
-CLEAN += gmon.out
-
-test/benchmark/asapconv-profile.exe: $(call src,asapconv.c asap.[ch])
-	$(DO)mingw32-gcc -O2 -Wall -o $@ -pg $(filter-out %.h,$^)
-	# avoid -s
-CLEAN += test/benchmark/asapconv-profile.exe
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/benchmark.pl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/benchmark.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/benchmark.pl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/benchmark.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-use Time::HiRes qw(time);
-use strict;
-
-print q{ASAP benchmark
-==============
-
-[cols="<,>,>,>,>,>,>,>,>",options="header"]
-|====================================
-|File|MSVC|MinGW|MinGW x64|Java|C#|D|GME|SAP
-};
-my @progs = (
-	'win32/msvc/asapconv.exe -o .wav',
-	'win32/asapconv.exe -o .wav',
-	'win32/x64/asapconv.exe -o .wav',
-	'java -jar java/asap2wav.jar',
-	'csharp/asap2wav.exe',
-	'd/asap2wav.exe',
-	'test/benchmark/gme_benchmark.exe',
-	'test/benchmark/sap_benchmark.exe'
-);
-for my $file (glob 'test/benchmark/*.sap') {
-	print '|', $file =~ m{([^/]+)$};
-	prog: for my $prog (@progs) {
-		my @cmd = (split(/ /, $prog), $file);
-		my $time = time;
-		my $COUNT = 5;
-		print STDERR "@cmd\n";
-		for my $i (1 .. $COUNT) {
-			unless (system(@cmd) == 0) {
-				print '|ERROR';
-				next prog;
-			}
-		}
-		$time = (time() - $time) / $COUNT;
-		printf '|%.2f', $time;
-	}
-	print "\n";
-}
-print "|====================================\n";
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/Drunk_Chessboard.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/Drunk_Chessboard.sap differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/gme_benchmark.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/gme_benchmark.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/gme_benchmark.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/gme_benchmark.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*
- * gme_benchmark.c - Game_Music_Emu benchmark
- *
- * Copyright (C) 2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "asap.h"
-#include "gme.h"
-
-#define BUF_SIZE 4096
-
-static int get_stereo_samples_count(const char *filename)
-{
-	/* GME doesn't understand TIME so ask ASAP */
-	FILE *fp;
-	unsigned char content[ASAPInfo_MAX_MODULE_LENGTH];
-	int content_len;
-	ASAPInfo *info;
-	int duration;
-
-	fp = fopen(filename, "rb");
-	if (fp == NULL) {
-		fprintf(stderr, "Cannot open %s\n", filename);
-		exit(1);
-	}
-	content_len = fread(content, 1, sizeof(content), fp);
-	fclose(fp);
-	
-	info = ASAPInfo_New();
-	if (!ASAPInfo_Load(info, filename, content, content_len)) {
-		fprintf(stderr, "ASAP doesn't understand %s\n", filename);
-		exit(1);
-	}
-	duration = ASAPInfo_GetDuration(info, 0);
-	return duration * (44100 / 100) / 10 /* milliseconds to samples */
-		* 2; /* always stereo for gme */
-}
-
-int main(int argc, char **argv)
-{
-	Music_Emu *gme;
-	gme_err_t err;
-	int samples;
-	if (argc != 2) {
-		fprintf(stderr, "Usage: gme_benchmark SAPFILE\n");
-		return 1;
-	}
-	err = gme_open_file(argv[1], &gme, 44100);
-	if (err != NULL) {
-		fprintf(stderr, "%s\n", err);
-		return 1;
-	}
-	err = gme_start_track(gme, 0);
-	if (err != NULL) {
-		fprintf(stderr, "%s\n", err);
-		return 1;
-	}
-	samples = get_stereo_samples_count(argv[1]);
-	while (samples > 0) {
-		short buf[BUF_SIZE];
-		int len = samples >= BUF_SIZE ? BUF_SIZE : samples;
-		gme_play(gme, len, buf);
-		samples -= len;
-	}
-	return 0;
-}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/International_Karate.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/International_Karate.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/Lasermania.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/Lasermania.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/Lightness.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/Lightness.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/Montezumas_Revenge.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/Montezumas_Revenge.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/Overload.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/Overload.sap differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/sap_benchmark.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/sap_benchmark.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/sap_benchmark.cpp	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/sap_benchmark.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
- * sap_benchmark.cpp - SAP Library benchmark
- *
- * Copyright (C) 2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "asap.h"
-#include "sapLib.h"
-
-#define BUF_SIZE 4096
-
-static int get_samples_count(const char *filename)
-{
-	/* SAP Library doesn't understand TIME so ask ASAP */
-	FILE *fp;
-	unsigned char content[ASAPInfo_MAX_MODULE_LENGTH];
-	int content_len;
-	ASAPInfo *info;
-
-	fp = fopen(filename, "rb");
-	if (fp == NULL) {
-		fprintf(stderr, "Cannot open %s\n", filename);
-		exit(1);
-	}
-	content_len = fread(content, 1, sizeof(content), fp);
-	fclose(fp);
-	
-	info = ASAPInfo_New();
-	if (!ASAPInfo_Load(info, filename, content, content_len)) {
-		fprintf(stderr, "ASAP doesn't understand %s\n", filename);
-		exit(1);
-	}
-	/* milliseconds to samples */
-	return ASAPInfo_GetDuration(info, 0) * (44100 / 100) / 10;
-}
-
-int main(int argc, char **argv)
-{
-	sapMUSICstrc *sap;
-	int samples;
-	if (argc != 2) {
-		fprintf(stderr, "Usage: sap_benchmark SAPFILE\n");
-		return 1;
-	}
-	sap = sapLoadMusicFile(argv[1]);
-	if (sap == NULL) {
-		fprintf(stderr, "SAP doesn't understand %s\n", argv[1]);
-		return 1;
-	}
-	sapPlaySong(0);
-	samples = get_samples_count(argv[1]);
-	while (samples > 0) {
-		short buf[BUF_SIZE * 2];
-		int len = samples >= BUF_SIZE ? BUF_SIZE : samples;
-		/* for stereo, sapRenderBuffer fills len*2 samples */
-		sapRenderBuffer(buf, len);
-		samples -= len;
-	}
-	return 0;
-}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/benchmark/Tempest_2000_Blue_Level.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/benchmark/Tempest_2000_Blue_Level.sap differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_ane.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_ane.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_ane.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_ane.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "6502 Undocumented ANE Test"',13,10
-	dta	c'DATE "27/11/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-a	equ	$80
-x	equ	$81
-data	equ	$82
-datae	equ	$83
-andax	equ	$84
-expa	equ	$85
-expnz	equ	$86
-pos	equ	$89
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-	ldx	#0
-loop
-	stx	pos
-	mva	input,x	a
-	mva	input+1,x	x
-	mva	input+2,x	data
-
-	mva	data	ane+1
-	ora	#$ef
-	sta	datae
-	lda	x
-	tax
-	and	a
-	sta	andax
-	and	datae
-	sta	expa
-	lda	andax
-	and	data
-	php:pla
-	sta	expnz
-
-	lda	a
-	ldx	x
-ane	dta	$8b,0
-	php
-	cmp	expa
-	bne	error
-	cpx	x
-	bne	error
-	pla
-	eor	expnz
-	and	#$82
-	bne	error
-	ldx	pos
-	inx
-	bne	loop
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-; just some random data
-input
-	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
-	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
-	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
-	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
-	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
-	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
-	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
-	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
-	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
-	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
-	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
-	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
-	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
-	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
-	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
-	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
-
-title	dta	c'CPU: ANE...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_anx.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_anx.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_anx.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_anx.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "6502 Undocumented ANX Test"',13,10
-	dta	c'DATE "27/11/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-expa	equ	$80
-expnz	equ	$81
-pos	equ	$89
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-	ldx	#0
-loop
-	stx	pos
-	mva	input,x	anx+1
-	and	input+1,x
-	sta	expa
-	php:pla
-	sta	expnz
-	lda	input+1,x
-	ldx	$d20a
-anx	dta	$ab,0
-	php
-	cmp	expa
-	bne	error
-	cpx	expa
-	bne	error
-	pla
-	eor	expnz
-	and	#$82
-	bne	error
-	ldx	pos
-	inx
-	bne	loop
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-; just some random data
-input
-	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
-	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
-	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
-	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
-	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
-	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
-	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
-	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
-	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
-	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
-	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
-	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
-	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
-	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
-	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
-	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
-
-title	dta	c'CPU: ANX...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_decimal.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_decimal.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_decimal.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_decimal.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "6502 Decimal Mode Test"',13,10
-	dta	c'DATE "27/11/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 01:30',13,10
-	opt	h+
-	eif
-
-; CRC-32 based on my implementation in cc65 / zlib
-
-D_FLAG	equ	8
-C_FLAG	equ	1
-CRC_POLY3	equ	$ed
-CRC_POLY2	equ	$b8
-CRC_POLY1	equ	$83
-CRC_POLY0	equ	$20
-
-OK3	equ	$3d
-OK2	equ	$d8
-OK1	equ	$4d
-OK0	equ	$2a
-
-crc	equ	$80	; 4 bytes
-zpdata	equ	$84
-zpflags	equ	$85
-scrptr	equ	$86	; 2 bytes
-printptr	equ	$88	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-	jsr	init_crc
-	lda	#0
-	jsr	test_adc_sbc
-	lda	#C_FLAG
-	jsr	test_adc_sbc
-	lda	#D_FLAG
-	jsr	test_adc_sbc
-	lda	#D_FLAG|C_FLAG
-	jsr	test_adc_sbc
-
-	lda	crc+3
-	cmp	#OK3
-	bne	error
-	lda	crc+2
-	cmp	#OK2
-	bne	error
-	lda	crc+1
-	cmp	#OK1
-	bne	error
-	lda	crc
-	cmp	#OK0
-	bne	error
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	lda	crc+3
-	jsr	put_hex_byte
-	lda	crc+2
-	jsr	put_hex_byte
-	lda	crc+1
-	jsr	put_hex_byte
-	lda	crc
-	jsr	put_hex_byte
-	lda	#$9b
-	jsr	put_char
-	mwa	#$cfa0	$d200
-	jmp	*
-
-test_adc_sbc
-	sta	zpflags
-	mva	#0	zpdata
-	ldy	#0
-test_adc_sbc_byte
-	mva	zpdata	arr+1
-:!SAP	sta	$2c8
-
-	lda:pha	zpflags
-	tya
-	plp
-	adc	zpdata
-	php
-	jsr	do_crc
-	pla
-	jsr	do_crc
-
-	lda:pha	zpflags
-	tya
-	plp
-	sbc	zpdata
-	php
-	jsr	do_crc
-	pla
-	jsr	do_crc
-
-	lda:pha	zpflags
-	tya
-	plp
-arr	dta	$6b,0
-	php
-	jsr	do_crc
-	pla
-	jsr	do_crc
-
-	iny
-	bne	test_adc_sbc_byte
-	inc	zpdata
-	bne	test_adc_sbc_byte
-	rts
-
-init_crc
-	ldx	#0
-init_crc_entry
-	lda	#0
-	sta	crc+1
-	sta	crc+2
-	sta	crc+3
-	ldy	#8
-	txa
-init_crc_bit
-	sta	crc
-	lsr	@
-	bcc	init_crc_noxor
-	lda	crc+3
-	lsr	@
-	eor	#CRC_POLY3
-	sta	crc+3
-	lda	crc+2
-	ror	@
-	eor	#CRC_POLY2
-	sta	crc+2
-	lda	crc+1
-	ror	@
-	eor	#CRC_POLY1
-	sta	crc+1
-	lda	crc
-	ror	@
-	eor	#CRC_POLY0
-	bcs	init_crc_nextbit ; branch always
-init_crc_noxor
-	rol	@
-	lsr	crc+3
-	ror	crc+2
-	ror	crc+1
-	ror	@
-init_crc_nextbit
-	dey
-	bne	init_crc_bit
-	sta	crc_table_0,x
-	mva	crc+1	crc_table_1,x
-	mva	crc+2	crc_table_2,x
-	mva	crc+3	crc_table_3,x
-	inx
-	bne	init_crc_entry
-	mwa	#0	crc
-	sta	crc+2
-	sta	crc+3
-	rts
-
-; crc = (crc >> 8) ^ crc_table[(crc & 0xff) ^ input];
-do_crc
-	eor	crc
-	tax
-	lda	crc_table_0,x
-	eor	crc+1
-	sta	crc
-	lda	crc_table_1,x
-	eor	crc+2
-	sta	crc+1
-	lda	crc_table_2,x
-	sta	crc+3
-	sta	crc+2
-	mva	crc_table_3,x	crc+3
-	rts
-
-put_hex_byte
-	pha
-:4	lsr	@
-	jsr	put_hex_nibble
-	pla
-	and	#$f
-put_hex_nibble
-	cmp	#10
-	sed
-	adc	#'0'
-	cld
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'CPU: Decimal mode...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-crc_table_0	org	*+256
-crc_table_1	org	*+256
-crc_table_2	org	*+256
-crc_table_3	org	*+256
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_las.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_las.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_las.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_las.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "6502 Undocumented LAS Test"',13,10
-	dta	c'DATE "27/11/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-s	equ	$80
-y	equ	$81
-addr	equ	$82	; 2 bytes
-data	equ	$84
-exp	equ	$86
-expnz	equ	$87
-pos	equ	$89
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-area	equ	$2e00
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-	mva	>area	addr+1
-	ldx	#0
-loop
-	stx	pos
-	mva	input,x	s
-	mva	input+1,x	y
-	mva	input+2,x	addr
-	sta	las+1
-	mva	input+3,x	data
-
-	lda	s
-	and	data
-	sta	exp
-	php:pla
-	sta	expnz
-
-	ldy	y
-	mva	data	(addr),y
-	ldx	s
-	txs
-las	dta	$bb,a(area)
-	php
-	cmp	exp
-	bne	error
-	cpx	exp
-	bne	error
-	pla
-	eor	expnz
-	and	#$80	; TODO: #$82, but Z is unstable
-	bne	error
-	tsx
-	cpx	exp
-	bne	error
-
-	ldx	pos
-	inx
-	bne	loop
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	lda	addr
-	jsr	put_hex_byte
-	lda	addr+1
-	jsr	put_hex_byte
-	lda	<sequ
-	ldx	>sequ
-	jsr	print
-	lda	s
-	jsr	put_hex_byte
-	lda	<yequ
-	ldx	>yequ
-	jsr	print
-	lda	y
-	jsr	put_hex_byte
-	lda	#$9b
-	jsr	put_char
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_hex_byte
-	pha
-:4	lsr	@
-	jsr	put_hex_nibble
-	pla
-	and	#$f
-put_hex_nibble
-	cmp	#10
-	sed
-	adc	#'0'
-	cld
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-; just some random data
-input
-	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
-	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
-	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
-	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
-	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
-	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
-	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
-	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
-	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
-	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
-	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
-	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
-	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
-	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
-	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
-	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
-
-title	dta	c'CPU: LAS...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,c'Code:BB',0
-sequ	dta	c' S=',0
-yequ	dta	c' Y=',0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_shx.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_shx.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/cpu_shx.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/cpu_shx.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,210 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "6502 Undocumented SHX/SHY Test"',13,10
-	dta	c'DATE "27/11/2010"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-addr	equ	$80	; 2 bytes
-index	equ	$82
-data	equ	$83
-dest	equ	$84	; 2 bytes
-expected	equ	$86
-opcode	equ	$87
-got	equ	$88
-pos	equ	$89
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	$d40e
-:!SAP	mva	#$fe	$d301
-	ldx	#0
-loop
-	stx	pos
-	mwa	input,x	addr
-	mva	input+2,x	index
-	mva	input+3,x	data
-	jsr	do_test
-	ldx	pos
-	inx
-	bne	loop
-
-:!SAP	mva	#$ff	$d301
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-do_test
-	lda	addr
-	add	index
-	sta	dest
-	php
-	lda	addr+1
-	add	#1
-	and	data
-	sta	expected
-	plp
-	scs:lda	addr+1
-	sta	dest+1
-	cmp	#0
-	bne	no_zp
-	lda	dest
-	and	#$f0
-	cmp	#$80
-	bne	run
-	beq	skip	!
-no_zp
-	and	#$f8
-	cmp	#$10
-	beq	skip
-	cmp	#$30
-	beq	skip
-	cmp	#$d0
-	beq	skip
-run
-	mwa	addr	shx+1
-	mwa	addr	shy+1
-	lda	expected
-	eor	#$ff
-	sta	(dest),0
-	ldx	data
-	ldy	index
-shx	dta	$9e,a(0)
-	ldx	#$9e
-	lda	(dest),0
-	cmp	expected
-	bne	error
-	eor	#$ff
-	sta	(dest),y
-	ldy	data
-	ldx	index
-shy	dta	$9c,a(0)
-	ldx	#$9c
-	lda	(dest),0
-	cmp	expected
-	bne	error
-skip
-	rts
-
-error
-:!SAP	mva	#$ff	$d301
-	stx	opcode
-	sta	got
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	lda	opcode
-	jsr	put_hex_byte
-	lda	addr
-	jsr	put_hex_byte
-	lda	addr+1
-	jsr	put_hex_byte
-	lda	<xequ
-	ldx	>xequ
-	jsr	print
-	lda	data
-	ldx	opcode
-	cpx	#$9e
-	seq:lda	index
-	jsr	put_hex_byte
-	lda	<yequ
-	ldx	>yequ
-	jsr	print
-	lda	index
-	ldx	opcode
-	cpx	#$9e
-	seq:lda	data
-	jsr	put_hex_byte
-	lda	<gott
-	ldx	>gott
-	jsr	print
-	lda	got
-	jsr	put_hex_byte
-	lda	<exp
-	ldx	>exp
-	jsr	print
-	lda	expected
-	jsr	put_hex_byte
-	lda	#$9b
-	jsr	put_char
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_hex_byte
-	pha
-:4	lsr	@
-	jsr	put_hex_nibble
-	pla
-	and	#$f
-put_hex_nibble
-	cmp	#10
-	sed
-	adc	#'0'
-	cld
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-; just some random data
-input
-	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
-	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
-	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
-	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
-	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
-	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
-	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
-	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
-	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
-	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
-	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
-	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
-	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
-	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
-	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
-	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
-
-title	dta	c'CPU: SHX/SHY...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,c'Code:',0
-xequ	dta	c' X=',0
-yequ	dta	c' Y=',0
-gott	dta	c' got ',0
-exp	dta	c' exp ',0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/crashsap.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/crashsap.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/crashsap.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/crashsap.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/*
- * crashsap.cs - buffer overflow regression test
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using Sf.Asap;
-
-public class CrashSap
-{
-	public static void Main()
-	{
-		ASAP asap = new ASAP();
-		asap.Load("foo.sap", new byte[1] { (byte) 'S' }, 1);
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/disasm/disasm.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/disasm/disasm.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/disasm/disasm.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/disasm/disasm.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-disasm: $(addprefix test/disasm/,asap.s asap64.s asap.html asap.jasm asap.abc)
-.PHONY: disasm
-
-test/disasm/asap.s: $(call src,asap.[ch])
-	$(WIN32_CC) -S
-CLEAN += test/disasm/asap.s
-
-test/disasm/asap64.s: $(call src,asap.[ch])
-	$(WIN64_CC) -S
-CLEAN += test/disasm/asap64.s
-
-test/disasm/asap.html: csharp/asap2wav.exe
-	-$(DO)"c:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Bin/ildasm.exe" /output=$@ /html /nobar /source $<
-CLEAN += test/disasm/asap.html
-
-test/disasm/asap.jasm: java/classes/net/sf/asap
-	$(DO)javap -c -private -classpath java/classes net.sf.asap.ASAP net.sf.asap.ASAPInfo net.sf.asap.Cpu6502 net.sf.asap.Pokey net.sf.asap.PokeyPair > $@
-CLEAN += test/disasm/asap.jasm
-
-test/disasm/asap.abc: flash/asap.swf
-	$(DO)swfdump -abc $< > $@
-CLEAN += test/disasm/asap.abc
-
-test/disasm/asap.dexdump: java/android/classes/net/sf/asap/Player.class
-	$(DO)java -jar "c:/bin/android-sdk-windows/platforms/android-8//tools/lib/dx.jar" --dex --dump-to=$@ java/android/classes/
-CLEAN += test/disasm/asap.dexdump
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/formats.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/formats.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/formats.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/formats.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-cmc
-	dta	c' cmc data file '*,$8e,$95,$0d,$20
-	dta	3 ; tempo
-:64	dta	l(pattern)
-:64	dta	h(pattern)
-; pattern=$ffff => no pattern
-:26	dta	1,2,3,4,5,6	; 1-4 instrument params, 5-6: accent map
-:26	dta	1,2,3,4,5,6,7,8	; instrument envelope BADCFE...
-:$55	dta	1	; track 1
-:$55	dta	2	; track 2
-:$55	dta	3	; track 3
-	dta	0xff
-; offset=$300
-; patterns...
-
-mpt
-:32	dta	a(instr)
-; instr=0 => no instrument
-:64	dta	a(pattern)
-; pattern=0 => no pattern
-:4*64	dta	0 ; note2frequency
-:4	dta	l(track)
-:4	dta	h(track)
-	dta	$40	; pattern_len
-	dta	6	; tempo
-; track1
-; track2
-; track3
-; track4
-; instruments...
-; patterns...
-
-rmt
-	dta	c'RMT4' ; c'RMT8'
-	dta	$40 ; pattern_len
-	dta	6	; tempo
-	dta	1	; per frame
-	dta	1	; instrspeed
-	dta	a(instrtable,patltable,pathtable,song)
-:x	dta	a(instr) ; instrtable
-:x	dta	l(pattern) ; patltable
-:x	dta	h(pattern) ; pathtable
-; instruments
-; patterns
-; song
-:x	dta	b(1,2,3,4) ; 8 if RMT8
-	dta	$fe,pos,a(songpos) ; jmp in song
-
-tmc
-:30	dta	c'T'	; title
-	dta	2	; tempo
-	dta	4	; per frame
-:64	dta	l(instr)
-:64	dta	h(instr)
-; instr=0 => no instr
-:128	dta	l(pattern)
-:128	dta	h(pattern)
-:16*x	dta	0	; song
-:80*x	dta	0	; instruments
-; patterns
-
-tm2
-	dta 14,21,13+128,c'TMC SONG FILE 2.0'*,13+128,21,14
-	dta a($1580) ; total bytes in memory
-	dta	1,16,20,0,0 ; POKEY config?
-	dta	5	; tempo
-	dta	1	; per frame
-	dta	c' '
-:30	dta	c'T' ; title 1st line
-	dta	c' '
-	dta	c' '
-:30	dta	c'T' ; title 2nd line
-	dta	c' '
-	dta	c' '
-:30	dta	c'T' ; title 3rd line
-	dta	c' '
-:128	dta	l(instr)
-:256	dta	l(pattern)
-:256	dta	h(pattern)
-:128	dta	h(instr)
-; instr=0 => no instr
-; song data
-:x	dta	pattern7,transp7,...pattern0,transp0,patlen
-; patlen=0 = stop, patlen>=$80 = jump transp0
-; instruments&patterns
-
-fc ; no DOS header
-	dta	'F'-' ','C'-' '
-	dta	tempo
-:256	dta	track1
-:256	dta	track2
-:256	dta	track3
-:32	dta	env,audc,depth,effect	; instruments
-:64*x	dta	0	; patterns
-:32*x	dta	0	; envelopes
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/gtia_consol.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/gtia_consol.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/gtia_consol.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/gtia_consol.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "GTIA CONSOL Test"',13,10
-	dta	c'DATE "10/05/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-
-	ldx	#0
-test_loop
-	stx	$d01f
-	txa
-	eor:and	#$f
-	cmp	$d01f
-	bne	error
-	inx
-	bne	test_loop
-
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'GTIA: CONSOL...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/loadsap.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/loadsap.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/loadsap.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/loadsap.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*
- * loadsap.cs - print files with ASAP loading errors
- *
- * Copyright (C) 2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using System;
-using System.IO;
-
-using Sf.Asap;
-
-public class LoadSap
-{
-	static void Check(string path)
-	{
-		if (Directory.Exists(path)) {
-			foreach (string child in Directory.GetFileSystemEntries(path))
-				Check(child);
-		}
-		else if (ASAPInfo.IsOurFile(path)) {
-			byte[] module = File.ReadAllBytes(path);
-			try {
-				ASAP asap = new ASAP();
-				asap.Load(path, module, module.Length);
-				asap.PlaySong(asap.GetInfo().GetDefaultSong(), -1);
-			}
-			catch (Exception ex) {
-				Console.WriteLine("{0}: {1}", path, ex.Message);
-			}
-		}
-	}
-
-	public static int Main(string[] args)
-	{
-		if (args.Length == 0) {
-			Console.WriteLine("Usage: loadsap FILE_OR_DIR...");
-			return 1;
-		}
-		foreach (string path in args)
-			Check(path);
-		return 0;
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_irqst.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_irqst.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_irqst.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_irqst.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY IRQST Test"',13,10
-	dta	c'DATE "07/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-:!SAP	inc	^40
-
-	lda	#0
-	jsr	test1
-	lda	#1
-	jsr	test1
-
-:!SAP	lsr:cli	^4e
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-test1
-	mvx	#0	^2e
-	mvx	#$40	^28
-	mvx	#$ff	^20
-	stx	^29
-	stx	^4a
-	sta	^20
-	mvx	#1	^2e
-	stx	^29
-	cmp	0,x
-	eor	^2e
-	mvx	$10	^2e
-	lsr	@
-	bcs	error
-	rts
-
-error
-:!SAP	lsr:cli	^4e
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'POKEY: IRQST...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_pot.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_pot.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_pot.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_pot.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY POT Test"',13,10
-	dta	c'DATE "14/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-div5	equ	$80
-mod5	equ	$81
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-:!SAP	inc	^40
-
-; fast POT scan
-	ldx	#1
-	stx	div5
-	dex
-	stx	0
-	ldy	#0
-test_loop
-	stx	mod5
-	mva	cmps,x	cmpd
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#7	^2f
-	sta	^2b
-	ldx	div5
-	dex:rne
-cmpd	cmp	#0
-	lda	^20
-	cmp	expected,y
-	jne	error
-
-	ldx	mod5
-	inx
-	cpx	#5
-	bcc	same5
-	inc	div5
-	ldx	#0
-same5	iny
-	bne	test_loop
-
-; slow POT scan (114 divisor)
-	ldy	#2
-test2_loop
-	mva	cmps,y	cmpd2
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-:2	sta	^4a
-	sta	^2b
-	ldx	#13+21
-	dex:rne
-cmpd2	cmp	#0
-	lda	^20
-	cmp	expected114,y
-	bne	error
-	dey
-	bpl	test2_loop
-
-; slow POT scan, max value
-	ldy	#228
-test3_loop
-	sty	^4a
-	dey
-	bne	test3_loop
-	lda	^20
-	cmp	#228
-	bne	error
-
-; slow POT scan, 114 divisor stopped
-	mva	#0	^2f
-:2	sta	^4a
-	sta	^2b
-:5	sta	^4a
-	ldx	#3
-	lda	^20
-	stx	^2f
-	bne	error
-
-	lsr:cli	^4e
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lsr:cli	^4e
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'POKEY: POT...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
-
-expected
-	dta	$08,$0c,$0c,$0e,$00,$10,$10,$12,$10,$14,$14,$16,$10,$18,$1a,$18
-	dta	$1c,$1e,$00,$20,$22,$20,$24,$26,$20,$28,$2a,$28,$2c,$2e,$20,$30
-	dta	$32,$30,$34,$36,$30,$38,$3a,$38,$3c,$3c,$3e,$00,$40,$40,$42,$40
-	dta	$44,$44,$46,$40,$48,$48,$4a,$48,$4c,$4c,$4e,$40,$50,$50,$52,$50
-	dta	$54,$54,$56,$50,$58,$58,$5a,$58,$5c,$5c,$5e,$40,$60,$60,$62,$60
-	dta	$64,$64,$66,$60,$68,$68,$6a,$68,$6c,$6c,$6e,$60,$70,$70,$72,$70
-	dta	$74,$74,$76,$70,$78,$78,$7a,$78,$7c,$7c,$7e,$00,$80,$80,$82,$80
-	dta	$84,$84,$86,$80,$88,$88,$88,$8c,$8c,$80,$90,$90,$90,$94,$94,$90
-	dta	$98,$98,$98,$9c,$9c,$80,$a0,$a0,$a0,$a4,$a4,$a0,$a8,$a8,$a8,$ac
-	dta	$ac,$ae,$a0,$b0,$b0,$b2,$b0,$b4,$b4,$b6,$b0,$b8,$b8,$ba,$b8,$bc
-	dta	$bc,$be,$80,$c0,$c0,$c2,$c0,$c4,$c4,$c6,$c0,$c8,$c8,$ca,$c8,$cc
-	dta	$cc,$ce,$c0,$d0,$d0,$d2,$d0,$d4,$d4,$d6,$d0,$d8,$d8,$da,$d8,$dc
-	dta	$dc,$de,$c0,$e0,$e0,$e2,$e0,$e4,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
-	dta	$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
-	dta	$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
-	dta	$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
-expected114
-	dta	1,0,2
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_potst.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_potst.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_potst.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_potst.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY POTST Test"',13,10
-	dta	c'DATE "14/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-div5	equ	$80
-mod5	equ	$81
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-:!SAP	inc	^40
-
-; fast POT scan
-	ldx	#1
-	stx	div5
-	dex
-	stx	0
-	ldy	#0
-test_loop
-	stx	mod5
-	mva	cmps,x	cmpd
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#7	^2f
-	sta	^2b
-	ldx	div5
-	dex:rne
-cmpd	cmp	#0
-	lda	^28
-	eor	#$ff
-	cpy	#200
-	adc	#0
-	jne	error
-
-	ldx	mod5
-	inx
-	cpx	#5
-	bcc	same5
-	inc	div5
-	ldx	#0
-same5	iny
-	bne	test_loop
-
-; slow POT scan (114 divisor)
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-:2	sta	^4a
-	sta	^2b
-	ldx	#227
-delay_loop	stx	^4a
-	dex:bne	delay_loop
-	ldx	#13
-	dex:rne
-	cmp	0,x
-	lda	^28
-	cmp	#$ff
-	bne	error
-
-	mva	#0	^2f
-:2	sta	^4a
-	mva	#3	^2f
-:2	sta	^4a
-	sta	^2b
-	ldx	#227
-delay2_loop	stx	^4a
-	dex:bne	delay2_loop
-	ldx	#14
-	dex:rne
-	lda	^28
-	bne	error
-
-; slow POT scan, 114 divisor stopped
-	mva	#0	^2f
-:2	sta	^4a
-	sta	^2b
-:5	sta	^4a
-	ldx	#3
-	lda	^28
-	stx	^2f
-	beq	error
-
-	lsr:cli	^4e
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lsr:cli	^4e
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'POKEY: POTST...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_pure.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_pure.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_pure.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_pure.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY Pure Sound Test"',13,10
-	dta	c'DATE "03/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:08',13,10
-	opt	h+
-	eif
-
-	org	f:$3000
-main
-:!SAP	sei:inc	^4e
-	mva	#3	^2f
-	mva	#0	^28
-
-	mva	#$af	^21
-test_start
-	lda	#255
-test_loop
-	sta	^20
-	ldx	<-15556
-	ldy	>-15556
-wait_loop
-	sta	^4a
-	inx
-	bne	wait_loop
-	iny
-	bne	wait_loop
-	tax
-	beq	test_start
-	lsr	@
-	jmp	test_loop
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_random.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_random.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_random.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_random.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY RANDOM Test"',13,10
-	dta	c'DATE "19/05/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-div5	equ	$80
-mod5	equ	$81
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-:!SAP	inc	^40
-
-	ldx	#1
-	stx	div5
-	dex
-	stx	0
-	ldy	#0
-test_loop
-	stx	mod5
-	mva	cmps,x	cmpd
-	sta	cmpd2
-
-	mva	#0	^28
-	sta	^2f
-:2	sta	^4a
-	mva	#3	^2f
-	ldx	div5
-	dex:rne
-cmpd	cmp	#0
-	lda	^2a
-	cmp	poly17,y
-	bne	error
-
-	mva	#$80	^28
-	sta	^2f
-:2	sta	^4a
-	mva	#3	^2f
-	ldx	div5
-	dex:rne
-cmpd2	cmp	#0
-	lda	^2a
-	cmp	poly9,y
-	bne	error
-
-	ldx	mod5
-	inx
-	cpx	#5
-	bcc	same5
-	inc	div5
-	ldx	#0
-same5	iny
-	bne	test_loop
-
-	lsr:cli	^4e
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	lsr:cli	^4e
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-title	dta	c'POKEY: RANDOM...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
-
-poly17
-	dta	$00,$80,$C0,$E0,$F0,$F8,$7C,$3E,$1F,$0F,$07,$03,$01,$80,$C0,$E0
-	dta	$F0,$FC,$FE,$FF,$FF,$7F,$3F,$CF,$E7,$F3,$7C,$3E,$1F,$07,$83,$C1
-	dta	$30,$18,$8C,$E3,$F1,$F8,$FE,$FF,$FF,$3F,$1F,$0F,$07,$83,$C1,$E0
-	dta	$70,$38,$1C,$0E,$87,$C3,$E1,$F0,$F8,$FC,$FE,$FF,$7F,$3F,$9F,$CF
-	dta	$67,$B3,$D9,$EC,$F6,$7B,$3D,$1E,$8F,$C7,$63,$31,$98,$CC,$E6,$73
-	dta	$39,$1C,$8E,$C7,$63,$31,$18,$0C,$86,$43,$21,$10,$08,$84,$42,$21
-	dta	$10,$08,$04,$82,$41,$20,$10,$08,$04,$02,$01,$00,$00,$00,$80,$C0
-	dta	$60,$30,$18,$0C,$86,$43,$21,$10,$08,$04,$C1,$60,$30,$8C,$46,$23
-	dta	$08,$04,$82,$E0,$70,$38,$0E,$87,$43,$10,$88,$C4,$F1,$78,$3C,$CF
-	dta	$67,$33,$0C,$86,$43,$A1,$D0,$68,$B4,$5A,$2D,$96,$4B,$25,$92,$49
-	dta	$24,$92,$C9,$64,$32,$19,$8C,$46,$23,$91,$C8,$64,$B2,$D9,$EC,$F6
-	dta	$7B,$3D,$1E,$8F,$47,$A3,$D1,$E8,$F4,$FA,$7D,$3E,$1F,$8F,$C7,$63
-	dta	$B1,$D8,$EC,$F6,$7B,$BD,$DE,$EF,$F7,$7B,$3D,$1E,$8F,$C7,$63,$31
-	dta	$18,$0C,$06,$03,$01,$00,$80,$C0,$60,$30,$18,$0C,$06,$83,$C1,$60
-	dta	$30,$18,$8C,$63,$31,$18,$C6,$E3,$F1,$3C,$1E,$0F,$03,$01,$00,$00
-	dta	$80,$C0,$B0,$D8,$EC,$7B,$3D,$1E,$07,$83,$C1,$B0,$D8,$6C,$36,$1B
-poly9
-	dta	$EF,$77,$3B,$1D,$0E,$87,$43,$A1,$D0,$68,$34,$9A,$CD,$66,$B3,$D9
-	dta	$6C,$DB,$ED,$F6,$BD,$5E,$2F,$0B,$85,$C2,$70,$38,$9C,$67,$33,$19
-	dta	$86,$43,$21,$48,$24,$12,$44,$A2,$51,$D4,$EA,$75,$BA,$5D,$AE,$D7
-	dta	$EB,$F5,$7A,$3D,$9E,$4F,$27,$93,$49,$A4,$D2,$E9,$74,$3A,$9D,$CE
-	dta	$E7,$73,$39,$1C,$0E,$07,$03,$81,$C0,$E0,$70,$B8,$DC,$EE,$77,$BB
-	dta	$5D,$2E,$97,$CB,$E5,$F2,$79,$BC,$5E,$AF,$57,$2B,$95,$4A,$A5,$52
-	dta	$29,$14,$0A,$05,$02,$81,$40,$A0,$50,$A8,$54,$AA,$55,$AA,$D5,$EA
-	dta	$F5,$FA,$7D,$BE,$5F,$AF,$D7,$6B,$B5,$5A,$16,$0B,$05,$C1,$60,$B0
-	dta	$EC,$76,$BB,$6E,$B7,$DB,$B6,$5B,$AD,$6B,$35,$1A,$06,$83,$41,$D0
-	dta	$E8,$74,$DD,$EE,$F7,$FB,$7D,$3E,$1F,$8F,$C7,$E3,$F1,$78,$3C,$9E
-	dta	$CF,$67,$B3,$59,$2C,$96,$CB,$65,$B2,$59,$AC,$D6,$EB,$75,$3A,$1D
-	dta	$8E,$C7,$63,$B1,$58,$2C,$16,$8B,$45,$A2,$D1,$E8,$F4,$FA,$FD,$FE
-	dta	$7F,$BF,$5F,$2F,$97,$4B,$A5,$D2,$69,$34,$1A,$8D,$46,$A3,$51,$28
-	dta	$94,$CA,$65,$32,$19,$8C,$C6,$63,$31,$18,$0C,$06,$03,$01,$80,$C0
-	dta	$60,$30,$98,$66,$33,$99,$A6,$53,$A9,$6A,$35,$9A,$26,$93,$C9,$F2
-	dta	$F9,$FC,$BF,$DF,$6F,$5B,$2D,$96,$25,$92,$49,$92,$C9,$64,$B2,$D9
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_timerirq.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_timerirq.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/pokey_timerirq.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/pokey_timerirq.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-	ift	SAP
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY Timer IRQ Test"',13,10
-	dta	c'DATE "07/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'TIME 00:10',13,10
-	opt	h+
-	eif
-
-scrptr	equ	$8a	; 2 bytes
-printptr	equ	$8c	; 2 bytes
-
-	org	f:$3000
-main
-:SAP	mwa	#$1000	scrptr
-	lda	<title
-	ldx	>title
-	jsr	print
-
-:!SAP	sei:inc	^4e
-:!SAP	inc	^40
-:!SAP	mva	#$fe	^31
-
-	ldx	#8
-test_loop
-	mwa	#irq	$fffe
-	mva	#0	^2f
-	sta	^2e
-	cli
-	mva	#$40	^28
-	mva	#$ff	^20
-	sta	^29
-	stx	^20
-	sta	^4a
-	mva	#3	^2f
-	lsr	@
-	sta	^2e
-	sta	^4a
-	sta	^29
-	jmp	*
-
-irq
-	lda	^2a
-	cmp	expected,x
-	bne	error
-	dex
-	bpl	test_loop
-
-:!SAP	mva	$10	^2e
-:!SAP	mva	#$ff	^31
-:!SAP	lsr:cli	^4e
-	lda	<pass
-	ldx	>pass
-	jsr	print
-	mwa	#$af30	$d200
-	jmp	*
-
-error
-	pha
-	txa:pha
-	mva	#0	^28
-:!SAP	mva	$10	^2e
-:!SAP	mva	#$ff	^31
-:!SAP	lsr:cli	^4e
-	lda	<fail
-	ldx	>fail
-	jsr	print
-	pla
-	jsr	put_hex_byte
-	pla
-	jsr	put_hex_byte
-	lda	#$9b
-	jsr	put_char
-	mwa	#$cfa0	$d200
-	jmp	*
-
-put_hex_byte
-	pha
-:4	lsr	@
-	jsr	put_hex_nibble
-	pla
-	and	#$f
-put_hex_nibble
-	cmp	#10
-	sed
-	adc	#'0'
-	cld
-put_char
-	ift	SAP
-	sta	(scrptr),0
-	inw	scrptr
-	rts
-	els
-	mvx	#11	$342
-	mwx	#0	$348
-	jmp	$e456
-	eif
-
-print
-	sta	printptr
-	stx	printptr+1
-	jmp	print_2
-print_1
-	jsr	put_char
-	inw	printptr
-print_2
-	lda	(printptr),0
-	bne	print_1
-	rts
-
-expected
-:3	dta	$30
-:3	dta	$86
-:3	dta	$10
-
-title	dta	c'POKEY: Timer IRQ...',0
-pass	dta	c'Pass',$9b,0
-fail	dta	c'FAIL.',$9b,0
-
-	ift	!SAP
-	run	main
-	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/RESULTS.xml kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/RESULTS.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/RESULTS.xml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/RESULTS.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-<?xml-stylesheet type="text/xsl" href="RESULTS.xsl" ?>
-<tests>
-	<test name="antic_nmires">
-		<fail on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<fail on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="antic_nmist">
-		<pass on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="antic_vcount">
-		<fail on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="antic_wsync">
-		<fail on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<fail on="ASAP 3.0.0" />
-	</test>
-	<test name="cpu_anx">
-		<pass on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<pass on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="cpu_decimal">
-		<pass on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<fail on="Altirra 1.9" />
-		<pass on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="cpu_las">
-		<pass on="Atari800 2.2.1" />
-		<crash on="Atari++ 1.60" />
-		<fail on="Altirra 1.9" />
-		<pass on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="cpu_shx">
-		<fail on="Atari800 2.2.1" />
-		<crash on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="gtia_consol">
-		<pass on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<pass on="ASAP 3.0.0" />
-	</test>
-	<test name="pokey_random">
-		<fail on="Atari800 2.2.1" />
-		<fail on="Atari++ 1.60" />
-		<pass on="Altirra 1.9" />
-		<fail on="ASAP 2.1.2" />
-		<fail on="ASAP 3.0.0" />
-	</test>
-</tests>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/RESULTS.xsl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/RESULTS.xsl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/RESULTS.xsl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/RESULTS.xsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:output method="html" />
-
-	<xsl:template match="/tests">
-		<html>
-			<head>
-				<title>ASAP test results</title>
-				<style>
-					table { border-collapse: collapse; }
-					th, td { border: solid black 1px; }
-					th, .name { background-color: #ccf; }
-					.pass { background-color: #cfc; }
-					.fail { background-color: #fcc; }
-					.pass, .fail { text-align: center; }
-				</style>
-			</head>
-			<body>
-				<table>
-					<tr>
-						<th>Test</th>
-						<th>Atari800 2.2.1</th>
-						<th>Atari++ 1.60</th>
-						<th>Altirra 1.9</th>
-						<th>ASAP 2.1.2</th>
-						<th>ASAP 3.0.0</th>
-					</tr>
-					<xsl:apply-templates />
-				</table>
-			</body>
-		</html>
-	</xsl:template>
-
-	<xsl:template match="test">
-		<tr>
-			<td class="name"><xsl:value-of select="@name" /></td>
-			<xsl:apply-templates select="*[@on='Atari800 2.2.1']" />
-			<xsl:apply-templates select="*[@on='Atari++ 1.60']" />
-			<xsl:apply-templates select="*[@on='Altirra 1.9']" />
-			<xsl:apply-templates select="*[@on='ASAP 2.1.2']" />
-			<xsl:apply-templates select="*[@on='ASAP 3.0.0']" />
-		</tr>
-	</xsl:template>
-
-	<xsl:template match="pass">
-		<td class="pass">Pass</td>
-	</xsl:template>
-
-	<xsl:template match="fail|crash">
-		<td class="fail">FAIL</td>
-	</xsl:template>
-</xsl:stylesheet>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/sapd_player_iflag.asx kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/sapd_player_iflag.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/sapd_player_iflag.asx	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/sapd_player_iflag.asx	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-	opt	h-
-	dta	c'SAP',13,10
-	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
-	dta	c'NAME "POKEY Pure Sound Test"',13,10
-	dta	c'DATE "09/06/2011"',13,10
-	dta	c'TYPE D',13,10
-	dta	c'INIT 3000',13,10
-	dta	c'PLAYER 3004',13,10
-	dta	c'TIME 00:05',13,10
-	opt	h+
-
-	org	f:$3000
-main
-	cli
-	jmp	*
-player
-	php
-	pla
-	ldx	#$30
-	ldy	#$af
-	and	#4
-	beq	izero
-	ldx	#$a0
-	ldy	#$cf
-izero
-	stx	^20
-	sty	^21
-	rts
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/test.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/test.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/test.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/test.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-ACIDSAP = ../Acid800/out/Release/AcidSAP/standalone
-
-# no user-configurable paths below this line
-
-TESTS = antic_nmires antic_nmist antic_vcount_ntsc antic_vcount_pal antic_wsync cpu_anx cpu_decimal cpu_las cpu_shx gtia_consol pokey_irqst pokey_pot pokey_potst pokey_random pokey_timerirq
-TESTS_SAP = $(TESTS:%=test/%.sap)
-
-check: asapscan $(ACIDSAP) $(TESTS_SAP)
-	@export passed=0 total=0; \
-		for name in $(ACIDSAP)/*.sap; do \
-			echo -n \*\ ; ./asapscan -a "$$name"; \
-			passed=$$(($$passed+!$$?)); total=$$(($$total+1)); \
-		done; \
-		echo PASSED $$passed of $$total tests
-	@export passed=0 total=0; \
-		for name in $(TESTS_SAP); do \
-			echo -n \*\ ; ./asapscan -a "$$name"; \
-			passed=$$(($$passed+!$$?)); total=$$(($$total+1)); \
-		done; \
-		echo PASSED $$passed of $$total tests
-.PHONY: check
-
-test/%.sap: $(srcdir)test/%.asx
-	$(XASM) -d SAP=1
-
-test/%_ntsc.sap: $(srcdir)test/%.asx
-	$(XASM) -d SAP=1 -d NTSC=1
-
-test/%_pal.sap: $(srcdir)test/%.asx
-	$(XASM) -d SAP=1 -d NTSC=0
-
-test/%.xex: $(srcdir)test/%.asx
-	$(XASM) -d SAP=0
-
-CLEAN += test/*.sap test/*.xex
-
-test/timevsnative: $(call src,test/timevsnative.c asap.[ch])
-	$(CC)
-CLEAN += test/timevsnative
-
-test/loadsap.exe: $(call src,test/loadsap.cs csharp/asap.cs)
-	$(CSC)
-CLEAN += test/loadsap.exe
-
-test/ultrasap.exe: $(call src,test/ultrasap.cs csharp/asap.cs)
-	$(CSC)
-CLEAN += test/ultrasap.exe
-
-test/crashsap.exe: $(call src,test/crashsap.cs csharp/asap.cs)
-	$(CSC)
-CLEAN += test/crashsap.exe
-
-include $(srcdir)test/benchmark/benchmark.mk
-include $(srcdir)test/disasm/disasm.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/timevsnative.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/timevsnative.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/timevsnative.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/timevsnative.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "asap.h"
-
-static int print_times(ASAPInfo *info, const char *filename, const unsigned char *module, int module_len)
-{
-	int sum = 0;
-	int song;
-	if (!ASAPInfo_Load(info, filename, module, module_len)) {
-		putchar('\n');
-		fprintf(stderr, "%s: cannot load\n", filename);
-		exit(1);
-	}
-	for (song = 0; song < ASAPInfo_GetSongs(info); song++) {
-		int duration = ASAPInfo_GetDuration(info, song);
-		unsigned char s[ASAPWriter_MAX_DURATION_LENGTH + 1];
-		int len = ASAPWriter_DurationToString(s, duration);
-		sum += duration;
-		putchar(song == 0 ? '\t' : ',');
-		if (len == 0)
-			printf("???");
-		else {
-			s[len] = '\0';
-			printf("%s", (const char *) s);
-			if (ASAPInfo_GetLoop(info, song))
-				printf(" LOOP");
-		}
-	}
-	return sum;
-}
-
-static void put_byte(void *obj, int data)
-{
-	unsigned char **p = (unsigned char **) obj;
-	*(*p)++ = data;
-}
-
-int main(int argc, char *argv[])
-{
-	const char *sap_filename;
-	FILE *fp;
-	unsigned char sap[ASAPInfo_MAX_MODULE_LENGTH];
-	int sap_len;
-	ASAPInfo *sap_info = ASAPInfo_New();
-	int sap_sum;
-	const char *native_ext;
-	ASAPInfo *native_info = ASAPInfo_New();
-	if (argc != 2) {
-		printf("Usage: timevsnative FILE.sap\n");
-		return 1;
-	}
-	sap_filename = argv[1];
-	fp = fopen(sap_filename, "rb");
-	if (fp == NULL) {
-		fprintf(stderr, "%s: cannot open\n", sap_filename);
-		return 1;
-	}
-	sap_len = fread(sap, 1, sizeof(sap), fp);
-	fclose(fp);
-	printf("%s", sap_filename);
-	sap_sum = print_times(sap_info, sap_filename, sap, sap_len);
-	native_ext = ASAPInfo_GetOriginalModuleExt(sap_info, sap, sap_len);
-	if (native_ext != NULL) {
-		char native_filename[FILENAME_MAX];
-		unsigned char native[ASAPInfo_MAX_MODULE_LENGTH];
-		unsigned char *p = native;
-		ByteWriter bw = { &p, put_byte };
-		printf("\t%s", native_ext);
-		sprintf(native_filename, "%.*s.%s", (int) (strrchr(sap_filename, '.') - sap_filename), sap_filename, native_ext);
-		if (ASAPWriter_Write(native_filename, bw, sap_info, sap, sap_len)) {
-			int native_sum = print_times(native_info, native_filename, native, (int) (p - native));
-			printf("\t%d", abs(native_sum - sap_sum) / 1000);
-		}
-	}
-	putchar('\n');
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/ultrasap.cs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/ultrasap.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/test/ultrasap.cs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/test/ultrasap.cs	1970-01-01 00:00:00.000000000 +0000
@@ -1,874 +0,0 @@
-/*
- * ultrasap.cs - create statistics of high tones in SAP files
- *
- * Copyright (C) 2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-using System;
-using System.IO;
-
-using Sf.Asap;
-
-public class UltraSap
-{
-	static void Check(ASAP asap, int[] n, int periodCycles, int audc)
-	{
-		if (periodCycles > 112)
-			return;
-		if ((audc & 0xf) == 0)
-			return;
-		audc >>= 4;
-		if (audc != 10 && audc != 14)
-			return;
-		n[periodCycles / 10]++;
-	}
-
-	public static int Main(string[] args)
-	{
-		if (args.Length == 0) {
-			Console.WriteLine("Usage: ultrasap path/to/ASMA");
-			return 1;
-		}
-		string asma = args[0];
-		ASAP asap = new ASAP();
-		byte[] buffer = new byte[885];
-		foreach (string file in Files) {
-			byte[] module = File.ReadAllBytes(Path.Combine(asma, file));
-			asap.Load(file, module, module.Length);
-			ASAPInfo info = asap.GetInfo();
-			for (int song = 0; song < info.GetSongs(); song++) {
-				int duration = info.GetDuration(song);
-				asap.PlaySong(song, duration);
-				int[] n = new int[12];
-				while (asap.Generate(buffer, buffer.Length, ASAPSampleFormat.U8) == buffer.Length) {
-					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles1, asap.Pokeys.BasePokey.Audc1);
-					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles2, asap.Pokeys.BasePokey.Audc2);
-					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles3, asap.Pokeys.BasePokey.Audc3);
-					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles4, asap.Pokeys.BasePokey.Audc4);
-				}
-				foreach (int i in n) {
-					if (i > 0) {
-						Console.Write(info.GetSongs() == 1 ? file : file + "#" + (song + 1));
-						foreach (int j in n)
-							Console.Write("\t{0}", j);
-						Console.WriteLine();
-						break;
-					}
-				}
-			}
-		}
-		return 0;
-	}
-
-	// files with high frequencies as identified by chksap.pl -s --features
-	static readonly string[] Files = {
-		"Composers/Anal_lysator/Bhogoosh.sap",
-		"Composers/Anal_lysator/Seban_Ty_Prosiaq.sap",
-		"Composers/Armijo_Richard_J/Cipher_of_Moving_Compass.sap",
-		"Composers/Armijo_Richard_J/Congrabalation.sap",
-		"Composers/Armijo_Richard_J/Congrabalation_Mono.sap",
-		"Composers/Armijo_Richard_J/Pokey_Axel_Foley.sap",
-		"Composers/Armijo_Richard_J/Those_Were_the_Good_Old_Da.sap",
-		"Composers/Badkowski_Marek/Deafman.sap",
-		"Composers/Badkowski_Marek/Drunklob.sap",
-		"Composers/Badkowski_Marek/Full_Shock.sap",
-		"Composers/Badkowski_Marek/Mental_Age_End.sap",
-		"Composers/Badkowski_Marek/Nemesis.sap",
-		"Composers/Balkowski_Krzysztof/Intro_X.sap",
-		"Composers/Balkowski_Krzysztof/sEXTOn_Is_Come_in.sap",
-		"Composers/Banas_Pawel/Shadow.sap",
-		"Composers/Banaszkiewicz_Marcin/Arena_Bzdur_Intro.sap",
-		"Composers/Banaszkiewicz_Marcin/Arena_Bzdur_Menu.sap",
-		"Composers/Banaszkiewicz_Michal/Hugo_1.sap",
-		"Composers/Banaszkiewicz_Michal/Hugo_2.sap",
-		"Composers/Banaszkiewicz_Michal/Hugo_6.sap",
-		"Composers/Bernasek_Jiri/Easy_Demo.sap",
-		"Composers/Bienias_Adam/Bitter_Reality_Flexible_Sq.sap",
-		"Composers/Bienias_Adam/Bitter_Reality_Greetings_P.sap",
-		"Composers/Bienias_Adam/Dimension_X.sap",
-		"Composers/Bienias_Adam/Hitsquad.sap",
-		"Composers/Bienias_Adam/Impression.sap",
-		"Composers/Bienias_Adam/Just_Fancy.sap",
-		"Composers/Bienias_Adam/LFF_Intro.sap",
-		"Composers/Bienias_Adam/Little_3.sap",
-		"Composers/Bienias_Adam/Ojej.sap",
-		"Composers/Billyard_Adam/Henri.sap",
-		"Composers/Brooke_Jason/Feud.sap",
-		"Composers/Bruenninski_Uwe/Synthy.sap",
-		"Composers/Ce_Pumpkin/Animkomials_Meets_Main.sap",
-		"Composers/Ce_Pumpkin/Bauvaneck.sap",
-		"Composers/Ce_Pumpkin/FrayerSmarker_Absent_Absyn.sap",
-		"Composers/Ce_Pumpkin/MyIDE_Demo_Zwei.sap",
-		"Composers/Ce_Pumpkin/Priceless.sap",
-		"Composers/Ce_Pumpkin/R0l0_8.sap",
-		"Composers/Ce_Pumpkin/Revenge_of_Ce_Pumpkin.sap",
-		"Composers/Ce_Pumpkin/Rolo_3.sap",
-		"Composers/Ce_Pumpkin/Rolo_6.sap",
-		"Composers/Ce_Pumpkin/Rulez_2.sap",
-		"Composers/Ce_Pumpkin/Songanim.sap",
-		"Composers/Ce_Pumpkin/Too_Hard_3.sap",
-		"Composers/Ce_Pumpkin/Too_Hard_4_1.sap",
-		"Composers/Ce_Pumpkin/Too_Hard_4_2.sap",
-		"Composers/Ce_Pumpkin/Too_Hard_4_Pomyje.sap",
-		"Composers/Cierkonski_Michal/Ergo_Bibamus_Trackmo.sap",
-		"Composers/Cierkonski_Michal/Fuckir.sap",
-		"Composers/Cierkonski_Michal/Ja_jo.sap",
-		"Composers/Cierkonski_Michal/Kaszana.sap",
-		"Composers/Cierkonski_Michal/Kowboj.sap",
-		"Composers/Cierkonski_Michal/Mixer_1.sap",
-		"Composers/Cierkonski_Michal/Scene_Register_5_0_Intro.sap",
-		"Composers/Cierkonski_Michal/Schizophrenics_Vision.sap",
-		"Composers/Cierkonski_Michal/The_Dream_3.sap",
-		"Composers/Cierkonski_Michal/Yeah_Yeah.sap",
-		"Composers/Cierkonski_Michal/Yo.sap",
-		"Composers/Cieslewicz_Tomasz/Koziol.sap",
-		"Composers/Cieslewicz_Tomasz/Nasze.sap",
-		"Composers/Claas_Clever/Time_to_Enjoy_Part_2.sap",
-		"Composers/Cornelius_Orall/Ruff_And_Reddy.sap",
-		"Composers/Cornelius_Orall/Sidewinder_2.sap",
-		"Composers/Cornelius_Orall/Slingshot.sap",
-		"Composers/Cornelius_Orall/Speed_Hawk.sap",
-		"Composers/Cornelius_Orall/Super_Soccer.sap",
-		"Composers/Cornelius_Orall/Tiger_Attack.sap",
-		"Composers/Czartynski_Marcin/Demo.sap",
-		"Composers/Czartynski_Marcin/Gravity_97_Invitro.sap",
-		"Composers/Czartynski_Marcin/Heretic_Crew_Limited_Dem_3.sap",
-		"Composers/Czartynski_Marcin/Journey.sap",
-		"Composers/Czartynski_Marcin/Journey_Alternative.sap",
-		"Composers/Czartynski_Marcin/Juzek.sap",
-		"Composers/Czartynski_Marcin/Rush_Hours_97_Invitro.sap",
-		"Composers/Czartynski_Marcin/Saper_Konstruktor.sap",
-		"Composers/Czartynski_Marcin/Slideshit_Intro.sap",
-		"Composers/Czartynski_Marcin/Titus_Slideshow.sap",
-		"Composers/Czlowiek_W_Atomizerze/500_Proc_Intro_Mustak.sap",
-		"Composers/Czlowiek_W_Atomizerze/Piua_TarCZoWA.sap",
-		"Composers/Czlowiek_W_Atomizerze/p0maranCZ0WA_plAma.sap",
-		"Composers/Diepenhorst_Marius/I_Will_Survive.sap",
-		"Composers/Diepenhorst_Marius/JHV_2k2_Demo.sap",
-		"Composers/Dojwa_Jacek/Jumping_Jack_Ingame.sap",
-		"Composers/Drozdowski_Marek/Help_Owsiak.sap",
-		"Composers/Drozdowski_Marek/Lemmings_Prevision_Intro.sap",
-		"Composers/Duesterhoeft_Stephan/ABBUC_8.sap",
-		"Composers/Duma_Dariusz/Bug_in_the_Mug.sap",
-		"Composers/Duma_Dariusz/Day_Without_Idea.sap",
-		"Composers/Duma_Dariusz/Follow_Your_Dream.sap",
-		"Composers/Duma_Dariusz/Izolation.sap",
-		"Composers/Duma_Dariusz/Lay_Down_and_Enjoy_It.sap",
-		"Composers/Duma_Dariusz/Murder_Intro.sap",
-		"Composers/Duma_Dariusz/Natural_Excess.sap",
-		"Composers/Duma_Dariusz/One_Fast_Day.sap",
-		"Composers/Duma_Dariusz/Rotten_Juice_Intro.sap",
-		"Composers/Duma_Dariusz/Smooth_Loop.sap",
-		"Composers/Duma_Dariusz/Superboy.sap",
-		"Composers/Eisenhammer_Zdenek/Deus_Ex_Machina.sap",
-		"Composers/Eisenhammer_Zdenek/Diamondz_Ingame.sap",
-		"Composers/Eisenhammer_Zdenek/Diamondz_Title.sap",
-		"Composers/Eisenhammer_Zdenek/Jozin_z_bazin.sap",
-		"Composers/Eisenhammer_Zdenek/Krakout.sap",
-		"Composers/Eisenhammer_Zdenek/Mind_Blast_Ingame.sap",
-		"Composers/Eisenhammer_Zdenek/Spellbound_Partial_Version.sap",
-		"Composers/Esquivel_Sal/ActRaiser_Level_1_1.sap",
-		"Composers/Esquivel_Sal/ActRaiser_Level_1_1_Stereo.sap",
-		"Composers/Esquivel_Sal/Battle_Squadron.sap",
-		"Composers/Esquivel_Sal/Battle_Squadron_Stereo.sap",
-		"Composers/Esquivel_Sal/Blaster_Master_Level_1.sap",
-		"Composers/Esquivel_Sal/Blaster_Master_Level_1_Ste.sap",
-		"Composers/Esquivel_Sal/Crocketts_Theme.sap",
-		"Composers/Esquivel_Sal/Every_Breath_You_Take.sap",
-		"Composers/Esquivel_Sal/Gemini_Man.sap",
-		"Composers/Esquivel_Sal/Hybris_Title.sap",
-		"Composers/Esquivel_Sal/Mega_Man_III_Sparkman.sap",
-		"Composers/Esquivel_Sal/Obliterator_Stereo.sap",
-		"Composers/Esquivel_Sal/OutRun_Magical_Sound_Sho_S.sap",
-		"Composers/Esquivel_Sal/OutRun_Magical_Sound_Showe.sap",
-		"Composers/Esquivel_Sal/OutRun_Splash_Wave.sap",
-		"Composers/Esquivel_Sal/OutRun_Splash_Wave_Stereo.sap",
-		"Composers/Esquivel_Sal/Outrun_Passing_Breeze.sap",
-		"Composers/Esquivel_Sal/Outrun_Passing_Breeze_Ster.sap",
-		"Composers/Esquivel_Sal/Space_Harrier_Godarni.sap",
-		"Composers/Esquivel_Sal/Space_Harrier_Lakeside_Mem.sap",
-		"Composers/Esquivel_Sal/Space_Harrier_White_Summer.sap",
-		"Composers/Esquivel_Sal/Space_Harrier_Wiwi_Jumbo.sap",
-		"Composers/Esquivel_Sal/Stardust_Memories.sap",
-		"Composers/Esquivel_Sal/Tempest_Xtreem_Song_One.sap",
-		"Composers/Esquivel_Sal/Tempest_Xtreem_Song_Three.sap",
-		"Composers/Esquivel_Sal/Tempest_Xtreem_Song_Two.sap",
-		"Composers/Esquivel_Sal/Tempest_Xtreem_Title_Song.sap",
-		"Composers/Esquivel_Sal/Toobin.sap",
-		"Composers/Esquivel_Sal/Toobin_Title.sap",
-		"Composers/Esquivel_Sal/Trans_Atlantic.sap",
-		"Composers/Ezcan_Kemal/Digiloo_Digiley.sap",
-		"Composers/Ezcan_Kemal/Globetrotter.sap",
-		"Composers/Farkas_Felker/ABBUC_36.sap",
-		"Composers/Farkas_Felker/Joyride_End.sap",
-		"Composers/Farkas_Felker/Joyride_Juggler.sap",
-		"Composers/Farkas_Felker/Joyride_Landscape.sap",
-		"Composers/Farkas_Felker/Joyride_Scrolls.sap",
-		"Composers/Farkas_Felker/Joyride_Turn_Disk.sap",
-		"Composers/Farkas_Felker/Joyride_Twirl.sap",
-		"Composers/Feske_Nils/Tambumbi.sap",
-		"Composers/Feske_Nils/Twista.sap",
-		"Composers/Galinski_Adrian/Demology_2.sap",
-		"Composers/Gilbertson_Gary/Alternate_Reality_City_Dan.sap",
-		"Composers/Gilbertson_Gary/Alternate_Reality_City_Int.sap",
-		"Composers/Gilbertson_Gary/Alternate_Reality_City_Smi.sap",
-		"Composers/Gilmore_Adam/Zybex.sap",
-		"Composers/Godlewski_Artur/Sea.sap",
-		"Composers/Goff_Mark/Me_and_Ui_Jumping_in_the_S.sap",
-		"Composers/Goff_Mark/crab_in_a_cave_final_boss.sap",
-		"Composers/Goff_Mark/seaweed_cipst_underwater.sap",
-		"Composers/Golewski_Filip/Another_Speedtro.sap",
-		"Composers/Golewski_Filip/Big_Zine_1_Greetings.sap",
-		"Composers/Golewski_Filip/Black.sap",
-		"Composers/Golewski_Filip/Crazy_Magazine_1_2.sap",
-		"Composers/Golewski_Filip/Date.sap",
-		"Composers/Golewski_Filip/Future.sap",
-		"Composers/Golewski_Filip/Heal.sap",
-		"Composers/Golewski_Filip/Label.sap",
-		"Composers/Golewski_Filip/SFW.sap",
-		"Composers/Golewski_Filip/Story_Module.sap",
-		"Composers/Golewski_Filip/TRC.sap",
-		"Composers/Golewski_Filip/Tekkno.sap",
-		"Composers/Golewski_Filip/Walenie_W_Stolek.sap",
-		"Composers/Grad_Jacek/Grom.sap",
-		"Composers/Grad_Jacek/Twarze_i_Cienie.sap",
-		"Composers/Grayscale/Chromaluma.sap",
-		"Composers/Grayscale/DrillDance.sap",
-		"Composers/Grayscale/Gray_Set_Willy.sap",
-		"Composers/Grayscale/Irish_Wood.sap",
-		"Composers/Grayscale/Jam_Session.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Alive.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Alone.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Back_To_Life_2.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Cause_It_Hurts.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Czubeck_Parejd.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Deep_Kick.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Detox.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Expectancy.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Expression_2.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Extreme.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Extremely_Flammable.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/For_Replay.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Heartbreaker.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Hip.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Hope_1999.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Misunderstanding.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/One_Little_Step.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Poor_Rock_n_Roll.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Reborn.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Sabbath_2.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Sadness.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Schizofrenia.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Short_Reflex.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Slim_to_none.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/So_Alone.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Soul_Breakin.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Szczur.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Szwindel.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Total_Eclipse.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Transmission_Into_Your_Hea.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Tribute_to.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Ultra.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Ultrance.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/UnderTrencinPressure.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Voice_of_Silence_III_Previ.sap",
-		"Composers/Grayscale/Kwiatek_Grzegorz/Voice_of_Silence_IV.sap",
-		"Composers/Grayscale/Pneumatic_Driller.sap",
-		"Composers/Grayscale/Running_Emu.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/ABC_Ingame.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Accident.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Andal.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Barymag_2_5.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Beer_Bibber.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Boremloza.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Cabil.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Czarna_dziura_w_dupie.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Dziobaty.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Falex.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Genia.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Glikol.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Happy_Oriental_Kids.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Kasz.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Klita.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Kowip.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Mepss.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Mixer.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Porazka_3_KamiBa.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Rake_in_Church.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Smell_Illusion.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Swift_Ray.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/Time_Is_Get_Rid_of_Grandfa.sap",
-		"Composers/Grayscale/Sychowicz_Lukasz/X_Ray_2.sap",
-		"Composers/Grayscale/Wasiel_Bartek/Dropsy_King.sap",
-		"Composers/Grayscale/Wasiel_Bartek/Too_Late.sap",
-		"Composers/Grayscale/Windy_Mind.sap",
-		"Composers/Grayscale/WooBooDoo.sap",
-		"Composers/Hay_Adam/Amegas.sap",
-		"Composers/Hay_Adam/Approachong.sap",
-		"Composers/Hay_Adam/Gyges_Will_You_Help_Me.sap",
-		"Composers/Hay_Adam/Hawkeye.sap",
-		"Composers/Hay_Adam/Psilocybe_Mexicana.sap",
-		"Composers/Hay_Adam/Reaxion_Title.sap",
-		"Composers/Hay_Adam/Wiz.sap",
-		"Composers/Holda_Leszek/Klatwa_Ingame.sap",
-		"Composers/Hryn_Piotr/Party_5.sap",
-		"Composers/Hubbard_Rob/Extirpator.sap",
-		"Composers/Hubbard_Rob/International_Karate.sap",
-		"Composers/Hubbard_Rob/Jet_Set_Willy.sap",
-		"Composers/Hubbard_Rob/Warhawk.sap",
-		"Composers/Hudak_Matej/Shorty_Noises.sap",
-		"Composers/Huntington_Glenys/Capt_Stickys_Gold.sap",
-		"Composers/Huntington_Glenys/Fire_Chief.sap",
-		"Composers/Huntington_Glenys/Robin_Hood.sap",
-		"Composers/Husak_Jakub/Problem_Jasia_Ingame.sap",
-		"Composers/Husak_Jakub/Rycerz.sap",
-		"Composers/Husak_Jakub/Thinker_1.sap",
-		"Composers/Iwaszko_Krystian/Droga_do_Duplandu.sap",
-		"Composers/Iwaszko_Krystian/Dziad_sie_jara.sap",
-		"Composers/Iwaszko_Krystian/Every_Bone_Broken.sap",
-		"Composers/Iwaszko_Krystian/Hooy_F.sap",
-		"Composers/Iwaszko_Krystian/IK_Crazy_Remix.sap",
-		"Composers/Iwaszko_Krystian/Konduktor_Przyjacielem_Jes.sap",
-		"Composers/Iwaszko_Krystian/Mechanic.sap",
-		"Composers/Iwaszko_Krystian/No_Name.sap",
-		"Composers/Iwaszko_Krystian/Pies_drapie_sie_po_jajach.sap",
-		"Composers/Iwaszko_Krystian/R2K440.sap",
-		"Composers/Iwaszko_Krystian/Samantha.sap",
-		"Composers/Iwaszko_Krystian/Satan_Huj.sap",
-		"Composers/Iwaszko_Krystian/Satan_Rox.sap",
-		"Composers/Iwaszko_Krystian/THC_Kokot.sap",
-		"Composers/Iwaszko_Krystian/THC_Rulla.sap",
-		"Composers/Iwaszko_Krystian/THC_TMC.sap",
-		"Composers/Iwaszko_Krystian/XC12.sap",
-		"Composers/Iwaszko_Krystian/Z53.sap",
-		"Composers/Iwaszko_Krystian/Zielony_Naplet.sap",
-		"Composers/Jastrzemski_Marcin/Czdkom_2.sap",
-		"Composers/Jastrzemski_Marcin/Fox.sap",
-		"Composers/Johnson_Steve/Enemy_Within.sap",
-		"Composers/Kalinowski_Bartosz/Barymag_1_Intro.sap",
-		"Composers/Kalinowski_Bartosz/Hcl5.sap",
-		"Composers/Kalinowski_Bartosz/Kapitan_Planeta.sap",
-		"Composers/Kalinowski_Bartosz/Robin_Wojownik_Czasu.sap",
-		"Composers/Kalinowski_Bartosz/Self_Test_2.sap",
-		"Composers/Kalinowski_Bartosz/Sweet_Illusions_Shadebobs.sap",
-		"Composers/Kalinowski_Bartosz/Zepi.sap",
-		"Composers/Kalinowski_Bartosz/Zeus.sap",
-		"Composers/Karpowicz_Henryk/Koleda_1.sap",
-		"Composers/Karwacki_Jakub/East_Party_2003_Invi_Intro.sap",
-		"Composers/Karwacki_Jakub/Lanos.sap",
-		"Composers/Karwacki_Jakub/Lark.sap",
-		"Composers/Karwacki_Jakub/Qwerty.sap",
-		"Composers/Karwoth_Torsten/Demo_1.sap",
-		"Composers/Karwoth_Torsten/FOFT.sap",
-		"Composers/Kazimierczak_Leszek/Bad_Girl.sap",
-		"Composers/Kazimierczak_Leszek/Megata_Zine_1_Intro.sap",
-		"Composers/Kidaj_Andrzej/Minier.sap",
-		"Composers/Kidaj_Andrzej/Yamaha.sap",
-		"Composers/Kociuba_Dariusz/Odezwa_3_Lobo.sap",
-		"Composers/Kociuba_Dariusz/Salcesonfix_Zine.sap",
-		"Composers/Kociuba_Dariusz/Vioris.sap",
-		"Composers/Kolakowski_Daniel/Mozart_01.sap",
-		"Composers/Kolakowski_Daniel/Unite.sap",
-		"Composers/Krawczyk_Adam/Magic_Dimension_1.sap",
-		"Composers/Krix_Mario/Breakthrung.sap",
-		"Composers/Krix_Mario/Complex.sap",
-		"Composers/Krix_Mario/Dragon_Fine.sap",
-		"Composers/Krix_Mario/Panther.sap",
-		"Composers/Krix_Mario/Satisfaction.sap",
-		"Composers/Krix_Mario/Sll1.sap",
-		"Composers/Krix_Mario/Slow.sap",
-		"Composers/Krix_Mario/Stardust_Memories.sap",
-		"Composers/Krix_Mario/TT.sap",
-		"Composers/Krix_Mario/Zeldahm.sap",
-		"Composers/Kucharski_Konrad/Piczka.sap",
-		"Composers/Kucisz_Tomasz/Network.sap",
-		"Composers/Kuczek_Ireneusz/Echo.sap",
-		"Composers/Kuczek_Ireneusz/Mama.sap",
-		"Composers/Kuczek_Ireneusz/Said_I_Love_You.sap",
-		"Composers/Kulinski_Grzegorz/Psy_hoza.sap",
-		"Composers/Kulinski_Grzegorz/Yeah.sap",
-		"Composers/Lajciak_Pavol/R_Type.sap",
-		"Composers/Lajciak_Pavol/This_One_Comes_from_Slovak.sap",
-		"Composers/Lajciak_Pavol/Wild_Jet.sap",
-		"Composers/Lepkowski_Michal/Blackout.sap",
-		"Composers/Lepkowski_Michal/Cypress.sap",
-		"Composers/Lepkowski_Michal/Likuit_4k.sap",
-		"Composers/Lepkowski_Michal/Odyssey_of_the_Mind.sap",
-		"Composers/Lepkowski_Michal/Tekblast_Ingame_2.sap",
-		"Composers/Lepkowski_Michal/Vengeance_Main_Part.sap",
-		"Composers/Lewandowski_Marcin/Grunwald_1410_Ingame_2.sap",
-		"Composers/Libic_Ladislav/Lac_Intro_II_part_6.sap",
-		"Composers/Liebich_Tomasz/Alien.sap",
-		"Composers/Liebich_Tomasz/Dictum_Acerbum.sap",
-		"Composers/Liebich_Tomasz/Drack.sap",
-		"Composers/Liebich_Tomasz/Duksap_1.sap",
-		"Composers/Liebich_Tomasz/Fluid_Kha_Intro.sap",
-		"Composers/Liebich_Tomasz/Hawkmoon.sap",
-		"Composers/Liebich_Tomasz/Nemesis_2.sap",
-		"Composers/Liebich_Tomasz/Perestroyka_Left_Channel.sap",
-		"Composers/Liebich_Tomasz/Perestroyka_Right_Channel.sap",
-		"Composers/Liebich_Tomasz/Sky_Computer_Network.sap",
-		"Composers/Liebich_Tomasz/Technus.sap",
-		"Composers/Liebich_Tomasz/Ucieczka.sap",
-		"Composers/Lis_Marcin/Pyramid_Ingame.sap",
-		"Composers/Lis_Piotr/Wyjasnijmy_to_sobie.sap",
-		"Composers/Luberda_Michal/Barahir_Ingame.sap",
-		"Composers/Luberda_Michal/Frank_and_Mark_Ingame.sap",
-		"Composers/Luberda_Michal/Kernaw.sap",
-		"Composers/Luberda_Michal/Kernaw_Ingame.sap",
-		"Composers/Luberda_Michal/U235.sap",
-		"Composers/Maderanek_Peter/Avex_1.sap",
-		"Composers/Majchrzak_Marcin/D_City.sap",
-		"Composers/Majchrzak_Marcin/Faza_4_Mona.sap",
-		"Composers/Majchrzak_Marcin/Psychodela.sap",
-		"Composers/Majchrzak_Marcin/Techno_Collection_4.sap",
-		"Composers/Majewski_Tomasz/Copy_Party_1996_Info.sap",
-		"Composers/Majewski_Tomasz/Detonator_Title.sap",
-		"Composers/Majewski_Tomasz/Detonator_Winner.sap",
-		"Composers/Majewski_Tomasz/Hellgate.sap",
-		"Composers/Majewski_Tomasz/Lunapark.sap",
-		"Composers/Majewski_Tomasz/Ninja.sap",
-		"Composers/Majewski_Tomasz/Outsider.sap",
-		"Composers/Majewski_Tomasz/Riders_From_The_Stars.sap",
-		"Composers/Majewski_Tomasz/The_Truth_Is_Out_There.sap",
-		"Composers/Maris_John/Mines.sap",
-		"Composers/Martin_Aleksander/Bobsland.sap",
-		"Composers/Martin_Aleksander/Kit_14.sap",
-		"Composers/Martin_Aleksander/Max_Ingame.sap",
-		"Composers/Martin_Aleksander/More.sap",
-		"Composers/Martin_Aleksander/Mr_Proper.sap",
-		"Composers/Martin_Aleksander/Mr_Proper_Ingame.sap",
-		"Composers/Martin_Aleksander/Mr_Proper_Ingame_2.sap",
-		"Composers/Martin_Aleksander/Sheol_side_A.sap",
-		"Composers/Martin_Aleksander/Timeless_Announcemt_Load_5.sap",
-		"Composers/Martin_Aleksander/Unknown.sap",
-		"Composers/Martin_Chris/After_the_Storm.sap",
-		"Composers/Martin_Chris/Approachong.sap",
-		"Composers/Martin_Chris/Approachong_stereo.sap",
-		"Composers/Martin_Chris/Blue_Monday.sap",
-		"Composers/Martin_Chris/Crystal_Hammer.sap",
-		"Composers/Martin_Chris/Cybernoid_Song.sap",
-		"Composers/Martin_Chris/Deflector.sap",
-		"Composers/Martin_Chris/Ecstacy_Song.sap",
-		"Composers/Martin_Chris/Fairlightning.sap",
-		"Composers/Martin_Chris/Popcorn_Song.sap",
-		"Composers/Martin_Chris/Push_Maxi_Re_Mix.sap",
-		"Composers/Matoga_Adrian/Meryb.sap",
-		"Composers/Matoga_Adrian/Scream.sap",
-		"Composers/Matyasik_Krzysztof/Atak_serca.sap",
-		"Composers/Matyasik_Krzysztof/Karkoweczka.sap",
-		"Composers/Matyasik_Krzysztof/Koninka.sap",
-		"Composers/Matyasik_Krzysztof/Ogluszacz_Intro.sap",
-		"Composers/Matyasik_Krzysztof/Pretty_Chlebek.sap",
-		"Composers/Matyasik_Krzysztof/Schabik.sap",
-		"Composers/Matyasik_Krzysztof/Wieprzowinka.sap",
-		"Composers/Matyasik_Krzysztof/Wolowinka.sap",
-		"Composers/Matyasik_Krzysztof/Wolowinka_Sampled.sap",
-		"Composers/Mikolajczak_Pawel/Zbir.sap",
-		"Composers/Mrozowski_Robert/Going_to_California.sap",
-		"Composers/Munns_Richard/Black_Lamp.sap",
-		"Composers/Munns_Richard/Black_Lamp_Ingame.sap",
-		"Composers/Munns_Richard/Crumbles_Crisis.sap",
-		"Composers/Munns_Richard/Filthy_Rich.sap",
-		"Composers/Munns_Richard/Plastron.sap",
-		"Composers/Munns_Richard/Rebound.sap",
-		"Composers/Munns_Richard/Tagalon.sap",
-		"Composers/Munns_Richard/Tube_Baddies.sap",
-		"Composers/Munns_Richard/Zero_War.sap",
-		"Composers/Murray_Chris/Winter_Games_88_Biathlon.sap",
-		"Composers/Murray_Chris/Winter_Games_88_Bobsled.sap",
-		"Composers/Murray_Chris/Winter_Games_88_Downhill.sap",
-		"Composers/Murray_Chris/Winter_Games_88_Ski_Jump.sap",
-		"Composers/Murray_Chris/Winter_Games_88_Slalom.sap",
-		"Composers/Nedved_Vojtech/Amelie.sap",
-		"Composers/Nedved_Vojtech/Aoki.sap",
-		"Composers/Nedved_Vojtech/Rudi_Extrudi_Goes_to_Pragu.sap",
-		"Composers/Numan_Daniel/Dwuetyloamid.sap",
-		"Composers/Numan_Daniel/Komercja.sap",
-		"Composers/Numan_Daniel/Motherfuckin_Bitch_Wodecka.sap",
-		"Composers/Numan_Daniel/Pentagram_2_Info.sap",
-		"Composers/Numan_Daniel/Pentagram_3_Music_1.sap",
-		"Composers/Numan_Daniel/Pentagram_3_Music_3.sap",
-		"Composers/Numan_Daniel/Pentagram_4_Silence.sap",
-		"Composers/Numan_Daniel/Psychodelic_Acied.sap",
-		"Composers/Numan_Daniel/Raving_Vieprz_1.sap",
-		"Composers/Numan_Daniel/THC_Vibration.sap",
-		"Composers/Numan_Daniel/Vasco_Public_Domain_10_3.sap",
-		"Composers/Oglodek_Marek/Odsyfka.sap",
-		"Composers/Oscadal_Filip/Balleantro.sap",
-		"Composers/Oscadal_Filip/Brutal_Recall_Demo.sap",
-		"Composers/Oscadal_Filip/Lemmings_Intro.sap",
-		"Composers/Oscadal_Filip/Lemmings_Intro_2.sap",
-		"Composers/Oscadal_Filip/Vaxeen_Photographic.sap",
-		"Composers/Padula_Jaroslaw/Horror.sap",
-		"Composers/Padula_Jaroslaw/Keczapek.sap",
-		"Composers/Padula_Jaroslaw/Men_02.sap",
-		"Composers/Padula_Jaroslaw/Przepraszam.sap",
-		"Composers/Padula_Jaroslaw/Reason.sap",
-		"Composers/Padula_Jaroslaw/So_Old.sap",
-		"Composers/Padula_Jaroslaw/Some_Nice_AB.sap",
-		"Composers/Padula_Jaroslaw/Tech2.sap",
-		"Composers/Padula_Jaroslaw/Techno_Collection_1.sap",
-		"Composers/Padula_Jaroslaw/Toy_Intro.sap",
-		"Composers/Padula_Jaroslaw/Very_Very.sap",
-		"Composers/Padula_Jaroslaw/Wave_X.sap",
-		"Composers/Padula_Jaroslaw/Xc9012.sap",
-		"Composers/Padula_Jaroslaw/Z.sap",
-		"Composers/Panopticum/Atari.sap",
-		"Composers/Panopticum/Autumn.sap",
-		"Composers/Panopticum/Bonanza.sap",
-		"Composers/Panopticum/Guns.sap",
-		"Composers/Panopticum/Morze.sap",
-		"Composers/Panopticum/Motor.sap",
-		"Composers/Panopticum/Musiczka.sap",
-		"Composers/Panopticum/Summer.sap",
-		"Composers/Pasiecznik_Michal/Damned.sap",
-		"Composers/Pasiecznik_Michal/Damned_Remix.sap",
-		"Composers/Pelc_Janusz/Captain_Gather.sap",
-		"Composers/Pelc_Janusz/Lasermania.sap",
-		"Composers/Pelc_Janusz/Winner.sap",
-		"Composers/Pesout_Marek/Acid_1.sap",
-		"Composers/Pesout_Marek/Anger.sap",
-		"Composers/Pesout_Marek/Asylum.sap",
-		"Composers/Pesout_Marek/Bad_Drome.sap",
-		"Composers/Pesout_Marek/Blade_Runner.sap",
-		"Composers/Pesout_Marek/Bounce.sap",
-		"Composers/Pesout_Marek/Czech_Sound_2.sap",
-		"Composers/Pesout_Marek/Delirium.sap",
-		"Composers/Pesout_Marek/Destruction.sap",
-		"Composers/Pesout_Marek/Dick_Tracy.sap",
-		"Composers/Pesout_Marek/Gangsters.sap",
-		"Composers/Pesout_Marek/Genlog.sap",
-		"Composers/Pesout_Marek/Lemmblaster.sap",
-		"Composers/Pesout_Marek/Liftboy.sap",
-		"Composers/Pesout_Marek/Megamix.sap",
-		"Composers/Pesout_Marek/Messiah_from_Outer_Space.sap",
-		"Composers/Pesout_Marek/Molecula.sap",
-		"Composers/Pesout_Marek/Paegas.sap",
-		"Composers/Pesout_Marek/Paradise.sap",
-		"Composers/Pesout_Marek/Peach.sap",
-		"Composers/Pesout_Marek/Picture_H_I_P.sap",
-		"Composers/Pesout_Marek/Science.sap",
-		"Composers/Pesout_Marek/Shadow.sap",
-		"Composers/Pesout_Marek/Swamp_Thing.sap",
-		"Composers/Pesout_Marek/T_Rex.sap",
-		"Composers/Pesout_Marek/Techwalk.sap",
-		"Composers/Pesout_Marek/Tekk_Drums_1.sap",
-		"Composers/Pesout_Marek/Tekkno_Experience_part_2_1.sap",
-		"Composers/Pesout_Marek/Tekkno_Experience_part_2_2.sap",
-		"Composers/Pesout_Marek/Ticket.sap",
-		"Composers/Pesout_Marek/Tribal.sap",
-		"Composers/Pesout_Marek/Who_3.sap",
-		"Composers/Piscol_Juergen/Atari_Variationen.sap",
-		"Composers/Piscol_Juergen/Synthi_1.sap",
-		"Composers/Podedworny_Wojtek/Pandemonium.sap",
-		"Composers/Podedworny_Wojtek/Wizard.sap",
-		"Composers/Potter_Mike/Chicken.sap",
-		"Composers/Potter_Mike/Plaque_Man.sap",
-		"Composers/Potter_Mike/Protector.sap",
-		"Composers/Potter_Mike/Protector_II.sap",
-		"Composers/Potter_Mike/Shadow_World.sap",
-		"Composers/Przybyszewski_Krzysztof/Blasta_Basta.sap",
-		"Composers/Przybyszewski_Krzysztof/Darkness_Subway.sap",
-		"Composers/Przybyszewski_Krzysztof/Fast_Excess.sap",
-		"Composers/Przybyszewski_Krzysztof/Happy_97.sap",
-		"Composers/Przybyszewski_Krzysztof/Lama.sap",
-		"Composers/Przybyszewski_Krzysztof/Lokowka_Szal.sap",
-		"Composers/Przybyszewski_Krzysztof/Place_in_the_Space.sap",
-		"Composers/Przybyszewski_Krzysztof/Room.sap",
-		"Composers/Przybyszewski_Krzysztof/Siphon.sap",
-		"Composers/Przybyszewski_Krzysztof/Spawik.sap",
-		"Composers/Pucinski_Rafal/AR_1.sap",
-		"Composers/Pucinski_Rafal/Anty_SS_Zine_2.sap",
-		"Composers/Pucinski_Rafal/Disk.sap",
-		"Composers/Pucinski_Rafal/Memory.sap",
-		"Composers/Pucinski_Rafal/Warrior.sap",
-		"Composers/Radecki_Michal/Ilusia.sap",
-		"Composers/Radecki_Michal/Kostka.sap",
-		"Composers/Radzikowski_Ireneusz/Another_Day_in_Paradise.sap",
-		"Composers/Radzikowski_Ireneusz/Back_to_Life.sap",
-		"Composers/Radzikowski_Ireneusz/Christmas_mix.sap",
-		"Composers/Radzikowski_Ireneusz/Comeback.sap",
-		"Composers/Radzikowski_Ireneusz/Cyper_Space.sap",
-		"Composers/Radzikowski_Ireneusz/Draconus_Remix.sap",
-		"Composers/Radzikowski_Ireneusz/Escape_from_the_Orbit.sap",
-		"Composers/Radzikowski_Ireneusz/Historia_Niespelnionych_4.sap",
-		"Composers/Radzikowski_Ireneusz/Puzmania.sap",
-		"Composers/Radzikowski_Ireneusz/Savage_Intro.sap",
-		"Composers/Radzikowski_Ireneusz/The_Best_Car.sap",
-		"Composers/Rentgen/Victoria_JHS_Hidden_1.sap",
-		"Composers/Roemer_Markus/Biene_Maja.sap",
-		"Composers/Rymorz_W/Arkanoid_II.sap",
-		"Composers/Scarim_Nicholas/Spy_vs_Spy_Arctic_Antics.sap",
-		"Composers/Skwiot_Stanislaw/Fortuna.sap",
-		"Composers/Stanik_Krzysztof/Ble_ble_ble.sap",
-		"Composers/Stanik_Krzysztof/Mroczny.sap",
-		"Composers/Sterba_Radek/Android.sap",
-		"Composers/Sterba_Radek/Astro4road.sap",
-		"Composers/Sterba_Radek/Basix.sap",
-		"Composers/Sterba_Radek/Cervi2.sap",
-		"Composers/Sterba_Radek/Cubico.sap",
-		"Composers/Sterba_Radek/Enigma_part_2.sap",
-		"Composers/Sterba_Radek/First.sap",
-		"Composers/Sterba_Radek/Flop_Magazin_30_Just_Now.sap",
-		"Composers/Sterba_Radek/Flop_Magazin_31.sap",
-		"Composers/Sterba_Radek/Flop_Magazin_31_Christmas.sap",
-		"Composers/Sterba_Radek/Flop_Magazin_33.sap",
-		"Composers/Sterba_Radek/Flop_Magazin_36_38.sap",
-		"Composers/Sterba_Radek/Flop_Magazin_40.sap",
-		"Composers/Sterba_Radek/Gem_x.sap",
-		"Composers/Sterba_Radek/Illusion_2.sap",
-		"Composers/Sterba_Radek/Indiana_Jones_4.sap",
-		"Composers/Sterba_Radek/L45t_M1nut3.sap",
-		"Composers/Sterba_Radek/Music.sap",
-		"Composers/Sterba_Radek/Naturix_Tune_2.sap",
-		"Composers/Sterba_Radek/Posthelper.sap",
-		"Composers/Sterba_Radek/Posthelper_Tune_3.sap",
-		"Composers/Sterba_Radek/Predator.sap",
-		"Composers/Strobe/Romantic_Squirrelwedding_i.sap",
-		"Composers/Strobe/Star_Legend_Mainscreen_Int.sap",
-		"Composers/Strobe/Town_of_Ui.sap",
-		"Composers/Strzelec_Pawel/Miny.sap",
-		"Composers/Szczesniak_Konrad/3d24_1.sap",
-		"Composers/Szczesniak_Konrad/3d24_2.sap",
-		"Composers/Szczesniak_Maciek/Das_Anty_Adolf_Demo_1.sap",
-		"Composers/Szpilowski_Michal/7_Gates_of_Jambala.sap",
-		"Composers/Szpilowski_Michal/Bomb_Jack.sap",
-		"Composers/Szpilowski_Michal/Cherry_Rave_Experimental.sap",
-		"Composers/Szpilowski_Michal/Das_Boot_X.sap",
-		"Composers/Szpilowski_Michal/Docent.sap",
-		"Composers/Szpilowski_Michal/Galaxia_Ingame.sap",
-		"Composers/Szpilowski_Michal/Game_Over.sap",
-		"Composers/Szpilowski_Michal/Isora.sap",
-		"Composers/Szpilowski_Michal/Kaktus.sap",
-		"Composers/Szpilowski_Michal/Mayhem_X.sap",
-		"Composers/Szpilowski_Michal/Moscow_1993_Stage_1.sap",
-		"Composers/Szpilowski_Michal/My_First_One_RMT.sap",
-		"Composers/Szpilowski_Michal/Nexus_Ingame_2.sap",
-		"Composers/Szpilowski_Michal/Ocean_Detox.sap",
-		"Composers/Szpilowski_Michal/Poseidon.sap",
-		"Composers/Szpilowski_Michal/Postcard_from_Middle_East.sap",
-		"Composers/Szpilowski_Michal/Rondell.sap",
-		"Composers/Szpilowski_Michal/Serious_Magazine_3_4.sap",
-		"Composers/Szpilowski_Michal/Sexy_Six_Alfa_Title.sap",
-		"Composers/Szpilowski_Michal/Some_Song_Remixed.sap",
-		"Composers/Szpilowski_Michal/Song_12.sap",
-		"Composers/Szpilowski_Michal/Teacher_Killer.sap",
-		"Composers/Szpilowski_Michal/Techdrum.sap",
-		"Composers/Szpilowski_Michal/Unknown_Game.sap",
-		"Composers/Szpilowski_Michal/X_Demo_Main_Part.sap",
-		"Composers/Szpilowski_Michal/X_Mass_Greetings_Part.sap",
-		"Composers/Szpilowski_Michal/Yie_Ar_Kung_Fu.sap",
-		"Composers/Szpilowski_Michal/rAmols_Revenge.sap",
-		"Composers/Szymczuk_Daniel/Loriens_Tomb_Game_Over.sap",
-		"Composers/Takacs_Gabriel/Cappela.sap",
-		"Composers/Takacs_Gabriel/Trash.sap",
-		"Composers/Tegethoff_Sven/Roller.sap",
-		"Composers/Tegethoff_Sven/The_Top_2_2.sap",
-		"Composers/Ui/3_Joonkiz_Skullz.sap",
-		"Composers/Ui/Los_Osos_hablan_en_Marte.sap",
-		"Composers/Verdaasdonk_Robert/Unconventional_2000.sap",
-		"Composers/Vila_Jaime/Gyruss_Stereo.sap",
-		"Composers/Vila_Jaime/Megamix_Atari.sap",
-		"Composers/Vila_Jaime/Short_Song.sap",
-		"Composers/Vogt_Dariusz/DJ_V_4.sap",
-		"Composers/Vogt_Dariusz/DJ_V_9.sap",
-		"Composers/Vogt_Dariusz/Leiser_Intro.sap",
-		"Composers/Vybostok_Marian/Alpha.sap",
-		"Composers/Vybostok_Marian/Bristly_Hedgehog.sap",
-		"Composers/Vybostok_Marian/Bristly_Hedgehog_Megamix.sap",
-		"Composers/Vybostok_Marian/Wanted_Part_1.sap",
-		"Composers/Vybostok_Marian/Wanted_Part_3_1.sap",
-		"Composers/Vybostok_Marian/Wanted_Part_4_Mix.sap",
-		"Composers/Vybostok_Marian/Wanted_Part_4_Zeus_Mix.sap",
-		"Composers/Wasilewski_Dariusz/Daras.sap",
-		"Composers/Wasilewski_Dariusz/Labirynt_Smierci.sap",
-		"Composers/Whittaker_David/Amaurote.sap",
-		"Composers/Whittaker_David/Grand_Prix_Simulator.sap",
-		"Composers/Whittaker_David/Panther.sap",
-		"Composers/Whittaker_David/Red_Max.sap",
-		"Composers/Whittaker_David/Trans_Muter.sap",
-		"Composers/Wisniewski_Mateusz/High_Tide.sap",
-		"Composers/Wisniewski_Mateusz/Sillyventure_2k4_Inv.sap",
-		"Composers/Witkiewicz_Dariusz/Dragon.sap",
-		"Composers/Witkiewicz_Dariusz/Grass_Slideshow_End.sap",
-		"Games/Alien_Ambush.sap",
-		"Games/Andromeda.sap",
-		"Games/Archon.sap",
-		"Games/Astro_Chase.sap",
-		"Games/Atomia.sap",
-		"Games/Bilbo.sap",
-		"Games/Boulder_Dash_2.sap",
-		"Games/Bristles.sap",
-		"Games/Carnival_Massacre.sap",
-		"Games/Caverns_of_Khafka.sap",
-		"Games/Chimera.sap",
-		"Games/Clowns_and_Balloons.sap",
-		"Games/Conan.sap",
-		"Games/Culmins_1.sap",
-		"Games/Culmins_2.sap",
-		"Games/Dan_Strikes_Back.sap",
-		"Games/Darts.sap",
-		"Games/Diamonds.sap",
-		"Games/Elevator_Repairman.sap",
-		"Games/Emil_Hilf.sap",
-		"Games/Fire_Power.sap",
-		"Games/Flip_and_Flop.sap",
-		"Games/Floor_Walker.sap",
-		"Games/Frogger.sap",
-		"Games/Frogger_II.sap",
-		"Games/Ghost_Chaser.sap",
-		"Games/Groove.sap",
-		"Games/Gunfight.sap",
-		"Games/Gyruss.sap",
-		"Games/Herbert.sap",
-		"Games/Jigsaws.sap",
-		"Games/Jumping_Jacks_Big_Adventur.sap",
-		"Games/Kasiarz.sap",
-		"Games/Keystone_Kapers.sap",
-		"Games/Killa_Cycle.sap",
-		"Games/Loaded_Brain.sap",
-		"Games/Loops_DX.sap",
-		"Games/Major_Bronx.sap",
-		"Games/Mario_Bros.sap",
-		"Games/Master_of_Time.sap",
-		"Games/Master_of_the_Lamps.sap",
-		"Games/Mediator.sap",
-		"Games/Moon_Patrol.sap",
-		"Games/Nadral.sap",
-		"Games/Ninja.sap",
-		"Games/On_Track.sap",
-		"Games/Pac_Man.sap",
-		"Games/Pac_Man_Eric_Wolz.sap",
-		"Games/Pacific_Coast_Highway.sap",
-		"Games/Poker_Sam.sap",
-		"Games/Professor_IQ.sap",
-		"Games/Saper.sap",
-		"Games/Sargon_II.sap",
-		"Games/Screaming_Wings.sap",
-		"Games/Sea_Chase.sap",
-		"Games/Shamus.sap",
-		"Games/Shamus_Case_II.sap",
-		"Games/Softoy.sap",
-		"Games/Special_Delivery.sap",
-		"Games/Spy_Games_Ingame.sap",
-		"Games/Spys_Demise.sap",
-		"Games/Star_Intruder.sap",
-		"Games/Strip_Poker.sap",
-		"Games/Submission.sap",
-		"Games/Tapper.sap",
-		"Games/Taxicab_Hill.sap",
-		"Games/William_Tell.sap",
-		"Misc/Astrosphere.sap",
-		"Misc/Avex_Intro.sap",
-		"Misc/Bajm.sap",
-		"Misc/Banklan_2.sap",
-		"Misc/Deadline.sap",
-		"Misc/Debiut.sap",
-		"Misc/Desease.sap",
-		"Misc/Hobbytronic_89_1.sap",
-		"Misc/Huhi.sap",
-		"Misc/Instrumentarium.sap",
-		"Misc/L_Orneta_Demo.sap",
-		"Misc/Luzik.sap",
-		"Misc/My_First_Pokey.sap",
-		"Misc/New_Song_1D.sap",
-		"Misc/Only_Chipchop_Can_Save_Us.sap",
-		"Misc/Pokety_Bitches.sap",
-		"Misc/Star_Shot.sap",
-		"Misc/Tajemnice_Atari_Intro.sap",
-		"Misc/Takie_Cos.sap",
-		"Misc/The_Great_Commandment.sap",
-		"Misc/Tribute_To_Virus.sap",
-		"Unknown/AMS/Abracadabra.sap",
-		"Unknown/AMS/Africa.sap",
-		"Unknown/AMS/American_Pie.sap",
-		"Unknown/AMS/Another_Brick_in_the_Wall.sap",
-		"Unknown/AMS/Back_in_the_USSR.sap",
-		"Unknown/AMS/Bee_Fly.sap",
-		"Unknown/AMS/Blue_Moon.sap",
-		"Unknown/AMS/Calypso.sap",
-		"Unknown/AMS/Cancan.sap",
-		"Unknown/AMS/Cecilia.sap",
-		"Unknown/AMS/Copacabana.sap",
-		"Unknown/AMS/Dallas.sap",
-		"Unknown/AMS/Dancing_in_the_Dark.sap",
-		"Unknown/AMS/Do_Ya_Think_I_am_Sexy.sap",
-		"Unknown/AMS/Down_Under.sap",
-		"Unknown/AMS/Eleanor_Rigby.sap",
-		"Unknown/AMS/Footloose.sap",
-		"Unknown/AMS/Hey_Jude.sap",
-		"Unknown/AMS/I_Just_Call_to_Say_I_Love.sap",
-		"Unknown/AMS/Imperial_March_2.sap",
-		"Unknown/AMS/Jingle_Bells.sap",
-		"Unknown/AMS/Light_My_Fire.sap",
-		"Unknown/AMS/Lucy_in_the_Sky_with_Diamo.sap",
-		"Unknown/AMS/Maniac.sap",
-		"Unknown/AMS/Moonlight_Shadow.sap",
-		"Unknown/AMS/Muppet_Show.sap",
-		"Unknown/AMS/Ninety_Nine_Red_Balloons_2.sap",
-		"Unknown/AMS/Norwegian_Wood.sap",
-		"Unknown/AMS/Oh_My_Darling_Clementine.sap",
-		"Unknown/AMS/Old_Batman_TV_Show.sap",
-		"Unknown/AMS/Owner_of_the_Lonely_Heart.sap",
-		"Unknown/AMS/Paperback_Writer.sap",
-		"Unknown/AMS/Rosanna.sap",
-		"Unknown/AMS/Say_Say_Say.sap",
-		"Unknown/AMS/Sleigh_Ride.sap",
-		"Unknown/AMS/Sleigh_Ride_2.sap",
-		"Unknown/AMS/Smoke_on_the_Water.sap",
-		"Unknown/AMS/Stairway_to_Heaven.sap",
-		"Unknown/AMS/Star_Trek.sap",
-		"Unknown/AMS/Star_Wars_Cantina_2.sap",
-		"Unknown/AMS/Summer_Nights.sap",
-		"Unknown/AMS/Take_Five.sap",
-		"Unknown/AMS/Tie_a_Yellow_Ribbon_Round.sap",
-		"Unknown/AMS/Total_Eclipse_of_the_Heart.sap",
-		"Unknown/AMS/Tradition.sap",
-		"Unknown/AMS/We_Can_Work_It_out.sap",
-		"Unknown/AMS/When_Im_64.sap",
-		"Unknown/AMS/Winds_of_War.sap",
-		"Unknown/AMS/Yellow_Submarine.sap",
-		"Unknown/Autum.sap",
-		"Unknown/Blus.sap",
-		"Unknown/CompyShop_Magazin_Inside_B.sap",
-		"Unknown/Condor.sap",
-		"Unknown/Dajana.sap",
-		"Unknown/Door.sap",
-		"Unknown/For_Lobo_2.sap",
-		"Unknown/Grzyby.sap",
-		"Unknown/High_Society_Girl.sap",
-		"Unknown/House_of_Rising_Sun.sap",
-		"Unknown/Lunatic.sap",
-		"Unknown/Music1.sap",
-		"Unknown/Music2.sap",
-		"Unknown/NATO.sap",
-		"Unknown/Panorama.sap",
-		"Unknown/Ranger1.sap",
-		"Unknown/Ranger7.sap",
-		"Unknown/Ranger9.sap",
-		"Unknown/Skladanka.sap",
-		"Unknown/Techno.sap",
-		"Unknown/Time_To_Enjoy.sap",
-		"Unknown/Train.sap",
-		"Unknown/Voyager.sap",
-		"Unknown/Yeach.sap"
-	};
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/USAGE-WEB kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/USAGE-WEB
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/USAGE-WEB	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/USAGE-WEB	1970-01-01 00:00:00.000000000 +0000
@@ -1,196 +0,0 @@
-How to embed ASAP on your website
----------------------------------
-
-There are four independent web-enabled versions of ASAP:
-
-- Flash Player (`asap.swf`)
-- Java applet (`asap_applet.jar`)
-- Silverlight (`SilverASAP.xap`)
-- JavaScript (`asap.js` and `asapweb.js`)
-
-Flash Player is the most likely one to work in today's web browsers.
-Java and Silverlight use least processor time, however many of your visitors
-may have no Java nor Silverlight installed.
-JavaScript seems to be the future and even now works fine
-if you have a modern browser and a powerful processor.
-Choose for yourself. :)
-
-All four versions were tested against Internet Explorer 6 and 9, Firefox 13, Chrome 19.
-
-You can embed Atari music using just HTML markup. For more control:
-pause, stop, changing music without reloading the page, displaying titles,
-you need some JavaScript code.
-
-
-Flash Player
-~~~~~~~~~~~~
-
-To embed the player in your web page, use the following XHTML syntax:
-
----------------------------------------------------------------------------
-<object width="0" height="0" type="application/x-shockwave-flash" data="asap.swf">
-    <param name="movie" value="asap.swf" />
-    <param name="wmode" value="transparent" />
-    <param name="FlashVars" value="file=File.sap" />
-</object>
----------------------------------------------------------------------------
-
-The player will play the specified file. It doesn't display anything.
-The `wmove` parameter prevents a single white pixel in Internet Explorer.
-
-The player understands the following parameters (in ampersand-separated `FlashVars`):
-
-- `file` - URL of the file to play.
-- `song` - zero-based subsong number.
-- `onLoad` - JavaScript code or function name to be executed when file is loaded.
-This is a safe place to call `getTitle()` etc - see below.
-Playback starts after the JavaScript code returns.
-- `onPlaybackEnd` - JavaScript code or function name to be executed when song playback ends.
-Will not be called as a result of `asapStop()`.
-
-All the above parameters are optional.
-
-The player contains the following methods that can be called from JavaScript:
-
-- `asapPlay(filename : String, song : int = -1) : void` - plays the specified song (-1 for the default)
-- `asapStop() : void` - stops playback
-- `asapPause() : Boolean` - toggles pause and returns `true` if pause has been enabled
-- `getAuthor() : String` - returns the AUTHOR tag of the playing song
-- `getTitle() : String` - returns the NAME tag of the playing song
-- `getDate() : String` - returns the DATE tag of the playing song
-
-
-Java applet
-~~~~~~~~~~~
-
-To embed the applet in a web page, use the following HTML syntax:
-
----------------------------------------------------------------------------
-<applet width="40" height="45" archive="asap_applet.jar" code="ASAPApplet">
-    <param name="file" value="File.sap" />
-</applet>
----------------------------------------------------------------------------
-
-or the following XHTML:
-
----------------------------------------------------------------------------
-<object width="40" height="45" type="application/x-java-applet">
-    <param name="archive" value="asap_applet.jar" />
-    <param name="code" value="ASAPApplet" />
-    <param name="file" value="File.sap" />
-</object>
----------------------------------------------------------------------------
-
-The applet will play the specified file and display POKEY channel volume
-meters scaled to the applet area (you can specify a different size).
-There are four volume meters for mono music and eight for stereo.
-
-The applet understands the following parameters:
-
-- `file` - URL of the file to play.
-- `song` - zero-based subsong number.
-- `background` - background color specified as six hexadecimal digits (`"rrggbb"`).
-- `foreground` - volume bars color specified as six hexadecimal digits (`"rrggbb"`).
-- `onLoad` - JavaScript code to be executed when file is loaded.
-This is a safe place to call `getTitle()` etc - see below.
-Playback starts after the JavaScript code returns.
-- `onPlaybackEnd` - JavaScript code to be executed when playback ends.
-Will not be called as a result of `stop()`.
-
-All the above parameters are optional. For `onLoad` and `onPlaybackEnd` to work,
-add the `mayscript` attribute to the `applet` element.
-
-The applet contains the following methods that can be called from JavaScript:
-
-- `void play(String filename, int song)` - plays the specified song (-1 for default)
-- `void stop()` - stops playback
-- `boolean togglePause()` - toggles pause and returns `true` if pause has been enabled
-- `String getAuthor()` - returns the AUTHOR tag of the playing song
-- `String getTitle()` - returns the NAME tag of the playing song
-- `String getDate()` - returns the DATE tag of the playing song
-
-
-Silverlight
-~~~~~~~~~~~
-
-To embed the player in your web page, use the following XHTML syntax:
-
----------------------------------------------------------------------------
-<object width="0" height="0" type="application/x-silverlight-2" data="data:application/x-silverlight-2,">
-    <param name="source" value="SilverASAP.xap" />
-    <param name="initParams" value="file=File.sap" />
-    <a href="http://go.microsoft.com/fwlink/?LinkID=124807" style="text-decoration: none;">
-        <img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none" />
-    </a>
-</object>
----------------------------------------------------------------------------
-
-The player will play the specified file. It doesn't display anything.
-
-The player understands the following parameters (in ampersand-separated `initParams`):
-
-- `file` - URL of the file to play.
-- `song` - zero-based subsong number.
-- `onLoad` - JavaScript code to be executed when file is loaded.
-This is a safe place to access `Title` etc - see below.
-Playback starts after the JavaScript code returns.
-- `onPlaybackEnd` - JavaScript code to be executed when song playback ends.
-Will not be called as a result of `Stop()`.
-
-All the above parameters are optional.
-
-The player contains the following methods that can be called from JavaScript:
-
-- `void Play(string filename, int song)` - plays the specified song (-1 for the default)
-- `void Stop()` - stops playback
-- `bool Pause()` - toggles pause and returns `true` if pause has been enabled
-
-and the following properties:
-
-- `string Author` - returns the AUTHOR tag of the playing song
-- `string Title` - returns the NAME tag of the playing song
-- `string Date` - returns the DATE tag of the playing song
-
-The above methods and properties are available in the `ASAP` object.
-That is, for Silverlight you need JavaScript code such as:
----------------------------------------------------------------------------
-`document.getElementById('asap').Content.ASAP.Stop()`.
----------------------------------------------------------------------------
-
-
-JavaScript
-~~~~~~~~~~
-
-To embed the player in your web page, use the following XHTML syntax:
-
----------------------------------------------------------------------------
-<script type="text/javascript" src="resampler.js"> </script>
-<script type="text/javascript" src="swfobject.js"> </script>
-<script type="text/javascript" src="XAudioServer.js"> </script>
-<script type="text/javascript" src="asap.js"> </script>
-<script type="text/javascript" src="asapweb.js"> </script>
-<script type="text/javascript" src="binaryHttpRequest.js"> </script>
-<input type="button" value="Play" onclick="binaryHttpRequest('File.sap', asap.play)" />
-<input type="button" value="Stop" onclick="asap.stop()" /><br />
----------------------------------------------------------------------------
-
-The `<script>` elements are best placed inside the `<head>` element.
-`resampler.js`, `swfobject.js` and `XAudioServer.js`
-should come from https://github.com/grantgalitz/XAudioJS[XAudioJS].
-Also take `XAudioJS.swf` and `XAudioServerMediaStreamWorker.js` from this project.
-
-The player has the following JavaScript API:
-
-- `asap.play(filename, module, song)` - plays the specified song (omit for the default).
-`module` is the file contents as an array of unsigned bytes.
-You may download it from the server using `binaryHttpRequest` as in the above example,
-make a JavaScript array with the file contents or even use HTML 5 local file access
-(see http://asap.sourceforge.net/javascript.html[online demo]).
-- `asap.stop()` - stops playback.
-- `asap.onLoad = function() { ... }` - code to be executed just before the playback is started.
-Safe place to access `asap.title` etc - see below.
-- `asap.onPlaybackEnd = function() { ... }` - code to be executed when song playback ends.
-Will not be called as a result of `asap.stop()`.
-- `asap.author` - contains the AUTHOR tag of the playing song
-- `asap.title` - contains the NAME tag of the playing song
-- `asap.date` - contains the DATE tag of the playing song
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/vlc/libasap_plugin.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/vlc/libasap_plugin.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/vlc/libasap_plugin.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/vlc/libasap_plugin.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-/*
- * libasap_plugin.c - ASAP plugin for VLC
- *
- * Copyright (C) 2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define __PLUGIN__
-#define MODULE_NAME  asap
-#define MODULE_STRING  "asap"
-
-#include <stdarg.h>
-
-#include <vlc_common.h>
-#include <vlc_input.h>
-#include <vlc_demux.h>
-#include <vlc_plugin.h>
-
-#include "asap.h"
-
-#define BITS_PER_SAMPLE  16
-#define BUFFER_BYTES  4096
-
-struct demux_sys_t
-{
-	ASAP *asap;
-	es_out_id_t *es;
-	date_t pts;
-	int bytes_per_frame;
-	int duration;
-};
-
-static int Demux(demux_t *demux)
-{
-	demux_sys_t *sys = demux->p_sys;
-
-	block_t *block = block_Alloc(BUFFER_BYTES);
-	if (unlikely(block == NULL))
-		return 0;
-
-	int len = ASAP_Generate(sys->asap, block->p_buffer, BUFFER_BYTES,
-		BITS_PER_SAMPLE == 16 ? ASAPSampleFormat_S16_L_E : ASAPSampleFormat_U8);
-	if (len <= 0) {
-		block_Release(block);
-		return 0;
-	}
-	block->i_buffer = len;
-	block->i_pts = block->i_dts = VLC_TS_0 + date_Get(&sys->pts);
-	es_out_Control(demux->out, ES_OUT_SET_PCR, block->i_pts);
-	es_out_Send(demux->out, sys->es, block);
-	date_Increment(&sys->pts, len / sys->bytes_per_frame);
-	return 1;
-}
-
-static cibool PlaySong(demux_t *demux, demux_sys_t *sys, int song)
-{
-	const ASAPInfo *info = ASAP_GetInfo(sys->asap);
-	int duration = ASAPInfo_GetDuration(info, song);
-	if (!ASAP_PlaySong(sys->asap, song, duration))
-		return FALSE;
-	sys->duration = duration;
-	demux->info.i_title = song;
-	demux->info.i_update |= INPUT_UPDATE_TITLE;
-	return TRUE;
-}
-
-static int Control(demux_t *demux, int query, va_list args)
-{
-	demux_sys_t *sys = demux->p_sys;
-
-	switch (query) {
-		case DEMUX_GET_POSITION: {
-			if (sys->duration <= 0)
-				return VLC_EGENERIC;
-			double *v = va_arg(args, double *);
-			*v = (double) ASAP_GetPosition(sys->asap) / sys->duration;
-			return VLC_SUCCESS;
-		}
-		case DEMUX_SET_POSITION: {
-			if (sys->duration <= 0)
-				return VLC_EGENERIC;
-			double v = va_arg(args, double);
-			if (v < 0 || v > 1 || !ASAP_Seek(sys->asap, (int) (v * sys->duration)))
-				return VLC_EGENERIC;
-			return VLC_SUCCESS;
-		}
-		case DEMUX_GET_LENGTH: {
-			if (sys->duration <= 0)
-				return VLC_EGENERIC;
-			int64_t *v = va_arg(args, int64_t *);
-			*v = sys->duration * INT64_C(1000);
-			return VLC_SUCCESS;
-		}
-		case DEMUX_GET_TIME: {
-			int64_t *v = va_arg(args, int64_t *);
-			*v = ASAP_GetPosition(sys->asap) * INT64_C(1000);
-			return VLC_SUCCESS;
-		}
-		case DEMUX_SET_TIME: {
-			int64_t v = va_arg(args, int64_t) / 1000;
-			if (v > 0x7fffffff || !ASAP_Seek(sys->asap, v))
-				return VLC_EGENERIC;
-			return VLC_SUCCESS;
-		}
-		case DEMUX_GET_META: {
-			const ASAPInfo *info = ASAP_GetInfo(sys->asap);
-			vlc_meta_t *p_meta = (vlc_meta_t *) va_arg(args, vlc_meta_t *);
-			const char *s = ASAPInfo_GetTitle(info);
-			if (s[0] != '\0')
-				vlc_meta_SetTitle(p_meta, s);
-			s = ASAPInfo_GetAuthor(info);
-			if (s[0] != '\0')
-				vlc_meta_SetArtist(p_meta, s);
-			int year = ASAPInfo_GetYear(info);
-			if (year > 0) {
-				char s[16];
-				sprintf(s, "%d", year);
-				vlc_meta_SetDate(p_meta, s);
-			}
-			return VLC_SUCCESS;
-		}
-		case DEMUX_GET_TITLE_INFO: {
-			int songs = ASAPInfo_GetSongs(ASAP_GetInfo(sys->asap));
-			if (songs <= 1)
-				return VLC_EGENERIC;
-			input_title_t ***titlev = va_arg(args, input_title_t ***);
-			int *titlec = va_arg(args, int *);
-			*titlev = malloc(sizeof(**titlev) * songs);
-			if (unlikely(*titlev == NULL)) {
-				*titlec = 0;
-				return VLC_ENOMEM;
-			}
-			*titlec = songs;
-			for (int i = 0; i < songs; i++)
-				(*titlev)[i] = vlc_input_title_New();
-			return VLC_SUCCESS;
-		}
-		case DEMUX_SET_TITLE: {
-			int song = (int) va_arg(args, int);
-			if (!PlaySong(demux, sys, song))
-				return VLC_EGENERIC;
-			return VLC_SUCCESS;
-		}
-		default:
-			return VLC_EGENERIC;
-	}
-}
-
-static int Open(vlc_object_t *obj)
-{
-	demux_t *demux = (demux_t *) obj;
-
-	/* read module */
-	int64_t module_len = stream_Size(demux->s);
-	if (module_len > ASAPInfo_MAX_MODULE_LENGTH)
-		return VLC_EGENERIC;
-	uint8_t *module = (uint8_t *) malloc(module_len);
-	if (unlikely(module == NULL))
-		return VLC_ENOMEM;
-	if (stream_Read(demux->s, module, module_len) < module_len) {
-		free(module);
-		return VLC_EGENERIC;
-	}
-
-	/* load into ASAP and start */
-	demux_sys_t *sys = malloc(sizeof(demux_sys_t));
-	if (unlikely(sys == NULL)) {
-		free(module);
-		return VLC_ENOMEM;
-	}
-	sys->asap = ASAP_New();
-	if (unlikely(sys->asap == NULL)) {
-		free(sys);
-		free(module);
-		return VLC_ENOMEM;
-	}
-	if (!ASAP_Load(sys->asap, NULL, module, module_len)) {
-		ASAP_Delete(sys->asap);
-		free(sys);
-		free(module);
-		return VLC_EGENERIC;
-	}
-	free(module);
-	const ASAPInfo *info = ASAP_GetInfo(sys->asap);
-	int song = ASAPInfo_GetDefaultSong(info);
-	if (!PlaySong(demux, sys, song)) {
-		ASAP_Delete(sys->asap);
-		free(sys);
-		return VLC_EGENERIC;
-	}
-
-	/* setup VLC */
-	es_format_t fmt;
-	es_format_Init(&fmt, AUDIO_ES, BITS_PER_SAMPLE == 16 ? VLC_CODEC_S16L : VLC_CODEC_U8);
-	fmt.audio.i_channels = ASAPInfo_GetChannels(info);
-	fmt.audio.i_bitspersample = BITS_PER_SAMPLE;
-	fmt.audio.i_rate = ASAP_SAMPLE_RATE;
-	fmt.audio.i_blockalign = fmt.audio.i_frame_length = fmt.audio.i_bytes_per_frame = sys->bytes_per_frame = fmt.audio.i_channels * (BITS_PER_SAMPLE / 8);
-	fmt.i_bitrate = ASAP_SAMPLE_RATE * 8 * fmt.audio.i_bytes_per_frame;
-	sys->es = es_out_Add(demux->out, &fmt);
-	date_Init(&sys->pts, ASAP_SAMPLE_RATE, 1);
-	date_Set(&sys->pts, 0);
-	demux->pf_demux = Demux;
-	demux->pf_control = Control;
-	demux->p_sys = sys;
-
-	return VLC_SUCCESS;
-}
-
-
-static void Close(vlc_object_t *obj)
-{
-	demux_t *demux = (demux_t *) obj;
-	demux_sys_t *sys = demux->p_sys;
-
-	ASAP_Delete(sys->asap);
-	free(sys);
-}
-
-vlc_module_begin()
-	set_shortname("ASAP")
-	set_description("Another Slight Atari Player")
-	set_category(CAT_INPUT)
-	set_subcategory(SUBCAT_INPUT_DEMUX)
-	set_capability("demux", 100)
-	set_callbacks(Open, Close)
-vlc_module_end()
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/vlc/vlc.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/vlc/vlc.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/vlc/vlc.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/vlc/vlc.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-# Linux
-
-VLC_CFLAGS = -std=gnu99 -I/usr/include/vlc/plugins
-VLC_DEMUX_PLUGIN_DIR = $(libdir)/vlc/plugins/demux
-
-# OS X
-
-VLC_OSX_CFLAGS = -std=gnu99 -I../plugins -dynamiclib -undefined suppress -flat_namespace -arch x86_64 -arch i386
-VLC_OSX_PLUGIN_DIR = /Applications/VLC.app/Contents/MacOS/plugins
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "vlc.mk")
-endif
-
-# Linux
-
-asap-vlc: libasap_plugin.so
-.PHONY: asap-vlc
-
-libasap_plugin.so: $(call src,vlc/libasap_plugin.c asap.[ch])
-	$(CC) $(VLC_CFLAGS)
-CLEAN += libasap_plugin.so
-
-install-vlc: libasap_plugin.so
-	$(call INSTALL_PROGRAM,libasap_plugin.so,$(VLC_DEMUX_PLUGIN_DIR))
-.PHONY: install-vlc
-
-uninstall-vlc:
-	$(RM) $(DESTDIR)$(VLC_DEMUX_PLUGIN_DIR)/libasap_plugin.so
-.PHONY: uninstall-vlc
-
-# OS X
-
-asap-vlc-osx: libasap_plugin.dylib
-.PHONY: asap-vlc-osx
-
-libasap_plugin.dylib: $(call src,vlc/libasap_plugin.c asap.[ch])
-	$(CC) $(VLC_OSX_CFLAGS)
-CLEAN += libasap_plugin.dylib
-
-install-vlc-osx: libasap_plugin.dylib
-	$(call INSTALL_DATA,libasap_plugin.dylib,$(VLC_OSX_PLUGIN_DIR))
-.PHONY: install-vlc-osx
-
-uninstall-vlc-osx:
-	$(RM) $(DESTDIR)$(VLC_OSX_PLUGIN_DIR)/libasap_plugin.dylib
-.PHONY: uninstall-vlc-osx
-
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/apollo/ASAP_Apollo.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/apollo/ASAP_Apollo.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/apollo/ASAP_Apollo.cpp	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/apollo/ASAP_Apollo.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-/*
- * ASAP_Apollo.cpp - ASAP plugin for Apollo
- *
- * Copyright (C) 2008-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <string.h>
-
-#include "InputPlugin.h"
-
-#include "asap.h"
-#include "info_dlg.h"
-#include "settings_dlg.h"
-
-#define BITS_PER_SAMPLE    16
-
-ASAP *asap;
-
-class CASAPDecoder : public CInputDecoder
-{
-	BYTE buf[8192];
-
-public:
-
-	int __cdecl GetNextAudioChunk(void **buffer)
-	{
-		*buffer = buf;
-		return ASAP_Generate(asap, buf, sizeof(buf), BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-	}
-
-	int __cdecl SetPosition(int newPosition)
-	{
-		ASAP_Seek(asap, newPosition);
-		return newPosition;
-	}
-
-	void __cdecl SetEqualizer(BOOL equalize)
-	{
-	}
-
-	void __cdecl AdjustEqualizer(int equalizerValues[16])
-	{
-	}
-
-	void __cdecl Close()
-	{
-		delete this;
-	}
-};
-
-class CASAPPlugin : public CInputPlugin
-{
-	HINSTANCE hInstance;
-
-public:
-
-	CASAPPlugin(HINSTANCE hInst) : hInstance(hInst)
-	{
-		if (asap == NULL)
-			asap = ASAP_New();
-	}
-
-	char * __cdecl GetDescription()
-	{
-		return const_cast<char *> ("Apollo ASAP Decoder version " ASAPInfo_VERSION);
-	}
-
-	CInputDecoder * __cdecl Open(char *filename, int audioDataOffset)
-	{
-		BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-		int module_len;
-		if (!loadModule(filename, module, &module_len))
-			return NULL;
-		if (!ASAP_Load(asap, filename, module, module_len))
-			return NULL;
-		playSong(ASAPInfo_GetDefaultSong(ASAP_GetInfo(asap)));
-		return new CASAPDecoder();
-	}
-
-	BOOL __cdecl GetInfo(char *filename, int audioDataOffset, TrackInfo *trackInfo)
-	{
-		BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-		int module_len;
-		if (!loadModule(filename, module, &module_len))
-			return FALSE;
-		ASAPInfo *info = ASAPInfo_New();
-		if (info == NULL)
-			return FALSE;
-		if (!ASAPInfo_Load(info, filename, module, module_len)) {
-			ASAPInfo_Delete(info);
-			return FALSE;
-		}
-		strcpy(trackInfo->suggestedTitle, ASAPInfo_GetTitle(info));
-		trackInfo->fileSize = module_len;
-		trackInfo->seekable = TRUE;
-		trackInfo->hasEqualizer = FALSE;
-		int duration = getSongDuration(info, ASAPInfo_GetDefaultSong(info));
-		trackInfo->playingTime = duration >= 0 ? duration : -1;
-		trackInfo->bitRate = 0;
-		trackInfo->sampleRate = ASAP_SAMPLE_RATE;
-		trackInfo->numChannels = ASAPInfo_GetChannels(info);
-		trackInfo->bitResolution = BITS_PER_SAMPLE;
-		strcpy(trackInfo->fileTypeDescription, "Atari 8-bit music");
-		ASAPInfo_Delete(info);
-		return TRUE;
-	}
-
-	void __cdecl AdditionalInfo(char *filename, int audioDataOffset)
-	{
-		showInfoDialog(hInstance, GetActiveWindow(), filename, -1);
-	}
-
-	BOOL __cdecl IsSuitableFile(char *filename, int audioDataOffset)
-	{
-		return ASAPInfo_IsOurFile(filename);
-	}
-
-	char * __cdecl GetExtensions()
-	{
-		return const_cast<char *>(
-			"Slight Atari Player\0*.SAP\0"
-			"Chaos Music Composer\0*.CMC;*.CM3;*.CMR;*.CMS;*.DMC\0"
-			"Delta Music Composer\0*.DLT\0"
-			"Music ProTracker\0*.MPT;*.MPD\0"
-			"Raster Music Tracker\0*.RMT\0"
-			"Theta Music Composer 1.x\0*.TMC;*.TM8\0"
-			"Theta Music Composer 2.x\0*.TM2\0"
-			"Future Composer\0*.FC\0"
-			"\0");
-	}
-
-	void __cdecl Config()
-	{
-		settingsDialog(hInstance, GetActiveWindow());
-	}
-
-	void __cdecl About()
-	{
-		MessageBox(GetActiveWindow(), ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT,
-			"About ASAP plugin " ASAPInfo_VERSION, MB_OK);
-	}
-
-	void __cdecl Close()
-	{
-		delete this;
-	}
-};
-
-extern "C" __declspec(dllexport) CInputPlugin *Apollo_GetInputModule2(HINSTANCE hDLLInstance, HWND hApolloWnd)
-{
-	return new CASAPPlugin(hDLLInstance);
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/apollo/InputPlugin.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/apollo/InputPlugin.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/apollo/InputPlugin.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/apollo/InputPlugin.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-#ifndef __INPUTPLUGIN_H__
-#define __INPUTPLUGIN_H__
-
-#include <windows.h>
-
-typedef struct
-{
-    // General
-
-    char suggestedTitle[256];
-    int fileSize;
-    BOOL seekable;
-    BOOL hasEqualizer;
-
-    // Audio
-
-    int playingTime;    // ms (-1 = stream)
-    int bitRate;        // b/s (negative values mean average)
-    int sampleRate;     // Hz
-    int numChannels;    // 1 = mono, 2 = stereo
-    int bitResolution;  // 8, 16, 24 or 32
-    char fileTypeDescription[256];
-
-    // The following fields are only valid if the upper
-    // 16 bits of fileSize contain the value 0xfeed when 
-    // passed to the GetInfo function. The lower 16
-    // bits of this field are considered as the
-    // version of the extension to this structure.
-
-    // These fields are valid for extension versions >= 1
-
-    // The plug-in must the extension version it supports here
-    BOOL extensionVersion; 
-    __int64 fileSize64Bits;
-
-} TrackInfo;
-
-// __cdecl is a Microsoft specific keyword and means
-// that the C calling convention will be used for the
-// member function. If you are using a compiler other
-// than MS Visual C++ you may have to remove or change
-// this keyword.
-
-class CInputDecoder
-{
-public:
-    virtual int __cdecl GetNextAudioChunk(void **buffer) =0;
-    virtual int __cdecl SetPosition(int position) =0;
-
-    virtual void __cdecl SetEqualizer(BOOL equalize) =0;
-    virtual void __cdecl AdjustEqualizer(int equalizerValues[16]) =0;
-
-    virtual void __cdecl Close() =0;
-};
-
-class CInputPlugin
-{
-public:
-    virtual char *__cdecl GetDescription() =0;
-
-    virtual CInputDecoder *__cdecl Open(char *filename,int audioDataOffset) =0;
-    virtual BOOL __cdecl GetInfo(char *filename,int audioDataOffset,TrackInfo *trackInfo) =0;
-    virtual void __cdecl AdditionalInfo(char *filename,int audioDataOffset) =0;
-    virtual BOOL __cdecl IsSuitableFile(char *filename,int audioDataOffset) =0;
-    virtual char *__cdecl GetExtensions() =0;
-
-    virtual void __cdecl Config() =0;
-    virtual void __cdecl About() =0;
-
-    virtual void __cdecl Close() =0;
-};
-
-#endif//__INPUTPLUGIN_H__
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass-addon.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass-addon.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass-addon.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass-addon.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/*
-	BASS 2.4 add-on C/C++ header file
-	Copyright (c) 2003-2009 Un4seen Developments Ltd.
-*/
-
-#include "bass.h"
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void *BASSFILE;
-
-typedef struct {
-	DWORD flags; // ADDON_xxx flags
-	void (WINAPI *Free)(void *inst);
-	QWORD (WINAPI *GetLength)(void *inst, DWORD mode);
-	const char *(WINAPI *GetTags)(void *inst, DWORD tags); // optional
-	QWORD (WINAPI *GetFilePosition)(void *inst, DWORD mode); // optional
-	void (WINAPI *GetInfo)(void *inst, BASS_CHANNELINFO *info);
-	BOOL (WINAPI *CanSetPosition)(void *inst, QWORD pos, DWORD mode);
-	QWORD (WINAPI *SetPosition)(void *inst, QWORD pos, DWORD mode);
-	QWORD (WINAPI *GetPosition)(void *inst, QWORD pos, DWORD mode); // optional
-	HSYNC (WINAPI *SetSync)(void *inst, DWORD type, QWORD param, SYNCPROC *proc, void *user); // not required if not setting syncs
-	void (WINAPI *RemoveSync)(void *inst, HSYNC sync); // optional
-	BOOL (WINAPI *CanResume)(void *inst); // optional
-	DWORD (WINAPI *SetFlags)(void *inst, DWORD flags); // optional
-	BOOL (WINAPI *Attribute)(void *inst, DWORD attrib, float *value, BOOL set); // optional
-} ADDON_FUNCTIONS;
-
-#define ADDON_OWNPOS	1 // handles all position tracking (including POS/END syncs)
-
-typedef struct {
-	void (WINAPI *Free)(void *inst);
-	BOOL (WINAPI *SetParameters)(void *inst, const void *param);
-	BOOL (WINAPI *GetParameters)(void *inst, void *param);
-	BOOL (WINAPI *Reset)(void *inst);
-} ADDON_FUNCTIONS_FX;
-
-typedef HSTREAM (CALLBACK STREAMCREATEPROC)(BASSFILE file, DWORD flags); // BASS_StreamCreateFile/User/URL plugin function
-typedef HSTREAM (CALLBACK STREAMCREATEURLPROC)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user); // BASS_StreamCreateURL plugin function (unsupported URI scheme)
-typedef BOOL (CALLBACK BASSCONFIGPROC)(DWORD option, DWORD flags, void *value); // config plugin function
-typedef HFX (CALLBACK BASSFXPROC)(DWORD chan, DWORD type, int priority); // FX plugin function
-
-// BASSCONFIGPROC flags
-#define BASSCONFIG_SET	1 // set the config (otherwise get it)
-#define BASSCONFIG_PTR	2 // value is a pointer
-
-// RegisterPlugin modes
-#define PLUGIN_CONFIG_ADD		0 // add a config plugin
-#define PLUGIN_CONFIG_REMOVE	1 // remove a config plugin
-#define PLUGIN_FX_ADD			2 // add an FX plugin
-#define PLUGIN_FX_REMOVE		3 // remove an FX plugin
-
-typedef struct {
-	void (WINAPI *SetError)(int error); // set error code
-	void (WINAPI *RegisterPlugin)(void *proc, DWORD mode); // add/remove a plugin function
-	HSTREAM (WINAPI *CreateStream)(DWORD freq, DWORD chan, DWORD flags, STREAMPROC *proc, void *inst, const ADDON_FUNCTIONS *funcs); // create a stream
-	HFX (WINAPI *SetFX)(DWORD chan, DSPPROC *proc, void *inst, int priority, const ADDON_FUNCTIONS_FX *funcs); // set FX on a channel
-	void *(WINAPI *GetInst)(DWORD handle, const void *funcs); // get stream or FX instance data
-
-	void *(WINAPI *GetLock)(HSTREAM handle); // get stream access lock
-	HSYNC (WINAPI *NewSync)(HSTREAM handle, DWORD type, SYNCPROC *proc, void *user); // add a sync to a channel
-	BOOL (WINAPI *TriggerSync)(HSTREAM handle, HSYNC sync, QWORD pos, DWORD data); // trigger a sync
-	QWORD (WINAPI *GetCount)(HSTREAM handle, BOOL output); // get raw count (output=0) or current output position (output=1)
-	QWORD (WINAPI *GetPosition)(HSTREAM handle, QWORD count, DWORD mode); // get raw "count" translated to source position
-
-	struct { // file functions
-		BASSFILE (WINAPI *Open)(BOOL mem, const void *file, QWORD offset, QWORD length, DWORD flags, BOOL readtags); // open a file
-		BASSFILE (WINAPI *OpenURL)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user, BOOL readtags); // open a URL
-		BASSFILE (WINAPI *OpenUser)(DWORD system, DWORD flags, const BASS_FILEPROCS *proc, void *user, BOOL readtags); // open a custom file
-		void (WINAPI *Close)(BASSFILE file); // close an opened file
-		const void *(WINAPI *GetFileName)(BASSFILE file, BOOL *unicode); // get the filename/url (NULL=memory/custom file)
-		BOOL (WINAPI *SetStream)(BASSFILE file, HSTREAM handle); // set stream handle (for auto closing and META/DOWNLOAD syncs)
-		DWORD (WINAPI *GetFlags)(BASSFILE file); // get BASSFILE_xxx flags
-		void (WINAPI *SetFlags)(BASSFILE file, DWORD flags); // set BASSFILE_xxx flags (BASSFILE_RESTRATE/FULL only)
-		DWORD (WINAPI *Read)(BASSFILE file, void *buf, DWORD len); // read from file
-		BOOL (WINAPI *Seek)(BASSFILE file, QWORD pos); // seek in file
-		QWORD (WINAPI *GetPos)(BASSFILE file, DWORD mode); // get file position (mode=BASS_FILEPOS_xxx)
-		BOOL (WINAPI *Eof)(BASSFILE file); // End of file?
-		const char *(WINAPI *GetTags)(BASSFILE file, DWORD tags); // get tags (ID3/ID3V2/LYRICS3/RIFF_INFO/HTTP/ICY/META)
-		// net/buffered-only stuff
-		BOOL (WINAPI *StartThread)(BASSFILE f, DWORD bitrate, DWORD offset); // start download thread (bitrate in bytes/sec)
-		BOOL (WINAPI *CanResume)(BASSFILE file); // enough data buffered to resume?
-	} file;
-
-	struct { // sample data processing functions (len=samples, dst=src is ok)
-		void (WINAPI *Float2Int)(const float *src, void *dst, DWORD len, DWORD res); // convert floating-point data to 8/16-bit (res=1/2)
-		void (WINAPI *Int2Float)(const void *src, float *dst, DWORD len, DWORD res); // convert 8/16/24/32-bit (res=1/2/3/4) to floating-point
-		void (WINAPI *Swap)(const void *src, void *dst, DWORD len, DWORD res); // swap byte order of 16/32-bit (res=2/4) data
-	} data;
-} BASS_FUNCTIONS;
-
-#define BASSFILE_BUFFERED	1	// net/buffered file
-#define BASSFILE_NOLIMIT	2	// enable reading beyond end of audio data (into tags)
-#define BASSFILE_BLOCK		BASS_STREAM_BLOCK
-#define BASSFILE_RESTRATE	BASS_STREAM_RESTRATE
-#define BASSFILE_UNICODE	BASS_UNICODE
-
-typedef const void *(WINAPI BASSPLUGIN)(DWORD face); // plugin interface function
-
-// BASSplugin "faces"
-#define BASSPLUGIN_INFO			0 // BASS_PLUGININFO
-#define BASSPLUGIN_CREATE		1 // STREAMCREATEPROC
-#define BASSPLUGIN_CREATEURL	2 // STREAMCREATEURLPROC
-
-#define BASS_FREQ_INIT	0x80000001 // BASS_Init freq
-
-#define BASS_TAG_DOWNLOADPROC	0x80000001 // pointer to DOWNLOADPROC and user parameter
-
-#define BASS_SYNC_EX 0x10000000
-typedef void (CALLBACK SYNCPROCEX)(HSYNC handle, DWORD channel, DWORD data, void *user, QWORD pos);
-
-#define BASS_STREAMPROC_REPEAT	0x40000000 // call STREAMPROC again for any remainder
-
-#define BASS_POS_RESTART	0x80000000 // restarting
-
-#define BASS_CONFIG_ADDON		0x8000
-
-#ifndef GetBassFunc
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-extern __declspec(dllimport) const BASS_FUNCTIONS _;
-#define bassfunc (&_)
-#define GetBassFunc() 1
-#elif defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
-extern const BASS_FUNCTIONS _;
-#define bassfunc (&_)
-#define GetBassFunc() 1
-#else
-extern const BASS_FUNCTIONS *bassfunc;
-#define GetBassFunc() (bassfunc=(BASS_FUNCTIONS*)BASS_GetConfigPtr(BASS_CONFIG_ADDON))
-#endif
-
-// SetError macros
-#define noerror() return (bassfunc->SetError(BASS_OK),TRUE)
-#define noerrorn(n) return (bassfunc->SetError(BASS_OK),n)
-#define error(n) return (bassfunc->SetError(n),FALSE) // error = 0/NULL
-#define errorn(n) return (bassfunc->SetError(n),-1) // error = -1
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass_asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass_asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass_asap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass_asap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,227 +0,0 @@
-/*
- * bass_asap.c - ASAP add-on for BASS
- *
- * Copyright (C) 2010-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <windows.h>
-
-#include "bass-addon.h"
-
-/* ID3 tag doesn't work in AIMP because it doesn't call GetTags.
-   It works e.g. in http://sourceforge.net/projects/encorebassing/ */
-#define SUPPORT_ID3
-
-#define BASS_CTYPE_MUSIC_ASAP  0x1f100
-
-#include "asap.h"
-
-static const BASS_PLUGINFORM pluginform = {
-	BASS_CTYPE_MUSIC_ASAP, "ASAP", "*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc"
-};
-
-static const BASS_PLUGININFO plugininfo = { 0x02040000, 1, &pluginform };
-
-typedef struct
-{
-	ASAP *asap;
-	int duration;
-#ifdef SUPPORT_ID3
-	TAG_ID3 tag;
-#endif
-} ASAPSTREAM;
-
-static void WINAPI ASAP_Free(void *inst)
-{
-	free(inst);
-}
-
-static QWORD WINAPI ASAP_GetLength(void *inst, DWORD mode)
-{
-	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
-	int channels;
-	if (mode != BASS_POS_BYTE)
-		errorn(BASS_ERROR_NOTAVAIL);
-	channels = ASAPInfo_GetChannels(ASAP_GetInfo(stream->asap));
-	noerrorn((stream->duration * (ASAP_SAMPLE_RATE / 100) / 10) << channels); // assumes 16-bit
-}
-
-#ifdef SUPPORT_ID3
-
-static const char * WINAPI ASAP_GetTags(void *inst, DWORD tags)
-{
-	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
-	TAG_ID3 *tag;
-	const ASAPInfo *info;
-	int year;
-	if (tags != BASS_TAG_ID3)
-		return NULL;
-	tag = &stream->tag;
-	memset(tag, 0, sizeof(TAG_ID3));
-	tag->id[0] = 'T';
-	tag->id[1] = 'A';
-	tag->id[2] = 'G';
-	info = ASAP_GetInfo(stream->asap);
-	strncpy(tag->title, ASAPInfo_GetTitleOrFilename(info), sizeof(tag->title));
-	strncpy(tag->artist, ASAPInfo_GetAuthor(info), sizeof(tag->artist));
-	year = ASAPInfo_GetYear(info);
-	if (year > 0)
-		sprintf(tag->year, "%d", year);
-	tag->genre = 52; /* Electronic */
-	return (const char *) tag;
-}
-
-#endif
-
-static void WINAPI ASAP_GetBassInfo(void *inst, BASS_CHANNELINFO *info)
-{
-	info->ctype = BASS_CTYPE_MUSIC_ASAP;
-}
-
-static int bytes_to_duration(ASAPSTREAM *stream, int pos)
-{
-	int channels = ASAPInfo_GetChannels(ASAP_GetInfo(stream->asap));
-	return (pos >> channels) * 10 / (ASAP_SAMPLE_RATE / 100);
-}
-
-static BOOL WINAPI ASAP_CanSetPosition(void *inst, QWORD pos, DWORD mode)
-{
-	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
-	if ((BYTE) mode != BASS_POS_BYTE)
-		error(BASS_ERROR_NOTAVAIL);
-	if (stream->duration >= 0 && (pos > 0xffffffff || bytes_to_duration(stream, pos) >= stream->duration))
-		error(BASS_ERROR_POSITION);
-	return TRUE;
-}
-
-static QWORD WINAPI ASAP_SetPosition(void *inst, QWORD pos, DWORD mode)
-{
-	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
-	if ((BYTE) mode != BASS_POS_BYTE)
-		errorn(BASS_ERROR_NOTAVAIL);
-	ASAP_Seek(stream->asap, bytes_to_duration(stream, pos));
-	return pos;
-}
-
-static ADDON_FUNCTIONS ASAPfuncs = {
-	0,
-	ASAP_Free,
-	ASAP_GetLength,
-#ifdef SUPPORT_ID3
-	ASAP_GetTags,
-#else
-	NULL,
-#endif
-	NULL,
-	ASAP_GetBassInfo,
-	ASAP_CanSetPosition,
-	ASAP_SetPosition,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static DWORD CALLBACK StreamProc(HSTREAM handle, void *buffer, DWORD length, void *inst)
-{
-	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
-	int c = ASAP_Generate(stream->asap, buffer, length, ASAPSampleFormat_S16_L_E);
-	if (c < length)
-		c |= BASS_STREAMPROC_END;
-	return c;
-}
-
-static HSTREAM WINAPI StreamCreateProc(BASSFILE file, DWORD flags)
-{
-	BOOL unicode = FALSE;
-	const char *filename;
-	char aFilename[MAX_PATH];
-	byte module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAPSTREAM *stream;
-	const ASAPInfo *info;
-	int song;
-	int duration;
-	HSTREAM handle;
-	filename = (const char *) bassfunc->file.GetFileName(file, &unicode);
-	if (filename != NULL && unicode) {
-		if (WideCharToMultiByte(CP_ACP, 0, (LPCWSTR) filename, -1, aFilename, MAX_PATH, NULL, NULL) <= 0)
-			error(BASS_ERROR_NOTFILE);
-		filename = aFilename;
-	}
-	module_len = bassfunc->file.Read(file, module, sizeof(module));
-	stream = malloc(sizeof(ASAPSTREAM));
-	if (stream == NULL)
-		error(BASS_ERROR_MEM);
-	stream->asap = ASAP_New();
-	if (stream->asap == NULL) {
-		free(stream);
-		error(BASS_ERROR_MEM);
-	}
-	if (!ASAP_Load(stream->asap, filename, module, module_len)) {
-		free(stream);
-		error(BASS_ERROR_FILEFORM);
-	}
-	flags &= BASS_SAMPLE_SOFTWARE | BASS_SAMPLE_LOOP | BASS_SAMPLE_3D | BASS_SAMPLE_FX
-		| BASS_STREAM_DECODE | BASS_STREAM_AUTOFREE | 0x3f000000; // 0x3f000000 = all speaker flags
-	info = ASAP_GetInfo(stream->asap);
-	song = ASAPInfo_GetDefaultSong(info);
-	if ((flags & BASS_MUSIC_LOOP) != 0 && ASAPInfo_GetLoop(info, song))
-		duration = -1;
-	else
-		duration = ASAPInfo_GetDuration(info, song);
-	stream->duration = duration;
-	if (!ASAP_PlaySong(stream->asap, song, duration)) {
-		free(stream);
-		error(BASS_ERROR_FILEFORM);
-	}
-	handle = bassfunc->CreateStream(ASAP_SAMPLE_RATE, ASAPInfo_GetChannels(info), flags, &StreamProc, stream, &ASAPfuncs);
-	if (handle == 0) {
-		free(stream);
-		return 0; // CreateStream set the error code
-	}
-	bassfunc->file.SetStream(file, handle);
-	noerrorn(handle);
-}
-
-__declspec(dllexport) const void *WINAPI BASSplugin(DWORD face)
-{
-	switch (face) {
-	case BASSPLUGIN_INFO:
-		return &plugininfo;
-	case BASSPLUGIN_CREATE:
-		return StreamCreateProc;
-	default:
-		return NULL;
-	}
-}
-
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
-	if (dwReason == DLL_PROCESS_ATTACH && HIWORD(BASS_GetVersion()) != BASSVERSION) {
-		MessageBox(NULL, "Incorrect BASS.DLL version (" BASSVERSIONTEXT " is required)", "ASAP", MB_ICONERROR);
-		return FALSE;
-	}
-	return TRUE;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,905 +0,0 @@
-/*
-	BASS 2.4 C/C++ header file
-	Copyright (c) 1999-2009 Un4seen Developments Ltd.
-
-	See the BASS.CHM file for more detailed documentation
-*/
-
-#ifndef BASS_H
-#define BASS_H
-
-#ifdef _WIN32
-#include <wtypes.h>
-typedef unsigned __int64 QWORD;
-#else
-#include <stdint.h>
-#define WINAPI
-#define CALLBACK
-typedef uint8_t BYTE;
-typedef uint16_t WORD;
-typedef uint32_t DWORD;
-typedef uint64_t QWORD;
-#ifndef __OBJC__
-typedef int BOOL;
-#endif
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-#define LOBYTE(a) (BYTE)(a)
-#define HIBYTE(a) (BYTE)((a)>>8)
-#define LOWORD(a) (WORD)(a)
-#define HIWORD(a) (WORD)((a)>>16)
-#define MAKEWORD(a,b) (WORD)(((a)&0xff)|((b)<<8))
-#define MAKELONG(a,b) (DWORD)(((a)&0xffff)|((b)<<16))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BASSVERSION			0x204	// API version
-#define BASSVERSIONTEXT		"2.4"
-
-#ifndef BASSDEF
-#define BASSDEF(f) WINAPI f
-#endif
-
-typedef DWORD HMUSIC;		// MOD music handle
-typedef DWORD HSAMPLE;		// sample handle
-typedef DWORD HCHANNEL;		// playing sample's channel handle
-typedef DWORD HSTREAM;		// sample stream handle
-typedef DWORD HRECORD;		// recording handle
-typedef DWORD HSYNC;		// synchronizer handle
-typedef DWORD HDSP;			// DSP handle
-typedef DWORD HFX;			// DX8 effect handle
-typedef DWORD HPLUGIN;		// Plugin handle
-
-// Error codes returned by BASS_ErrorGetCode
-#define BASS_OK				0	// all is OK
-#define BASS_ERROR_MEM		1	// memory error
-#define BASS_ERROR_FILEOPEN	2	// can't open the file
-#define BASS_ERROR_DRIVER	3	// can't find a free/valid driver
-#define BASS_ERROR_BUFLOST	4	// the sample buffer was lost
-#define BASS_ERROR_HANDLE	5	// invalid handle
-#define BASS_ERROR_FORMAT	6	// unsupported sample format
-#define BASS_ERROR_POSITION	7	// invalid position
-#define BASS_ERROR_INIT		8	// BASS_Init has not been successfully called
-#define BASS_ERROR_START	9	// BASS_Start has not been successfully called
-#define BASS_ERROR_ALREADY	14	// already initialized/paused/whatever
-#define BASS_ERROR_NOCHAN	18	// can't get a free channel
-#define BASS_ERROR_ILLTYPE	19	// an illegal type was specified
-#define BASS_ERROR_ILLPARAM	20	// an illegal parameter was specified
-#define BASS_ERROR_NO3D		21	// no 3D support
-#define BASS_ERROR_NOEAX	22	// no EAX support
-#define BASS_ERROR_DEVICE	23	// illegal device number
-#define BASS_ERROR_NOPLAY	24	// not playing
-#define BASS_ERROR_FREQ		25	// illegal sample rate
-#define BASS_ERROR_NOTFILE	27	// the stream is not a file stream
-#define BASS_ERROR_NOHW		29	// no hardware voices available
-#define BASS_ERROR_EMPTY	31	// the MOD music has no sequence data
-#define BASS_ERROR_NONET	32	// no internet connection could be opened
-#define BASS_ERROR_CREATE	33	// couldn't create the file
-#define BASS_ERROR_NOFX		34	// effects are not available
-#define BASS_ERROR_NOTAVAIL	37	// requested data is not available
-#define BASS_ERROR_DECODE	38	// the channel is a "decoding channel"
-#define BASS_ERROR_DX		39	// a sufficient DirectX version is not installed
-#define BASS_ERROR_TIMEOUT	40	// connection timedout
-#define BASS_ERROR_FILEFORM	41	// unsupported file format
-#define BASS_ERROR_SPEAKER	42	// unavailable speaker
-#define BASS_ERROR_VERSION	43	// invalid BASS version (used by add-ons)
-#define BASS_ERROR_CODEC	44	// codec is not available/supported
-#define BASS_ERROR_ENDED	45	// the channel/file has ended
-#define BASS_ERROR_UNKNOWN	-1	// some other mystery problem
-
-// BASS_SetConfig options
-#define BASS_CONFIG_BUFFER			0
-#define BASS_CONFIG_UPDATEPERIOD	1
-#define BASS_CONFIG_GVOL_SAMPLE		4
-#define BASS_CONFIG_GVOL_STREAM		5
-#define BASS_CONFIG_GVOL_MUSIC		6
-#define BASS_CONFIG_CURVE_VOL		7
-#define BASS_CONFIG_CURVE_PAN		8
-#define BASS_CONFIG_FLOATDSP		9
-#define BASS_CONFIG_3DALGORITHM		10
-#define BASS_CONFIG_NET_TIMEOUT		11
-#define BASS_CONFIG_NET_BUFFER		12
-#define BASS_CONFIG_PAUSE_NOPLAY	13
-#define BASS_CONFIG_NET_PREBUF		15
-#define BASS_CONFIG_NET_PASSIVE		18
-#define BASS_CONFIG_REC_BUFFER		19
-#define BASS_CONFIG_NET_PLAYLIST	21
-#define BASS_CONFIG_MUSIC_VIRTUAL	22
-#define BASS_CONFIG_VERIFY			23
-#define BASS_CONFIG_UPDATETHREADS	24
-#if defined(__linux__) || defined (_WIN32_WCE)
-#define BASS_CONFIG_DEV_BUFFER		27
-#endif
-
-// BASS_SetConfigPtr options
-#define BASS_CONFIG_NET_AGENT		16
-#define BASS_CONFIG_NET_PROXY		17
-
-// Initialization flags
-#define BASS_DEVICE_8BITS		1	// use 8 bit resolution, else 16 bit
-#define BASS_DEVICE_MONO		2	// use mono, else stereo
-#define BASS_DEVICE_3D			4	// enable 3D functionality
-#define BASS_DEVICE_LATENCY		256	// calculate device latency (BASS_INFO struct)
-#define BASS_DEVICE_CPSPEAKERS	1024 // detect speakers via Windows control panel
-#define BASS_DEVICE_SPEAKERS	2048 // force enabling of speaker assignment
-#define BASS_DEVICE_NOSPEAKER	4096 // ignore speaker arrangement
-#ifdef __linux__
-#define BASS_DEVICE_DMIX		8192 // use "dmix" (shared) output
-#endif
-
-// DirectSound interfaces (for use with BASS_GetDSoundObject)
-#define BASS_OBJECT_DS		1	// IDirectSound
-#define BASS_OBJECT_DS3DL	2	// IDirectSound3DListener
-
-// Device info structure
-typedef struct {
-#ifdef _WIN32_WCE
-	const wchar_t *name;	// description
-	const wchar_t *driver;	// driver
-#else
-	const char *name;	// description
-	const char *driver;	// driver
-#endif
-	DWORD flags;
-} BASS_DEVICEINFO;
-
-// BASS_DEVICEINFO flags
-#define BASS_DEVICE_ENABLED		1
-#define BASS_DEVICE_DEFAULT		2
-#define BASS_DEVICE_INIT		4
-
-typedef struct {
-	DWORD flags;	// device capabilities (DSCAPS_xxx flags)
-	DWORD hwsize;	// size of total device hardware memory
-	DWORD hwfree;	// size of free device hardware memory
-	DWORD freesam;	// number of free sample slots in the hardware
-	DWORD free3d;	// number of free 3D sample slots in the hardware
-	DWORD minrate;	// min sample rate supported by the hardware
-	DWORD maxrate;	// max sample rate supported by the hardware
-	BOOL eax;		// device supports EAX? (always FALSE if BASS_DEVICE_3D was not used)
-	DWORD minbuf;	// recommended minimum buffer length in ms (requires BASS_DEVICE_LATENCY)
-	DWORD dsver;	// DirectSound version
-	DWORD latency;	// delay (in ms) before start of playback (requires BASS_DEVICE_LATENCY)
-	DWORD initflags;// BASS_Init "flags" parameter
-	DWORD speakers; // number of speakers available
-	DWORD freq;		// current output rate (Vista/OSX only)
-} BASS_INFO;
-
-// BASS_INFO flags (from DSOUND.H)
-#define DSCAPS_CONTINUOUSRATE	0x00000010	// supports all sample rates between min/maxrate
-#define DSCAPS_EMULDRIVER		0x00000020	// device does NOT have hardware DirectSound support
-#define DSCAPS_CERTIFIED		0x00000040	// device driver has been certified by Microsoft
-#define DSCAPS_SECONDARYMONO	0x00000100	// mono
-#define DSCAPS_SECONDARYSTEREO	0x00000200	// stereo
-#define DSCAPS_SECONDARY8BIT	0x00000400	// 8 bit
-#define DSCAPS_SECONDARY16BIT	0x00000800	// 16 bit
-
-// Recording device info structure
-typedef struct {
-	DWORD flags;	// device capabilities (DSCCAPS_xxx flags)
-	DWORD formats;	// supported standard formats (WAVE_FORMAT_xxx flags)
-	DWORD inputs;	// number of inputs
-	BOOL singlein;	// TRUE = only 1 input can be set at a time
-	DWORD freq;		// current input rate (Vista/OSX only)
-} BASS_RECORDINFO;
-
-// BASS_RECORDINFO flags (from DSOUND.H)
-#define DSCCAPS_EMULDRIVER	DSCAPS_EMULDRIVER	// device does NOT have hardware DirectSound recording support
-#define DSCCAPS_CERTIFIED	DSCAPS_CERTIFIED	// device driver has been certified by Microsoft
-
-// defines for formats field of BASS_RECORDINFO (from MMSYSTEM.H)
-#ifndef WAVE_FORMAT_1M08
-#define WAVE_FORMAT_1M08       0x00000001       /* 11.025 kHz, Mono,   8-bit  */
-#define WAVE_FORMAT_1S08       0x00000002       /* 11.025 kHz, Stereo, 8-bit  */
-#define WAVE_FORMAT_1M16       0x00000004       /* 11.025 kHz, Mono,   16-bit */
-#define WAVE_FORMAT_1S16       0x00000008       /* 11.025 kHz, Stereo, 16-bit */
-#define WAVE_FORMAT_2M08       0x00000010       /* 22.05  kHz, Mono,   8-bit  */
-#define WAVE_FORMAT_2S08       0x00000020       /* 22.05  kHz, Stereo, 8-bit  */
-#define WAVE_FORMAT_2M16       0x00000040       /* 22.05  kHz, Mono,   16-bit */
-#define WAVE_FORMAT_2S16       0x00000080       /* 22.05  kHz, Stereo, 16-bit */
-#define WAVE_FORMAT_4M08       0x00000100       /* 44.1   kHz, Mono,   8-bit  */
-#define WAVE_FORMAT_4S08       0x00000200       /* 44.1   kHz, Stereo, 8-bit  */
-#define WAVE_FORMAT_4M16       0x00000400       /* 44.1   kHz, Mono,   16-bit */
-#define WAVE_FORMAT_4S16       0x00000800       /* 44.1   kHz, Stereo, 16-bit */
-#endif
-
-// Sample info structure
-typedef struct {
-	DWORD freq;		// default playback rate
-	float volume;	// default volume (0-1)
-	float pan;		// default pan (-1=left, 0=middle, 1=right)
-	DWORD flags;	// BASS_SAMPLE_xxx flags
-	DWORD length;	// length (in bytes)
-	DWORD max;		// maximum simultaneous playbacks
-	DWORD origres;	// original resolution bits
-	DWORD chans;	// number of channels
-	DWORD mingap;	// minimum gap (ms) between creating channels
-	DWORD mode3d;	// BASS_3DMODE_xxx mode
-	float mindist;	// minimum distance
-	float maxdist;	// maximum distance
-	DWORD iangle;	// angle of inside projection cone
-	DWORD oangle;	// angle of outside projection cone
-	float outvol;	// delta-volume outside the projection cone
-	DWORD vam;		// voice allocation/management flags (BASS_VAM_xxx)
-	DWORD priority;	// priority (0=lowest, 0xffffffff=highest)
-} BASS_SAMPLE;
-
-#define BASS_SAMPLE_8BITS		1	// 8 bit
-#define BASS_SAMPLE_FLOAT		256	// 32-bit floating-point
-#define BASS_SAMPLE_MONO		2	// mono
-#define BASS_SAMPLE_LOOP		4	// looped
-#define BASS_SAMPLE_3D			8	// 3D functionality
-#define BASS_SAMPLE_SOFTWARE	16	// not using hardware mixing
-#define BASS_SAMPLE_MUTEMAX		32	// mute at max distance (3D only)
-#define BASS_SAMPLE_VAM			64	// DX7 voice allocation & management
-#define BASS_SAMPLE_FX			128	// old implementation of DX8 effects
-#define BASS_SAMPLE_OVER_VOL	0x10000	// override lowest volume
-#define BASS_SAMPLE_OVER_POS	0x20000	// override longest playing
-#define BASS_SAMPLE_OVER_DIST	0x30000 // override furthest from listener (3D only)
-
-#define BASS_STREAM_PRESCAN		0x20000 // enable pin-point seeking/length (MP3/MP2/MP1)
-#define BASS_MP3_SETPOS			BASS_STREAM_PRESCAN
-#define BASS_STREAM_AUTOFREE	0x40000	// automatically free the stream when it stop/ends
-#define BASS_STREAM_RESTRATE	0x80000	// restrict the download rate of internet file streams
-#define BASS_STREAM_BLOCK		0x100000 // download/play internet file stream in small blocks
-#define BASS_STREAM_DECODE		0x200000 // don't play the stream, only decode (BASS_ChannelGetData)
-#define BASS_STREAM_STATUS		0x800000 // give server status info (HTTP/ICY tags) in DOWNLOADPROC
-
-#define BASS_MUSIC_FLOAT		BASS_SAMPLE_FLOAT
-#define BASS_MUSIC_MONO			BASS_SAMPLE_MONO
-#define BASS_MUSIC_LOOP			BASS_SAMPLE_LOOP
-#define BASS_MUSIC_3D			BASS_SAMPLE_3D
-#define BASS_MUSIC_FX			BASS_SAMPLE_FX
-#define BASS_MUSIC_AUTOFREE		BASS_STREAM_AUTOFREE
-#define BASS_MUSIC_DECODE		BASS_STREAM_DECODE
-#define BASS_MUSIC_PRESCAN		BASS_STREAM_PRESCAN	// calculate playback length
-#define BASS_MUSIC_CALCLEN		BASS_MUSIC_PRESCAN
-#define BASS_MUSIC_RAMP			0x200	// normal ramping
-#define BASS_MUSIC_RAMPS		0x400	// sensitive ramping
-#define BASS_MUSIC_SURROUND		0x800	// surround sound
-#define BASS_MUSIC_SURROUND2	0x1000	// surround sound (mode 2)
-#define BASS_MUSIC_FT2MOD		0x2000	// play .MOD as FastTracker 2 does
-#define BASS_MUSIC_PT1MOD		0x4000	// play .MOD as ProTracker 1 does
-#define BASS_MUSIC_NONINTER		0x10000	// non-interpolated sample mixing
-#define BASS_MUSIC_SINCINTER	0x800000 // sinc interpolated sample mixing
-#define BASS_MUSIC_POSRESET		0x8000	// stop all notes when moving position
-#define BASS_MUSIC_POSRESETEX	0x400000 // stop all notes and reset bmp/etc when moving position
-#define BASS_MUSIC_STOPBACK		0x80000	// stop the music on a backwards jump effect
-#define BASS_MUSIC_NOSAMPLE		0x100000 // don't load the samples
-
-// Speaker assignment flags
-#define BASS_SPEAKER_FRONT	0x1000000	// front speakers
-#define BASS_SPEAKER_REAR	0x2000000	// rear/side speakers
-#define BASS_SPEAKER_CENLFE	0x3000000	// center & LFE speakers (5.1)
-#define BASS_SPEAKER_REAR2	0x4000000	// rear center speakers (7.1)
-#define BASS_SPEAKER_N(n)	((n)<<24)	// n'th pair of speakers (max 15)
-#define BASS_SPEAKER_LEFT	0x10000000	// modifier: left
-#define BASS_SPEAKER_RIGHT	0x20000000	// modifier: right
-#define BASS_SPEAKER_FRONTLEFT	BASS_SPEAKER_FRONT|BASS_SPEAKER_LEFT
-#define BASS_SPEAKER_FRONTRIGHT	BASS_SPEAKER_FRONT|BASS_SPEAKER_RIGHT
-#define BASS_SPEAKER_REARLEFT	BASS_SPEAKER_REAR|BASS_SPEAKER_LEFT
-#define BASS_SPEAKER_REARRIGHT	BASS_SPEAKER_REAR|BASS_SPEAKER_RIGHT
-#define BASS_SPEAKER_CENTER		BASS_SPEAKER_CENLFE|BASS_SPEAKER_LEFT
-#define BASS_SPEAKER_LFE		BASS_SPEAKER_CENLFE|BASS_SPEAKER_RIGHT
-#define BASS_SPEAKER_REAR2LEFT	BASS_SPEAKER_REAR2|BASS_SPEAKER_LEFT
-#define BASS_SPEAKER_REAR2RIGHT	BASS_SPEAKER_REAR2|BASS_SPEAKER_RIGHT
-
-#define BASS_UNICODE			0x80000000
-
-#define BASS_RECORD_PAUSE		0x8000	// start recording paused
-
-// DX7 voice allocation & management flags
-#define BASS_VAM_HARDWARE		1
-#define BASS_VAM_SOFTWARE		2
-#define BASS_VAM_TERM_TIME		4
-#define BASS_VAM_TERM_DIST		8
-#define BASS_VAM_TERM_PRIO		16
-
-// Channel info structure
-typedef struct {
-	DWORD freq;		// default playback rate
-	DWORD chans;	// channels
-	DWORD flags;	// BASS_SAMPLE/STREAM/MUSIC/SPEAKER flags
-	DWORD ctype;	// type of channel
-	DWORD origres;	// original resolution
-	HPLUGIN plugin;	// plugin
-	HSAMPLE sample; // sample
-	const char *filename; // filename
-} BASS_CHANNELINFO;
-
-// BASS_CHANNELINFO types
-#define BASS_CTYPE_SAMPLE		1
-#define BASS_CTYPE_RECORD		2
-#define BASS_CTYPE_STREAM		0x10000
-#define BASS_CTYPE_STREAM_OGG	0x10002
-#define BASS_CTYPE_STREAM_MP1	0x10003
-#define BASS_CTYPE_STREAM_MP2	0x10004
-#define BASS_CTYPE_STREAM_MP3	0x10005
-#define BASS_CTYPE_STREAM_AIFF	0x10006
-#define BASS_CTYPE_STREAM_CA	0x10007
-#define BASS_CTYPE_STREAM_WAV	0x40000 // WAVE flag, LOWORD=codec
-#define BASS_CTYPE_STREAM_WAV_PCM	0x50001
-#define BASS_CTYPE_STREAM_WAV_FLOAT	0x50003
-#define BASS_CTYPE_MUSIC_MOD	0x20000
-#define BASS_CTYPE_MUSIC_MTM	0x20001
-#define BASS_CTYPE_MUSIC_S3M	0x20002
-#define BASS_CTYPE_MUSIC_XM		0x20003
-#define BASS_CTYPE_MUSIC_IT		0x20004
-#define BASS_CTYPE_MUSIC_MO3	0x00100 // MO3 flag
-
-typedef struct {
-	DWORD ctype;		// channel type
-#ifdef _WIN32_WCE
-	const wchar_t *name;	// format description
-	const wchar_t *exts;	// file extension filter (*.ext1;*.ext2;etc...)
-#else
-	const char *name;	// format description
-	const char *exts;	// file extension filter (*.ext1;*.ext2;etc...)
-#endif
-} BASS_PLUGINFORM;
-
-typedef struct {
-	DWORD version;					// version (same form as BASS_GetVersion)
-	DWORD formatc;					// number of formats
-	const BASS_PLUGINFORM *formats;	// the array of formats
-} BASS_PLUGININFO;
-
-// 3D vector (for 3D positions/velocities/orientations)
-typedef struct BASS_3DVECTOR {
-#ifdef __cplusplus
-	BASS_3DVECTOR() {};
-	BASS_3DVECTOR(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {};
-#endif
-	float x;	// +=right, -=left
-	float y;	// +=up, -=down
-	float z;	// +=front, -=behind
-} BASS_3DVECTOR;
-
-// 3D channel modes
-#define BASS_3DMODE_NORMAL		0	// normal 3D processing
-#define BASS_3DMODE_RELATIVE	1	// position is relative to the listener
-#define BASS_3DMODE_OFF			2	// no 3D processing
-
-// software 3D mixing algorithms (used with BASS_CONFIG_3DALGORITHM)
-#define BASS_3DALG_DEFAULT	0
-#define BASS_3DALG_OFF		1
-#define BASS_3DALG_FULL		2
-#define BASS_3DALG_LIGHT	3
-
-// EAX environments, use with BASS_SetEAXParameters
-enum
-{
-    EAX_ENVIRONMENT_GENERIC,
-    EAX_ENVIRONMENT_PADDEDCELL,
-    EAX_ENVIRONMENT_ROOM,
-    EAX_ENVIRONMENT_BATHROOM,
-    EAX_ENVIRONMENT_LIVINGROOM,
-    EAX_ENVIRONMENT_STONEROOM,
-    EAX_ENVIRONMENT_AUDITORIUM,
-    EAX_ENVIRONMENT_CONCERTHALL,
-    EAX_ENVIRONMENT_CAVE,
-    EAX_ENVIRONMENT_ARENA,
-    EAX_ENVIRONMENT_HANGAR,
-    EAX_ENVIRONMENT_CARPETEDHALLWAY,
-    EAX_ENVIRONMENT_HALLWAY,
-    EAX_ENVIRONMENT_STONECORRIDOR,
-    EAX_ENVIRONMENT_ALLEY,
-    EAX_ENVIRONMENT_FOREST,
-    EAX_ENVIRONMENT_CITY,
-    EAX_ENVIRONMENT_MOUNTAINS,
-    EAX_ENVIRONMENT_QUARRY,
-    EAX_ENVIRONMENT_PLAIN,
-    EAX_ENVIRONMENT_PARKINGLOT,
-    EAX_ENVIRONMENT_SEWERPIPE,
-    EAX_ENVIRONMENT_UNDERWATER,
-    EAX_ENVIRONMENT_DRUGGED,
-    EAX_ENVIRONMENT_DIZZY,
-    EAX_ENVIRONMENT_PSYCHOTIC,
-
-    EAX_ENVIRONMENT_COUNT			// total number of environments
-};
-
-// EAX presets, usage: BASS_SetEAXParameters(EAX_PRESET_xxx)
-#define EAX_PRESET_GENERIC         EAX_ENVIRONMENT_GENERIC,0.5F,1.493F,0.5F
-#define EAX_PRESET_PADDEDCELL      EAX_ENVIRONMENT_PADDEDCELL,0.25F,0.1F,0.0F
-#define EAX_PRESET_ROOM            EAX_ENVIRONMENT_ROOM,0.417F,0.4F,0.666F
-#define EAX_PRESET_BATHROOM        EAX_ENVIRONMENT_BATHROOM,0.653F,1.499F,0.166F
-#define EAX_PRESET_LIVINGROOM      EAX_ENVIRONMENT_LIVINGROOM,0.208F,0.478F,0.0F
-#define EAX_PRESET_STONEROOM       EAX_ENVIRONMENT_STONEROOM,0.5F,2.309F,0.888F
-#define EAX_PRESET_AUDITORIUM      EAX_ENVIRONMENT_AUDITORIUM,0.403F,4.279F,0.5F
-#define EAX_PRESET_CONCERTHALL     EAX_ENVIRONMENT_CONCERTHALL,0.5F,3.961F,0.5F
-#define EAX_PRESET_CAVE            EAX_ENVIRONMENT_CAVE,0.5F,2.886F,1.304F
-#define EAX_PRESET_ARENA           EAX_ENVIRONMENT_ARENA,0.361F,7.284F,0.332F
-#define EAX_PRESET_HANGAR          EAX_ENVIRONMENT_HANGAR,0.5F,10.0F,0.3F
-#define EAX_PRESET_CARPETEDHALLWAY EAX_ENVIRONMENT_CARPETEDHALLWAY,0.153F,0.259F,2.0F
-#define EAX_PRESET_HALLWAY         EAX_ENVIRONMENT_HALLWAY,0.361F,1.493F,0.0F
-#define EAX_PRESET_STONECORRIDOR   EAX_ENVIRONMENT_STONECORRIDOR,0.444F,2.697F,0.638F
-#define EAX_PRESET_ALLEY           EAX_ENVIRONMENT_ALLEY,0.25F,1.752F,0.776F
-#define EAX_PRESET_FOREST          EAX_ENVIRONMENT_FOREST,0.111F,3.145F,0.472F
-#define EAX_PRESET_CITY            EAX_ENVIRONMENT_CITY,0.111F,2.767F,0.224F
-#define EAX_PRESET_MOUNTAINS       EAX_ENVIRONMENT_MOUNTAINS,0.194F,7.841F,0.472F
-#define EAX_PRESET_QUARRY          EAX_ENVIRONMENT_QUARRY,1.0F,1.499F,0.5F
-#define EAX_PRESET_PLAIN           EAX_ENVIRONMENT_PLAIN,0.097F,2.767F,0.224F
-#define EAX_PRESET_PARKINGLOT      EAX_ENVIRONMENT_PARKINGLOT,0.208F,1.652F,1.5F
-#define EAX_PRESET_SEWERPIPE       EAX_ENVIRONMENT_SEWERPIPE,0.652F,2.886F,0.25F
-#define EAX_PRESET_UNDERWATER      EAX_ENVIRONMENT_UNDERWATER,1.0F,1.499F,0.0F
-#define EAX_PRESET_DRUGGED         EAX_ENVIRONMENT_DRUGGED,0.875F,8.392F,1.388F
-#define EAX_PRESET_DIZZY           EAX_ENVIRONMENT_DIZZY,0.139F,17.234F,0.666F
-#define EAX_PRESET_PSYCHOTIC       EAX_ENVIRONMENT_PSYCHOTIC,0.486F,7.563F,0.806F
-
-typedef DWORD (CALLBACK STREAMPROC)(HSTREAM handle, void *buffer, DWORD length, void *user);
-/* User stream callback function. NOTE: A stream function should obviously be as quick
-as possible, other streams (and MOD musics) can't be mixed until it's finished.
-handle : The stream that needs writing
-buffer : Buffer to write the samples in
-length : Number of bytes to write
-user   : The 'user' parameter value given when calling BASS_StreamCreate
-RETURN : Number of bytes written. Set the BASS_STREAMPROC_END flag to end
-         the stream. */
-
-#define BASS_STREAMPROC_END		0x80000000	// end of user stream flag
-
-// special STREAMPROCs
-#define STREAMPROC_DUMMY		(STREAMPROC*)0		// "dummy" stream
-#define STREAMPROC_PUSH			(STREAMPROC*)-1		// push stream
-
-// BASS_StreamCreateFileUser file systems
-#define STREAMFILE_NOBUFFER		0
-#define STREAMFILE_BUFFER		1
-#define STREAMFILE_BUFFERPUSH	2
-
-// User file stream callback functions
-typedef void (CALLBACK FILECLOSEPROC)(void *user);
-typedef QWORD (CALLBACK FILELENPROC)(void *user);
-typedef DWORD (CALLBACK FILEREADPROC)(void *buffer, DWORD length, void *user);
-typedef BOOL (CALLBACK FILESEEKPROC)(QWORD offset, void *user);
-
-typedef struct {
-	FILECLOSEPROC *close;
-	FILELENPROC *length;
-	FILEREADPROC *read;
-	FILESEEKPROC *seek;
-} BASS_FILEPROCS;
-
-// BASS_StreamPutFileData options
-#define BASS_FILEDATA_END		0	// end & close the file
-
-// BASS_StreamGetFilePosition modes
-#define BASS_FILEPOS_CURRENT	0
-#define BASS_FILEPOS_DECODE		BASS_FILEPOS_CURRENT
-#define BASS_FILEPOS_DOWNLOAD	1
-#define BASS_FILEPOS_END		2
-#define BASS_FILEPOS_START		3
-#define BASS_FILEPOS_CONNECTED	4
-#define BASS_FILEPOS_BUFFER		5
-#define BASS_FILEPOS_SOCKET		6
-
-typedef void (CALLBACK DOWNLOADPROC)(const void *buffer, DWORD length, void *user);
-/* Internet stream download callback function.
-buffer : Buffer containing the downloaded data... NULL=end of download
-length : Number of bytes in the buffer
-user   : The 'user' parameter value given when calling BASS_StreamCreateURL */
-
-// BASS_ChannelSetSync types
-#define BASS_SYNC_POS			0
-#define BASS_SYNC_END			2
-#define BASS_SYNC_META			4
-#define BASS_SYNC_SLIDE			5
-#define BASS_SYNC_STALL			6
-#define BASS_SYNC_DOWNLOAD		7
-#define BASS_SYNC_FREE			8
-#define BASS_SYNC_SETPOS		11
-#define BASS_SYNC_MUSICPOS		10
-#define BASS_SYNC_MUSICINST		1
-#define BASS_SYNC_MUSICFX		3
-#define BASS_SYNC_OGG_CHANGE	12
-#define BASS_SYNC_MIXTIME		0x40000000	// FLAG: sync at mixtime, else at playtime
-#define BASS_SYNC_ONETIME		0x80000000	// FLAG: sync only once, else continuously
-
-typedef void (CALLBACK SYNCPROC)(HSYNC handle, DWORD channel, DWORD data, void *user);
-/* Sync callback function. NOTE: a sync callback function should be very
-quick as other syncs can't be processed until it has finished. If the sync
-is a "mixtime" sync, then other streams and MOD musics can't be mixed until
-it's finished either.
-handle : The sync that has occured
-channel: Channel that the sync occured in
-data   : Additional data associated with the sync's occurance
-user   : The 'user' parameter given when calling BASS_ChannelSetSync */
-
-typedef void (CALLBACK DSPPROC)(HDSP handle, DWORD channel, void *buffer, DWORD length, void *user);
-/* DSP callback function. NOTE: A DSP function should obviously be as quick as
-possible... other DSP functions, streams and MOD musics can not be processed
-until it's finished.
-handle : The DSP handle
-channel: Channel that the DSP is being applied to
-buffer : Buffer to apply the DSP to
-length : Number of bytes in the buffer
-user   : The 'user' parameter given when calling BASS_ChannelSetDSP */
-
-typedef BOOL (CALLBACK RECORDPROC)(HRECORD handle, const void *buffer, DWORD length, void *user);
-/* Recording callback function.
-handle : The recording handle
-buffer : Buffer containing the recorded sample data
-length : Number of bytes
-user   : The 'user' parameter value given when calling BASS_RecordStart
-RETURN : TRUE = continue recording, FALSE = stop */
-
-// BASS_ChannelIsActive return values
-#define BASS_ACTIVE_STOPPED	0
-#define BASS_ACTIVE_PLAYING	1
-#define BASS_ACTIVE_STALLED	2
-#define BASS_ACTIVE_PAUSED	3
-
-// Channel attributes
-#define BASS_ATTRIB_FREQ			1
-#define BASS_ATTRIB_VOL				2
-#define BASS_ATTRIB_PAN				3
-#define BASS_ATTRIB_EAXMIX			4
-#define BASS_ATTRIB_MUSIC_AMPLIFY	0x100
-#define BASS_ATTRIB_MUSIC_PANSEP	0x101
-#define BASS_ATTRIB_MUSIC_PSCALER	0x102
-#define BASS_ATTRIB_MUSIC_BPM		0x103
-#define BASS_ATTRIB_MUSIC_SPEED		0x104
-#define BASS_ATTRIB_MUSIC_VOL_GLOBAL 0x105
-#define BASS_ATTRIB_MUSIC_VOL_CHAN	0x200 // + channel #
-#define BASS_ATTRIB_MUSIC_VOL_INST	0x300 // + instrument #
-
-// BASS_ChannelGetData flags
-#define BASS_DATA_AVAILABLE	0			// query how much data is buffered
-#define BASS_DATA_FLOAT		0x40000000	// flag: return floating-point sample data
-#define BASS_DATA_FFT256	0x80000000	// 256 sample FFT
-#define BASS_DATA_FFT512	0x80000001	// 512 FFT
-#define BASS_DATA_FFT1024	0x80000002	// 1024 FFT
-#define BASS_DATA_FFT2048	0x80000003	// 2048 FFT
-#define BASS_DATA_FFT4096	0x80000004	// 4096 FFT
-#define BASS_DATA_FFT8192	0x80000005	// 8192 FFT
-#define BASS_DATA_FFT_INDIVIDUAL 0x10	// FFT flag: FFT for each channel, else all combined
-#define BASS_DATA_FFT_NOWINDOW	0x20	// FFT flag: no Hanning window
-
-// BASS_ChannelGetTags types : what's returned
-#define BASS_TAG_ID3		0	// ID3v1 tags : TAG_ID3 structure
-#define BASS_TAG_ID3V2		1	// ID3v2 tags : variable length block
-#define BASS_TAG_OGG		2	// OGG comments : series of null-terminated UTF-8 strings
-#define BASS_TAG_HTTP		3	// HTTP headers : series of null-terminated ANSI strings
-#define BASS_TAG_ICY		4	// ICY headers : series of null-terminated ANSI strings
-#define BASS_TAG_META		5	// ICY metadata : ANSI string
-#define BASS_TAG_VENDOR		9	// OGG encoder : UTF-8 string
-#define BASS_TAG_LYRICS3	10	// Lyric3v2 tag : ASCII string
-#define BASS_TAG_CA_CODEC	11	// CoreAudio codec info : TAG_CA_CODEC structure
-#define BASS_TAG_RIFF_INFO	0x100 // RIFF "INFO" tags : series of null-terminated ANSI strings
-#define BASS_TAG_RIFF_BEXT	0x101 // RIFF/BWF "bext" tags : TAG_BEXT structure
-#define BASS_TAG_RIFF_CART	0x102 // RIFF/BWF "cart" tags : TAG_CART structure
-#define BASS_TAG_MUSIC_NAME		0x10000	// MOD music name : ANSI string
-#define BASS_TAG_MUSIC_MESSAGE	0x10001	// MOD message : ANSI string
-#define BASS_TAG_MUSIC_ORDERS	0x10002	// MOD order list : BYTE array of pattern numbers
-#define BASS_TAG_MUSIC_INST		0x10100	// + instrument #, MOD instrument name : ANSI string
-#define BASS_TAG_MUSIC_SAMPLE	0x10300	// + sample #, MOD sample name : ANSI string
-
-// ID3v1 tag structure
-typedef struct {
-	char id[3];
-	char title[30];
-	char artist[30];
-	char album[30];
-	char year[4];
-	char comment[30];
-	BYTE genre;
-} TAG_ID3;
-
-// BWF "bext" tag structure
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4200)
-#endif
-#pragma pack(push,1)
-typedef struct {
-	char Description[256];			// description
-	char Originator[32];			// name of the originator
-	char OriginatorReference[32];	// reference of the originator
-	char OriginationDate[10];		// date of creation (yyyy-mm-dd)
-	char OriginationTime[8];		// time of creation (hh-mm-ss)
-	QWORD TimeReference;			// first sample count since midnight (little-endian)
-	WORD Version;					// BWF version (little-endian)
-	BYTE UMID[64];					// SMPTE UMID
-	BYTE Reserved[190];
-#if defined(__GNUC__) && __GNUC__<3
-	char CodingHistory[0];			// history
-#elif 1 // change to 0 if compiler fails the following line
-	char CodingHistory[];			// history
-#else
-	char CodingHistory[1];			// history
-#endif
-} TAG_BEXT;
-#pragma pack(pop)
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// BWF "cart" tag structures
-typedef struct
-{
-	DWORD dwUsage;					// FOURCC timer usage ID
-	DWORD dwValue;					// timer value in samples from head
-} TAG_CART_TIMER;
-
-typedef struct
-{
-	char Version[4];				// version of the data structure
-	char Title[64];					// title of cart audio sequence
-	char Artist[64];				// artist or creator name
-	char CutID[64];					// cut number identification
-	char ClientID[64];				// client identification
-	char Category[64];				// category ID, PSA, NEWS, etc
-	char Classification[64];		// classification or auxiliary key
-	char OutCue[64];				// out cue text
-	char StartDate[10];				// yyyy-mm-dd
-	char StartTime[8];				// hh:mm:ss
-	char EndDate[10];				// yyyy-mm-dd
-	char EndTime[8];				// hh:mm:ss
-	char ProducerAppID[64];			// name of vendor or application
-	char ProducerAppVersion[64];	// version of producer application
-	char UserDef[64];				// user defined text
-	DWORD dwLevelReference;			// sample value for 0 dB reference
-	TAG_CART_TIMER PostTimer[8];	// 8 time markers after head
-	char Reserved[276];
-	char URL[1024];					// uniform resource locator
-#if defined(__GNUC__) && __GNUC__<3
-	char TagText[0];				// free form text for scripts or tags
-#elif 1 // change to 0 if compiler fails the following line
-	char TagText[];					// free form text for scripts or tags
-#else
-	char TagText[1];				// free form text for scripts or tags
-#endif
-} TAG_CART;
-
-// CoreAudio codec info structure
-typedef struct {
-	DWORD ftype;					// file format
-	DWORD atype;					// audio format
-	const char *name;				// description
-} TAG_CA_CODEC;
-
-// BASS_ChannelGetLength/GetPosition/SetPosition modes
-#define BASS_POS_BYTE			0		// byte position
-#define BASS_POS_MUSIC_ORDER	1		// order.row position, MAKELONG(order,row)
-#define BASS_POS_DECODE			0x10000000 // flag: get the decoding (not playing) position
-
-// BASS_RecordSetInput flags
-#define BASS_INPUT_OFF		0x10000
-#define BASS_INPUT_ON		0x20000
-
-#define BASS_INPUT_TYPE_MASK		0xff000000
-#define BASS_INPUT_TYPE_UNDEF		0x00000000
-#define BASS_INPUT_TYPE_DIGITAL		0x01000000
-#define BASS_INPUT_TYPE_LINE		0x02000000
-#define BASS_INPUT_TYPE_MIC			0x03000000
-#define BASS_INPUT_TYPE_SYNTH		0x04000000
-#define BASS_INPUT_TYPE_CD			0x05000000
-#define BASS_INPUT_TYPE_PHONE		0x06000000
-#define BASS_INPUT_TYPE_SPEAKER		0x07000000
-#define BASS_INPUT_TYPE_WAVE		0x08000000
-#define BASS_INPUT_TYPE_AUX			0x09000000
-#define BASS_INPUT_TYPE_ANALOG		0x0a000000
-
-// DX8 effect types, use with BASS_ChannelSetFX
-enum
-{
-	BASS_FX_DX8_CHORUS,
-	BASS_FX_DX8_COMPRESSOR,
-	BASS_FX_DX8_DISTORTION,
-	BASS_FX_DX8_ECHO,
-	BASS_FX_DX8_FLANGER,
-	BASS_FX_DX8_GARGLE,
-	BASS_FX_DX8_I3DL2REVERB,
-	BASS_FX_DX8_PARAMEQ,
-	BASS_FX_DX8_REVERB
-};
-
-typedef struct {
-    float       fWetDryMix;
-    float       fDepth;
-    float       fFeedback;
-    float       fFrequency;
-    DWORD       lWaveform;	// 0=triangle, 1=sine
-    float       fDelay;
-    DWORD       lPhase;		// BASS_DX8_PHASE_xxx
-} BASS_DX8_CHORUS;
-
-typedef struct {
-    float   fGain;
-    float   fAttack;
-    float   fRelease;
-    float   fThreshold;
-    float   fRatio;
-    float   fPredelay;
-} BASS_DX8_COMPRESSOR;
-
-typedef struct {
-    float   fGain;
-    float   fEdge;
-    float   fPostEQCenterFrequency;
-    float   fPostEQBandwidth;
-    float   fPreLowpassCutoff;
-} BASS_DX8_DISTORTION;
-
-typedef struct {
-    float   fWetDryMix;
-    float   fFeedback;
-    float   fLeftDelay;
-    float   fRightDelay;
-    BOOL    lPanDelay;
-} BASS_DX8_ECHO;
-
-typedef struct {
-    float       fWetDryMix;
-    float       fDepth;
-    float       fFeedback;
-    float       fFrequency;
-    DWORD       lWaveform;	// 0=triangle, 1=sine
-    float       fDelay;
-    DWORD       lPhase;		// BASS_DX8_PHASE_xxx
-} BASS_DX8_FLANGER;
-
-typedef struct {
-    DWORD       dwRateHz;               // Rate of modulation in hz
-    DWORD       dwWaveShape;            // 0=triangle, 1=square
-} BASS_DX8_GARGLE;
-
-typedef struct {
-    int     lRoom;                  // [-10000, 0]      default: -1000 mB
-    int     lRoomHF;                // [-10000, 0]      default: 0 mB
-    float   flRoomRolloffFactor;    // [0.0, 10.0]      default: 0.0
-    float   flDecayTime;            // [0.1, 20.0]      default: 1.49s
-    float   flDecayHFRatio;         // [0.1, 2.0]       default: 0.83
-    int     lReflections;           // [-10000, 1000]   default: -2602 mB
-    float   flReflectionsDelay;     // [0.0, 0.3]       default: 0.007 s
-    int     lReverb;                // [-10000, 2000]   default: 200 mB
-    float   flReverbDelay;          // [0.0, 0.1]       default: 0.011 s
-    float   flDiffusion;            // [0.0, 100.0]     default: 100.0 %
-    float   flDensity;              // [0.0, 100.0]     default: 100.0 %
-    float   flHFReference;          // [20.0, 20000.0]  default: 5000.0 Hz
-} BASS_DX8_I3DL2REVERB;
-
-typedef struct {
-    float   fCenter;
-    float   fBandwidth;
-    float   fGain;
-} BASS_DX8_PARAMEQ;
-
-typedef struct {
-    float   fInGain;                // [-96.0,0.0]            default: 0.0 dB
-    float   fReverbMix;             // [-96.0,0.0]            default: 0.0 db
-    float   fReverbTime;            // [0.001,3000.0]         default: 1000.0 ms
-    float   fHighFreqRTRatio;       // [0.001,0.999]          default: 0.001
-} BASS_DX8_REVERB;
-
-#define BASS_DX8_PHASE_NEG_180        0
-#define BASS_DX8_PHASE_NEG_90         1
-#define BASS_DX8_PHASE_ZERO           2
-#define BASS_DX8_PHASE_90             3
-#define BASS_DX8_PHASE_180            4
-
-BOOL BASSDEF(BASS_SetConfig)(DWORD option, DWORD value);
-DWORD BASSDEF(BASS_GetConfig)(DWORD option);
-BOOL BASSDEF(BASS_SetConfigPtr)(DWORD option, void *value);
-void *BASSDEF(BASS_GetConfigPtr)(DWORD option);
-DWORD BASSDEF(BASS_GetVersion)();
-int BASSDEF(BASS_ErrorGetCode)();
-BOOL BASSDEF(BASS_GetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info);
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, HWND win, const GUID *dsguid);
-#else
-BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, void *win, void *dsguid);
-#endif
-BOOL BASSDEF(BASS_SetDevice)(DWORD device);
-DWORD BASSDEF(BASS_GetDevice)();
-BOOL BASSDEF(BASS_Free)();
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-void *BASSDEF(BASS_GetDSoundObject)(DWORD object);
-#endif
-BOOL BASSDEF(BASS_GetInfo)(BASS_INFO *info);
-BOOL BASSDEF(BASS_Update)(DWORD length);
-float BASSDEF(BASS_GetCPU)();
-BOOL BASSDEF(BASS_Start)();
-BOOL BASSDEF(BASS_Stop)();
-BOOL BASSDEF(BASS_Pause)();
-BOOL BASSDEF(BASS_SetVolume)(float volume);
-float BASSDEF(BASS_GetVolume)();
-
-HPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags);
-BOOL BASSDEF(BASS_PluginFree)(HPLUGIN handle);
-const BASS_PLUGININFO *BASSDEF(BASS_PluginGetInfo)(HPLUGIN handle);
-
-BOOL BASSDEF(BASS_Set3DFactors)(float distf, float rollf, float doppf);
-BOOL BASSDEF(BASS_Get3DFactors)(float *distf, float *rollf, float *doppf);
-BOOL BASSDEF(BASS_Set3DPosition)(const BASS_3DVECTOR *pos, const BASS_3DVECTOR *vel, const BASS_3DVECTOR *front, const BASS_3DVECTOR *top);
-BOOL BASSDEF(BASS_Get3DPosition)(BASS_3DVECTOR *pos, BASS_3DVECTOR *vel, BASS_3DVECTOR *front, BASS_3DVECTOR *top);
-void BASSDEF(BASS_Apply3D)();
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-BOOL BASSDEF(BASS_SetEAXParameters)(int env, float vol, float decay, float damp);
-BOOL BASSDEF(BASS_GetEAXParameters)(DWORD *env, float *vol, float *decay, float *damp);
-#endif
-
-HMUSIC BASSDEF(BASS_MusicLoad)(BOOL mem, const void *file, QWORD offset, DWORD length, DWORD flags, DWORD freq);
-BOOL BASSDEF(BASS_MusicFree)(HMUSIC handle);
-
-HSAMPLE BASSDEF(BASS_SampleLoad)(BOOL mem, const void *file, QWORD offset, DWORD length, DWORD max, DWORD flags);
-HSAMPLE BASSDEF(BASS_SampleCreate)(DWORD length, DWORD freq, DWORD chans, DWORD max, DWORD flags);
-BOOL BASSDEF(BASS_SampleFree)(HSAMPLE handle);
-BOOL BASSDEF(BASS_SampleSetData)(HSAMPLE handle, const void *buffer);
-BOOL BASSDEF(BASS_SampleGetData)(HSAMPLE handle, void *buffer);
-BOOL BASSDEF(BASS_SampleGetInfo)(HSAMPLE handle, BASS_SAMPLE *info);
-BOOL BASSDEF(BASS_SampleSetInfo)(HSAMPLE handle, const BASS_SAMPLE *info);
-HCHANNEL BASSDEF(BASS_SampleGetChannel)(HSAMPLE handle, BOOL onlynew);
-DWORD BASSDEF(BASS_SampleGetChannels)(HSAMPLE handle, HCHANNEL *channels);
-BOOL BASSDEF(BASS_SampleStop)(HSAMPLE handle);
-
-HSTREAM BASSDEF(BASS_StreamCreate)(DWORD freq, DWORD chans, DWORD flags, STREAMPROC *proc, void *user);
-HSTREAM BASSDEF(BASS_StreamCreateFile)(BOOL mem, const void *file, QWORD offset, QWORD length, DWORD flags);
-HSTREAM BASSDEF(BASS_StreamCreateURL)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user);
-HSTREAM BASSDEF(BASS_StreamCreateFileUser)(DWORD system, DWORD flags, const BASS_FILEPROCS *proc, void *user);
-BOOL BASSDEF(BASS_StreamFree)(HSTREAM handle);
-QWORD BASSDEF(BASS_StreamGetFilePosition)(HSTREAM handle, DWORD mode);
-DWORD BASSDEF(BASS_StreamPutData)(HSTREAM handle, const void *buffer, DWORD length);
-DWORD BASSDEF(BASS_StreamPutFileData)(HSTREAM handle, const void *buffer, DWORD length);
-
-BOOL BASSDEF(BASS_RecordGetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info);
-BOOL BASSDEF(BASS_RecordInit)(int device);
-BOOL BASSDEF(BASS_RecordSetDevice)(DWORD device);
-DWORD BASSDEF(BASS_RecordGetDevice)();
-BOOL BASSDEF(BASS_RecordFree)();
-BOOL BASSDEF(BASS_RecordGetInfo)(BASS_RECORDINFO *info);
-const char *BASSDEF(BASS_RecordGetInputName)(int input);
-BOOL BASSDEF(BASS_RecordSetInput)(int input, DWORD flags, float volume);
-DWORD BASSDEF(BASS_RecordGetInput)(int input, float *volume);
-HRECORD BASSDEF(BASS_RecordStart)(DWORD freq, DWORD chans, DWORD flags, RECORDPROC *proc, void *user);
-
-double BASSDEF(BASS_ChannelBytes2Seconds)(DWORD handle, QWORD pos);
-QWORD BASSDEF(BASS_ChannelSeconds2Bytes)(DWORD handle, double pos);
-DWORD BASSDEF(BASS_ChannelGetDevice)(DWORD handle);
-BOOL BASSDEF(BASS_ChannelSetDevice)(DWORD handle, DWORD device);
-DWORD BASSDEF(BASS_ChannelIsActive)(DWORD handle);
-BOOL BASSDEF(BASS_ChannelGetInfo)(DWORD handle, BASS_CHANNELINFO *info);
-const char *BASSDEF(BASS_ChannelGetTags)(DWORD handle, DWORD tags);
-DWORD BASSDEF(BASS_ChannelFlags)(DWORD handle, DWORD flags, DWORD mask);
-BOOL BASSDEF(BASS_ChannelUpdate)(DWORD handle, DWORD length);
-BOOL BASSDEF(BASS_ChannelLock)(DWORD handle, BOOL lock);
-BOOL BASSDEF(BASS_ChannelPlay)(DWORD handle, BOOL restart);
-BOOL BASSDEF(BASS_ChannelStop)(DWORD handle);
-BOOL BASSDEF(BASS_ChannelPause)(DWORD handle);
-BOOL BASSDEF(BASS_ChannelSetAttribute)(DWORD handle, DWORD attrib, float value);
-BOOL BASSDEF(BASS_ChannelGetAttribute)(DWORD handle, DWORD attrib, float *value);
-BOOL BASSDEF(BASS_ChannelSlideAttribute)(DWORD handle, DWORD attrib, float value, DWORD time);
-BOOL BASSDEF(BASS_ChannelIsSliding)(DWORD handle, DWORD attrib);
-BOOL BASSDEF(BASS_ChannelSet3DAttributes)(DWORD handle, int mode, float min, float max, int iangle, int oangle, float outvol);
-BOOL BASSDEF(BASS_ChannelGet3DAttributes)(DWORD handle, DWORD *mode, float *min, float *max, DWORD *iangle, DWORD *oangle, float *outvol);
-BOOL BASSDEF(BASS_ChannelSet3DPosition)(DWORD handle, const BASS_3DVECTOR *pos, const BASS_3DVECTOR *orient, const BASS_3DVECTOR *vel);
-BOOL BASSDEF(BASS_ChannelGet3DPosition)(DWORD handle, BASS_3DVECTOR *pos, BASS_3DVECTOR *orient, BASS_3DVECTOR *vel);
-QWORD BASSDEF(BASS_ChannelGetLength)(DWORD handle, DWORD mode);
-BOOL BASSDEF(BASS_ChannelSetPosition)(DWORD handle, QWORD pos, DWORD mode);
-QWORD BASSDEF(BASS_ChannelGetPosition)(DWORD handle, DWORD mode);
-DWORD BASSDEF(BASS_ChannelGetLevel)(DWORD handle);
-DWORD BASSDEF(BASS_ChannelGetData)(DWORD handle, void *buffer, DWORD length);
-HSYNC BASSDEF(BASS_ChannelSetSync)(DWORD handle, DWORD type, QWORD param, SYNCPROC *proc, void *user);
-BOOL BASSDEF(BASS_ChannelRemoveSync)(DWORD handle, HSYNC sync);
-HDSP BASSDEF(BASS_ChannelSetDSP)(DWORD handle, DSPPROC *proc, void *user, int priority);
-BOOL BASSDEF(BASS_ChannelRemoveDSP)(DWORD handle, HDSP dsp);
-BOOL BASSDEF(BASS_ChannelSetLink)(DWORD handle, DWORD chan);
-BOOL BASSDEF(BASS_ChannelRemoveLink)(DWORD handle, DWORD chan);
-HFX BASSDEF(BASS_ChannelSetFX)(DWORD handle, DWORD type, int priority);
-BOOL BASSDEF(BASS_ChannelRemoveFX)(DWORD handle, HFX fx);
-
-BOOL BASSDEF(BASS_FXSetParameters)(HFX handle, const void *params);
-BOOL BASSDEF(BASS_FXGetParameters)(HFX handle, void *params);
-BOOL BASSDEF(BASS_FXReset)(HFX handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/bass/bass.lib and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/bass/bass.lib differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/diff-sap.js kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/diff-sap.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/diff-sap.js	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/diff-sap.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-// wscript.exe "PATH\TO\diff-sap.js" %base %mine %bname %yname //E:javascript
-
-// Get command-line arguments
-
-var sap1;
-var sap2;
-var names = "";
-switch (WScript.Arguments.length) {
-case 4:
-	names =  " /basename:\"" + WScript.Arguments(2) + "\" /minename:\"" + WScript.Arguments(3) + "\"";
-	// FALLTHROUGH
-case 2:
-	sap1 = WScript.Arguments(0);
-	sap2 = WScript.Arguments(1);
-	break;
-default:
-	WScript.Echo("Specify two filenames plus optional two headers");
-	WScript.Quit(1);
-}
-
-// Find TortoiseMerge
-
-var wsh = new ActiveXObject("WScript.Shell");
-var tmerge;
-try {
-	tmerge = wsh.RegRead("HKLM\\SOFTWARE\\TortoiseSVN\\TMergePath");
-}
-catch (e) {
-	try {
-		tmerge = wsh.RegRead("HKLM\\SOFTWARE\\TortoiseGit\\TMergePath");
-	}
-	catch (e) {
-		WScript.Echo("TortoiseMerge not found!");
-		WScript.Quit(1);
-	}
-}
-
-// Convert SAPs to plain text
-
-var fso = new ActiveXObject("Scripting.FileSystemObject");
-var exe = fso.GetParentFolderName(WScript.ScriptFullName);
-exe = fso.BuildPath(exe, "sap2txt.exe");
-
-function sap2txt(sap)
-{
-	var txt = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName());
-	wsh.Run("cmd /c \"\"" + exe + "\" \"" + sap + "\" >\"" + txt + "\"\"", 0, true);
-	return txt;
-}
-
-var txt1 = sap2txt(sap1);
-var txt2 = sap2txt(sap2);
-
-// Display results
-
-wsh.Run("\"" + tmerge + "\" /base:\"" + txt1 + "\" /mine:\"" + txt2 + "\"" + names, 4, true);
-
-// Write back changes
-
-wsh.Run("\"" + exe +"\" \"" + txt2 + "\" \"" + sap2 + "\"", 0, true);
-
-// Delete temporary files when done
-
-fso.DeleteFile(txt2);
-fso.DeleteFile(txt1);
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/dshow/asap_dsf.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/dshow/asap_dsf.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/dshow/asap_dsf.cpp	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/dshow/asap_dsf.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,672 +0,0 @@
-/*
- * asap_dsf.cpp - ASAP DirectShow source filter
- *
- * Copyright (C) 2008-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <memory>
-#include <stdio.h>
-#include <streams.h>
-#include <tchar.h>
-#ifndef UNDER_CE
-#include <shlwapi.h>
-#include <initguid.h>
-#endif
-#include <qnetwork.h>
-
-#ifdef ASAP_DSF_TRANSCODE
-// seems it doesn't work
-#include <wmpservices.h>
-static const IID IID_IWMPTranscodePolicy = { 0xb64cbac3, 0x401c, 0x4327, { 0xa3, 0xe8, 0xb9, 0xfe, 0xb3, 0xa8, 0xc2, 0x5c } };
-#endif
-
-#include "asap.h"
-
-static const TCHAR extensions[][5] =
-	{ _T(".sap"), _T(".cmc"), _T(".cm3"), _T(".cmr"), _T(".cms"), _T(".dmc"), _T(".dlt"),
-	  _T(".mpt"), _T(".mpd"), _T(".rmt"), _T(".tmc"), _T(".tm8"), _T(".tm2"), _T(".fc") };
-#define N_EXTS (sizeof(extensions) / sizeof(extensions[0]))
-#define EXT_FILTER _T("*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc")
-
-#define BITS_PER_SAMPLE      16
-#define MIN_BUFFERED_BLOCKS  4096
-
-#define SZ_ASAP_SOURCE       L"ASAP Source Filter"
-
-static const TCHAR CLSID_ASAPSource_str[] = _T("{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}");
-static const GUID CLSID_ASAPSource = { 0x8e6205a0, 0x19e2, 0x4037, { 0xaf, 0x32, 0xb2, 0x9a, 0x9b, 0x9d, 0xc, 0x93 } };
-
-class CASAPSourceStream : public CSourceStream, IMediaSeeking
-{
-	CCritSec m_cs;
-	ASAP *m_asap;
-	BOOL m_loaded;
-	int m_channels;
-	int m_song;
-	int m_duration;
-	LONGLONG m_blocks;
-
-public:
-
-	CASAPSourceStream(HRESULT *phr, CSource *pFilter)
-		: CSourceStream(NAME("ASAPSourceStream"), phr, pFilter, L"Out"), m_asap(NULL), m_loaded(FALSE), m_duration(0)
-	{
-	}
-
-	~CASAPSourceStream()
-	{
-		ASAP_Delete(m_asap);
-	}
-
-	DECLARE_IUNKNOWN
-
-	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv)
-	{
-		if (riid == IID_IMediaSeeking)
-			return GetInterface((IMediaSeeking *) this, ppv);
-		return CSourceStream::NonDelegatingQueryInterface(riid, ppv);
-	}
-
-	HRESULT InternalPlaySong(int song)
-	{
-		const ASAPInfo *info = ASAP_GetInfo(m_asap);
-		m_duration = ASAPInfo_GetDuration(info, song);
-		if (!ASAP_PlaySong(m_asap, song, m_duration)) {
-			m_loaded = FALSE;
-			return E_FAIL;
-		}
-		m_song = song;
-		m_blocks = 0;
-		return S_OK;
-	}
-
-	HRESULT Load(LPCOLESTR pszFileName)
-	{
-		int cbFilename = WideCharToMultiByte(CP_ACP, 0, pszFileName, -1, NULL, 0, NULL, NULL);
-		std::auto_ptr<char> filename(new char[cbFilename]);
-		CheckPointer(filename.get(), E_OUTOFMEMORY); // apparently Windows CE returns NULL
-		if (WideCharToMultiByte(CP_ACP, 0, pszFileName, -1, filename.get(), cbFilename, NULL, NULL) <= 0)
-			return HRESULT_FROM_WIN32(GetLastError());
-
-		// read file
-		HANDLE fh = CreateFile(
-#ifdef UNICODE
-			pszFileName,
-#else
-			filename.get(),
-#endif
-			GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-		if (fh == INVALID_HANDLE_VALUE)
-			return HRESULT_FROM_WIN32(GetLastError());
-		std::auto_ptr<BYTE> module(new BYTE[ASAPInfo_MAX_MODULE_LENGTH]);
-		CheckPointer(module.get(), E_OUTOFMEMORY); // apparently Windows CE returns NULL
-		int module_len;
-		BOOL ok = ReadFile(fh, module.get(), ASAPInfo_MAX_MODULE_LENGTH, (LPDWORD) &module_len, NULL);
-		CloseHandle(fh);
-		if (!ok)
-			return HRESULT_FROM_WIN32(GetLastError());
-
-		// load into ASAP
-		CAutoLock lck(&m_cs);
-		if (m_asap == NULL) {
-			m_asap = ASAP_New();
-			CheckPointer(m_asap, E_OUTOFMEMORY);
-		}
-		m_loaded = ASAP_Load(m_asap, filename.get(), module.get(), module_len);
-		if (!m_loaded)
-			return E_FAIL;
-		const ASAPInfo *info = ASAP_GetInfo(m_asap);
-		m_channels = ASAPInfo_GetChannels(info);
-		return InternalPlaySong(ASAPInfo_GetDefaultSong(info));
-	}
-
-	HRESULT GetMediaType(CMediaType *pMediaType)
-	{
-		CheckPointer(pMediaType, E_POINTER);
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return E_FAIL;
-		WAVEFORMATEX *wfx = (WAVEFORMATEX *) pMediaType->AllocFormatBuffer(sizeof(WAVEFORMATEX));
-		CheckPointer(wfx, E_OUTOFMEMORY);
-		pMediaType->SetType(&MEDIATYPE_Audio);
-		pMediaType->SetSubtype(&MEDIASUBTYPE_PCM);
-		pMediaType->SetTemporalCompression(FALSE);
-		pMediaType->SetSampleSize(m_channels * (BITS_PER_SAMPLE / 8));
-		pMediaType->SetFormatType(&FORMAT_WaveFormatEx);
-		wfx->wFormatTag = WAVE_FORMAT_PCM;
-		wfx->nChannels = m_channels;
-		wfx->nSamplesPerSec = ASAP_SAMPLE_RATE;
-		wfx->nBlockAlign = m_channels * (BITS_PER_SAMPLE / 8);
-		wfx->nAvgBytesPerSec = ASAP_SAMPLE_RATE * wfx->nBlockAlign;
-		wfx->wBitsPerSample = BITS_PER_SAMPLE;
-		wfx->cbSize = 0;
-		return S_OK;
-	}
-
-	HRESULT DecideBufferSize(IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *pRequest)
-	{
-		CheckPointer(pAlloc, E_POINTER);
-		CheckPointer(pRequest, E_POINTER);
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return E_FAIL;
-		if (pRequest->cBuffers == 0)
-			pRequest->cBuffers = 2;
-		int bytes = MIN_BUFFERED_BLOCKS * m_channels * (BITS_PER_SAMPLE / 8);
-		if (pRequest->cbBuffer < bytes)
-			pRequest->cbBuffer = bytes;
-		ALLOCATOR_PROPERTIES actual;
-		HRESULT hr = pAlloc->SetProperties(pRequest, &actual);
-		if (FAILED(hr))
-			return hr;
-		if (actual.cbBuffer < bytes)
-			return E_FAIL;
-		return S_OK;
-	}
-
-	HRESULT FillBuffer(IMediaSample *pSample)
-	{
-		CheckPointer(pSample, E_POINTER);
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return E_FAIL;
-		BYTE *pData;
-		HRESULT hr = pSample->GetPointer(&pData);
-		if (FAILED(hr))
-			return hr;
-		int cbData = pSample->GetSize();
-		cbData = ASAP_Generate(m_asap, pData, cbData, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-		if (cbData == 0)
-			return S_FALSE;
-		pSample->SetActualDataLength(cbData);
-		LONGLONG startTime = m_blocks * UNITS / ASAP_SAMPLE_RATE;
-		m_blocks += cbData / (m_channels * (BITS_PER_SAMPLE / 8));
-		LONGLONG endTime = m_blocks * UNITS / ASAP_SAMPLE_RATE;
-		pSample->SetTime(&startTime, &endTime);
-		pSample->SetSyncPoint(TRUE);
-		return S_OK;
-	}
-
-	STDMETHODIMP GetCapabilities(DWORD *pCapabilities)
-	{
-		CheckPointer(pCapabilities, E_POINTER);
-		*pCapabilities = AM_SEEKING_CanSeekAbsolute | AM_SEEKING_CanSeekForwards | AM_SEEKING_CanSeekBackwards | AM_SEEKING_CanGetDuration;
-		return S_OK;
-	}
-
-	STDMETHODIMP CheckCapabilities(DWORD *pCapabilities)
-	{
-		CheckPointer(pCapabilities, E_POINTER);
-		DWORD result = *pCapabilities & (AM_SEEKING_CanSeekAbsolute | AM_SEEKING_CanSeekForwards | AM_SEEKING_CanSeekBackwards | AM_SEEKING_CanGetDuration);
-		if (result == *pCapabilities)
-			return S_OK;
-		*pCapabilities = result;
-		if (result != 0)
-			return S_FALSE;
-		return E_FAIL;
-	}
-
-	STDMETHODIMP IsFormatSupported(const GUID *pFormat)
-	{
-		CheckPointer(pFormat, E_POINTER);
-		if (IsEqualGUID(*pFormat, TIME_FORMAT_MEDIA_TIME))
-			return S_OK;
-		return S_FALSE;
-	}
-
-	STDMETHODIMP QueryPreferredFormat(GUID *pFormat)
-	{
-		CheckPointer(pFormat, E_POINTER);
-		*pFormat = TIME_FORMAT_MEDIA_TIME;
-		return S_OK;
-	}
-
-	STDMETHODIMP GetTimeFormat(GUID *pFormat)
-	{
-		CheckPointer(pFormat, E_POINTER);
-		*pFormat = TIME_FORMAT_MEDIA_TIME;
-		return S_OK;
-	}
-
-	STDMETHODIMP IsUsingTimeFormat(const GUID *pFormat)
-	{
-		CheckPointer(pFormat, E_POINTER);
-		if (IsEqualGUID(*pFormat, TIME_FORMAT_MEDIA_TIME))
-			return S_OK;
-		return S_FALSE;
-	}
-
-	STDMETHODIMP SetTimeFormat(const GUID *pFormat)
-	{
-		CheckPointer(pFormat, E_POINTER);
-		if (IsEqualGUID(*pFormat, TIME_FORMAT_MEDIA_TIME))
-			return S_OK;
-		return E_INVALIDARG;
-	}
-
-	STDMETHODIMP GetDuration(LONGLONG *pDuration)
-	{
-		CheckPointer(pDuration, E_POINTER);
-		*pDuration = m_duration * (UNITS / MILLISECONDS);
-		return S_OK;
-	}
-
-	STDMETHODIMP GetStopPosition(LONGLONG *pStop)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP GetCurrentPosition(LONGLONG *pCurrent)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP SetPositions(LONGLONG *pCurrent, DWORD dwCurrentFlags, LONGLONG *pStop, DWORD dwStopFlags)
-	{
-		if ((dwCurrentFlags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_AbsolutePositioning) {
-			CheckPointer(pCurrent, E_POINTER);
-			int position = (int) (*pCurrent / (UNITS / MILLISECONDS));
-			CAutoLock lck(&m_cs);
-			ASAP_Seek(m_asap, position);
-			m_blocks = 0;
-			if ((dwCurrentFlags & AM_SEEKING_ReturnTime) != 0)
-				*pCurrent = position * (UNITS / MILLISECONDS);
-			return S_OK;
-		}
-		return E_INVALIDARG;
-	}
-
-	STDMETHODIMP GetPositions(LONGLONG *pCurrent, LONGLONG *pStop)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP SetRate(double dRate)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP GetRate(double *dRate)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP GetPreroll(LONGLONG *pllPreroll)
-	{
-		return E_NOTIMPL;
-	}
-
-	HRESULT GetSongs(DWORD *pcSongs)
-	{
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return VFW_E_NOT_CONNECTED;
-		const ASAPInfo *info = ASAP_GetInfo(m_asap);
-		*pcSongs = ASAPInfo_GetSongs(info);
-		return S_OK;
-	}
-
-	HRESULT PlaySong(int song)
-	{
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return VFW_E_NOT_CONNECTED;
-		return InternalPlaySong(song);
-	}
-
-	HRESULT IsSong(int song, DWORD *pdwFlags)
-	{
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return VFW_E_NOT_CONNECTED;
-		if (song < 0 || song >= ASAPInfo_GetSongs(ASAP_GetInfo(m_asap)))
-			return S_FALSE;
-		if (pdwFlags != NULL)
-			*pdwFlags = song == m_song ? AMSTREAMSELECTINFO_EXCLUSIVE : 0;
-		return S_OK;
-	}
-
-	HRESULT GetMetadata(BOOL author, BSTR *pbstr)
-	{
-		CAutoLock lck(&m_cs);
-		if (!m_loaded)
-			return VFW_E_NOT_FOUND;
-		const ASAPInfo *info = ASAP_GetInfo(m_asap);
-		const char *s = author ? ASAPInfo_GetAuthor(info) : ASAPInfo_GetTitle(info);
-		// *pbstr = A2BSTR(s); - just don't want dependency on ATL
-		int cch = MultiByteToWideChar(CP_ACP, 0, s, -1, NULL, 0);
-		*pbstr = SysAllocStringLen(NULL, cch - 1);
-		CheckPointer(*pbstr, E_OUTOFMEMORY);
-		if (MultiByteToWideChar(CP_ACP, 0, s, -1, *pbstr, cch) <= 0)
-			return HRESULT_FROM_WIN32(GetLastError());
-		return S_OK;
-	}
-};
-
-class CASAPSource : public CSource, IFileSourceFilter, IAMStreamSelect, IAMMediaContent
-#ifdef ASAP_DSF_TRANSCODE
-	, IWMPTranscodePolicy
-#endif
-{
-	CASAPSourceStream *m_pin;
-	LPWSTR m_filename;
-	CMediaType m_mt;
-
-	CASAPSource(IUnknown *pUnk, HRESULT *phr)
-		: CSource(NAME("ASAPSource"), pUnk, CLSID_ASAPSource), m_pin(NULL), m_filename(NULL)
-	{
-		m_pin = new CASAPSourceStream(phr, this);
-		if (m_pin == NULL && phr != NULL)
-			*phr = E_OUTOFMEMORY; // apparently Windows CE returns NULL
-	}
-
-	~CASAPSource()
-	{
-		free(m_filename);
-		delete m_pin;
-	}
-
-public:
-
-	DECLARE_IUNKNOWN
-
-	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv)
-	{
-		if (riid == IID_IFileSourceFilter)
-			return GetInterface((IFileSourceFilter *) this, ppv);
-		if (riid == IID_IAMStreamSelect)
-			return GetInterface((IAMStreamSelect *) this, ppv);
-		if (riid == IID_IAMMediaContent)
-			return GetInterface((IAMMediaContent *) this, ppv);
-#ifdef ASAP_DSF_TRANSCODE
-		if (riid == IID_IWMPTranscodePolicy)
-			return GetInterface((IWMPTranscodePolicy *) this, ppv);
-#endif
-		return CSource::NonDelegatingQueryInterface(riid, ppv);
-	}
-
-	STDMETHODIMP Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE *pmt)
-	{
-		CheckPointer(pszFileName, E_POINTER);
-		HRESULT hr = m_pin->Load(pszFileName);
-		if (FAILED(hr))
-			return hr;
-		free(m_filename);
-#ifndef UNDER_CE
-		m_filename = _wcsdup(pszFileName);
-		CheckPointer(m_filename, E_OUTOFMEMORY);
-#else
-		size_t cbFileName = (lstrlenW(pszFileName) + 1) * sizeof(WCHAR);
-		m_filename = (LPWSTR) malloc(cbFileName);
-		CheckPointer(m_filename, E_OUTOFMEMORY);
-		CopyMemory(m_filename, pszFileName, cbFileName);
-#endif
-		if (pmt == NULL) {
-			m_mt.SetType(&MEDIATYPE_Stream);
-			m_mt.SetSubtype(&MEDIASUBTYPE_NULL);
-		}
-		else
-			m_mt = *pmt;
-		return S_OK;
-	}
-
-	STDMETHODIMP GetCurFile(LPOLESTR *ppszFileName, AM_MEDIA_TYPE *pmt)
-	{
-		CheckPointer(ppszFileName, E_POINTER);
-		if (m_filename == NULL)
-			return E_FAIL;
-#ifndef UNDER_CE
-		HRESULT hr = SHStrDupW(m_filename, ppszFileName);
-		if (FAILED(hr))
-			return hr;
-#else
-		size_t cbFilename = (lstrlenW(m_filename) + 1) * sizeof(WCHAR);
-		*ppszFileName = (LPOLESTR) CoTaskMemAlloc(cbFilename);
-		CheckPointer(*ppszFileName, E_OUTOFMEMORY);
-		CopyMemory(*ppszFileName, m_filename, cbFilename);
-#endif
-		if (pmt != NULL)
-			CopyMediaType(pmt, &m_mt);
-		return S_OK;
-	}
-
-	STDMETHODIMP Count(DWORD *pcStreams)
-	{
-		CheckPointer(pcStreams, E_POINTER);
-		return m_pin->GetSongs(pcStreams);
-	}
-
-	STDMETHODIMP Enable(long lIndex, DWORD dwFlags)
-	{
-		if (dwFlags != AMSTREAMSELECTENABLE_ENABLE)
-			return E_NOTIMPL;
-		return m_pin->PlaySong(lIndex);
-		/* found this in Musepack Demuxer, doesn't do the trick for Media Player Classic Home Cinema
-		HRESULT hr = m_pin->PlaySong(lIndex);
-		if (FAILED(hr))
-			return hr;
-		IMediaSeeking *ms;
-		if (m_pGraph != NULL && m_pGraph->QueryInterface(IID_IMediaSeeking, (void **) &ms)) {
-			LONGLONG zero = 0;
-			ms->SetPositions(&zero, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning);
-			ms->Release();
-		}
-		return S_OK;
-		*/
-	}
-
-	STDMETHODIMP Info(long lIndex, AM_MEDIA_TYPE **ppmt, DWORD *pdwFlags, LCID *plcid,
-		DWORD *pdwGroup, WCHAR **ppszName, IUnknown **ppObject, IUnknown **ppUnk)
-	{
-		HRESULT hr = m_pin->IsSong(lIndex, pdwFlags);
-		if (hr != S_OK)
-			return hr;
-		if (ppmt != NULL)
-			*ppmt = NULL;
-		if (plcid != NULL)
-			*plcid = 0;
-		if (pdwGroup != NULL)
-			*pdwGroup = 0;
-		if (ppszName != NULL) {
-			*ppszName = (LPWSTR) CoTaskMemAlloc(8 * sizeof(WCHAR));
-			CheckPointer(*ppszName, E_OUTOFMEMORY);
-			swprintf(*ppszName, L"Song %d", lIndex + 1);
-		}
-		if (ppObject != NULL)
-			*ppObject = NULL;
-		if (ppUnk != NULL)
-			*ppUnk = NULL;
-		return S_OK;
-	}
-
-	STDMETHODIMP GetTypeInfoCount(UINT* pctinfo) { return E_NOTIMPL; }
-	STDMETHODIMP GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo** pptinfo) { return E_NOTIMPL; }
-	STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** rgszNames, UINT cNames, LCID lcid, DISPID* rgdispid) { return E_NOTIMPL; }
-	STDMETHODIMP Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pdispparams,
-		VARIANT* pvarResult, EXCEPINFO* pexcepinfo, UINT* puArgErr)
-	{
-		return E_NOTIMPL;
-	}
-
-	STDMETHODIMP get_AuthorName(BSTR* pbstrAuthorName)
-	{
-		return m_pin->GetMetadata(TRUE, pbstrAuthorName);
-	}
-
-	STDMETHODIMP get_Title(BSTR* pbstrTitle)
-	{
-		return m_pin->GetMetadata(FALSE, pbstrTitle);
-	}
-
-	STDMETHODIMP get_Rating(BSTR* pbstrRating) { return E_NOTIMPL; }
-	STDMETHODIMP get_Description(BSTR* pbstrDescription) { return E_NOTIMPL; }
-	STDMETHODIMP get_Copyright(BSTR* pbstrCopyright) { return E_NOTIMPL; }
-	STDMETHODIMP get_BaseURL(BSTR* pbstrBaseURL) { return E_NOTIMPL; }
-	STDMETHODIMP get_LogoURL(BSTR* pbstrLogoURL) { return E_NOTIMPL; }
-	STDMETHODIMP get_LogoIconURL(BSTR* pbstrLogoURL) { return E_NOTIMPL; }
-	STDMETHODIMP get_WatermarkURL(BSTR* pbstrWatermarkURL) { return E_NOTIMPL; }
-	STDMETHODIMP get_MoreInfoURL(BSTR* pbstrMoreInfoURL) { return E_NOTIMPL; }
-	STDMETHODIMP get_MoreInfoBannerImage(BSTR* pbstrMoreInfoBannerImage) { return E_NOTIMPL; }
-	STDMETHODIMP get_MoreInfoBannerURL(BSTR* pbstrMoreInfoBannerURL) { return E_NOTIMPL; }
-	STDMETHODIMP get_MoreInfoText(BSTR* pbstrMoreInfoText) { return E_NOTIMPL; }
-
-#ifdef ASAP_DSF_TRANSCODE
-	STDMETHODIMP allowTranscode(VARIANT_BOOL *pvarfAllow)
-	{
-		*pvarfAllow = VARIANT_TRUE;
-		return S_OK;
-	}
-#endif
-
-	static CUnknown * WINAPI CreateInstance(IUnknown *pUnk, HRESULT *phr)
-	{
-		CASAPSource *pNewFilter = new CASAPSource(pUnk, phr);
-		if (phr != NULL && pNewFilter == NULL)
-			*phr = E_OUTOFMEMORY;
-		return pNewFilter;
-	}
-};
-
-static const AMOVIESETUP_MEDIATYPE sudPinTypes =
-{
-	&MEDIATYPE_Audio,
-	&MEDIASUBTYPE_PCM
-};
-
-static const AMOVIESETUP_PIN sudASAPSourceStream =
-{
-	L"Output",
-	FALSE,
-	TRUE,
-	FALSE,
-	FALSE,
-	&CLSID_NULL,
-	NULL,
-	1,
-	&sudPinTypes
-};
-
-static const AMOVIESETUP_FILTER sudASAPSource =
-{
-	&CLSID_ASAPSource,
-	SZ_ASAP_SOURCE,
-	MERIT_NORMAL,
-	1,
-	&sudASAPSourceStream
-};
-
-CFactoryTemplate g_Templates[1] =
-{
-	{
-		SZ_ASAP_SOURCE,
-		&CLSID_ASAPSource,
-		CASAPSource::CreateInstance,
-		NULL,
-		&sudASAPSource
-	}
-};
-
-int g_cTemplates = 1;
-
-static void WriteASAPValue(LPCTSTR lpSubKey, LPCTSTR value)
-{
-	HKEY hKey;
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, lpSubKey, 0, KEY_SET_VALUE, &hKey) != ERROR_SUCCESS)
-		return;
-	if (value != NULL)
-		RegSetValueEx(hKey, _T("ASAP"), 0, REG_SZ, (const BYTE *) value, ((DWORD) _tcslen(value) + 1) * sizeof(TCHAR));
-	else
-		RegDeleteValue(hKey, _T("ASAP"));
-	RegCloseKey(hKey);
-}
-
-STDAPI DllRegisterServer()
-{
-	HRESULT hr = AMovieDllRegisterServer2(TRUE);
-	if (FAILED(hr))
-		return hr;
-
-	HKEY hMTKey;
-	HKEY hWMPKey;
-	if (RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("Media Type\\Extensions"), 0, NULL, 0, KEY_WRITE, NULL, &hMTKey, NULL) != ERROR_SUCCESS)
-		return E_FAIL;
-	if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions"), 0, NULL, 0, KEY_WRITE, NULL, &hWMPKey, NULL) != ERROR_SUCCESS)
-		return E_FAIL;
-	for (int i = 0; i < N_EXTS; i++) {
-		HKEY hKey;
-		if (RegCreateKeyEx(hMTKey, extensions[i], 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS
-		 || RegSetValueEx(hKey, _T("Source Filter"), 0, REG_SZ, (const BYTE *) &CLSID_ASAPSource_str, sizeof(CLSID_ASAPSource_str)) != ERROR_SUCCESS
-		 || RegCloseKey(hKey) != ERROR_SUCCESS)
-			 return E_FAIL;
-#ifdef ASAP_DSF_TRANSCODE
-		static const DWORD perms = 15 + 128;
-#else
-		static const DWORD perms = 15;
-#endif
-		static const DWORD runtime = 7;
-		if (RegCreateKeyEx(hWMPKey, extensions[i], 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS
-		 || RegSetValueEx(hKey, _T("Permissions"), 0, REG_DWORD, (const BYTE *) &perms, sizeof(perms)) != ERROR_SUCCESS
-		 || RegSetValueEx(hKey, _T("Runtime"), 0, REG_DWORD, (const BYTE *) &runtime, sizeof(runtime)) != ERROR_SUCCESS
-		 || RegCloseKey(hKey) != ERROR_SUCCESS)
-			 return E_FAIL;
-	}
-	if (RegCloseKey(hWMPKey) != ERROR_SUCCESS || RegCloseKey(hMTKey) != ERROR_SUCCESS)
-		return E_FAIL;
-	WriteASAPValue(_T("Software\\Microsoft\\MediaPlayer\\Player\\Extensions\\MUIDescriptions"), _T("ASAP files (") EXT_FILTER _T(")"));
-	WriteASAPValue(_T("Software\\Microsoft\\MediaPlayer\\Player\\Extensions\\Types"), EXT_FILTER);
-	return S_OK;
-}
-
-STDAPI DllUnregisterServer()
-{
-	HKEY hWMPKey;
-	HKEY hMTKey;
-	WriteASAPValue(_T("Software\\Microsoft\\MediaPlayer\\Player\\Extensions\\MUIDescriptions"), NULL);
-	WriteASAPValue(_T("Software\\Microsoft\\MediaPlayer\\Player\\Extensions\\Types"), NULL);
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions"), 0, DELETE, &hWMPKey) != ERROR_SUCCESS)
-		return E_FAIL;
-	if (RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("Media Type\\Extensions"), 0, DELETE, &hMTKey) != ERROR_SUCCESS)
-		return E_FAIL;
-	for (int i = 0; i < N_EXTS; i++) {
-		RegDeleteKey(hWMPKey, extensions[i]);
-		RegDeleteKey(hMTKey, extensions[i]);
-	}
-	RegCloseKey(hMTKey);
-	RegCloseKey(hWMPKey);
-
-	return AMovieDllRegisterServer2(FALSE);
-}
-
-extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
-
-BOOL APIENTRY DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
-	return DllEntryPoint((HINSTANCE) hInstance, dwReason, lpReserved);
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/dshow/asap_dsf.def kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/dshow/asap_dsf.def
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/dshow/asap_dsf.def	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/dshow/asap_dsf.def	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-EXPORTS
-	DllCanUnloadNow		PRIVATE
-	DllGetClassObject	PRIVATE
-	DllRegisterServer	PRIVATE
-	DllUnregisterServer	PRIVATE
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/foobar2000/foo_asap.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/foobar2000/foo_asap.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/foobar2000/foo_asap.cpp	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/foobar2000/foo_asap.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,550 +0,0 @@
-/*
- * foo_asap.cpp - ASAP plugin for foobar2000
- *
- * Copyright (C) 2006-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <string.h>
-
-#include "foobar2000/SDK/foobar2000.h"
-
-#include "aatr.h"
-#include "asap.h"
-#include "settings_dlg.h"
-
-#define BITS_PER_SAMPLE    16
-#define BUFFERED_BLOCKS    1024
-
-/* Configuration --------------------------------------------------------- */
-
-static const GUID song_length_guid =
-	{ 0x810e12f0, 0xa695, 0x42d2, { 0xab, 0xc0, 0x14, 0x1e, 0xe5, 0xf3, 0xb3, 0xb7 } };
-static cfg_int song_length(song_length_guid, -1);
-
-static const GUID silence_seconds_guid =
-	{ 0x40170cb0, 0xc18c, 0x4f97, { 0xaa, 0x6, 0xdb, 0xe7, 0x45, 0xb0, 0x7e, 0x1d } };
-static cfg_int silence_seconds(silence_seconds_guid, -1);
-
-static const GUID play_loops_guid =
-	{ 0xf08d12f8, 0x58d6, 0x49fc, { 0xae, 0xc5, 0xf4, 0xd0, 0x2f, 0xb2, 0x20, 0xaf } };
-static cfg_bool play_loops(play_loops_guid, false);
-
-static const GUID mute_mask_guid =
-	{ 0x8bd94472, 0x82f1, 0x4e77, { 0x95, 0x78, 0xe9, 0x84, 0x75, 0xad, 0x17, 0x4 } };
-static cfg_int mute_mask(mute_mask_guid, 0);
-
-
-/* Decoding -------------------------------------------------------------- */
-
-class input_asap
-{
-	static input_asap *head;
-	input_asap *prev;
-	input_asap *next;
-	service_ptr_t<file> m_file;
-	char *filename;
-	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAP *asap;
-	abort_callback *p_abort;
-
-	int get_song_duration(int song, bool play)
-	{
-		const ASAPInfo *info = ASAP_GetInfo(asap);
-		int duration = ASAPInfo_GetDuration(info, song);
-		if (duration < 0) {
-			if (play)
-				ASAP_DetectSilence(asap, silence_seconds);
-			return 1000 * song_length;
-		}
-		if (play)
-			ASAP_DetectSilence(asap, 0);
-		if (play_loops && ASAPInfo_GetLoop(info, song))
-			return 1000 * song_length;
-		return duration;
-	}
-
-	static void meta_set(file_info &p_info, const char *p_name, const char *p_value)
-	{
-		if (p_value[0] != '\0')
-			p_info.meta_set(p_name, p_value);
-	}
-
-	static const char *empty_if_null(const char *s)
-	{
-		return s != NULL ? s : "";
-	}
-
-	void write(int data)
-	{
-		BYTE b = (BYTE) data;
-		m_file->write(&b, 1, *p_abort);
-	}
-
-	static void static_write(void *obj, int data)
-	{
-		((input_asap *) obj)->write(data);
-	}
-
-public:
-
-	static void g_set_mute_mask(int mask)
-	{
-		input_asap *p;
-		for (p = head; p != NULL; p = p->next)
-			ASAP_MutePokeyChannels(p->asap, mask);
-	}
-
-	static bool g_is_our_content_type(const char *p_content_type)
-	{
-		return false;
-	}
-
-	static bool g_is_our_path(const char *p_path, const char *p_extension)
-	{
-		return ASAPInfo_IsOurFile(p_path) != 0;
-	}
-
-	input_asap()
-	{
-		if (head != NULL)
-			head->prev = this;
-		prev = NULL;
-		next = head;
-		head = this;
-		filename = NULL;
-		asap = ASAP_New();
-	}
-
-	~input_asap()
-	{
-		ASAP_Delete(asap);
-		free(filename);
-		if (prev != NULL)
-			prev->next = next;
-		if (next != NULL)
-			next->prev = prev;
-		if (head == this)
-			head = next;
-	}
-
-	void open(service_ptr_t<file> p_filehint, const char *p_path, t_input_open_reason p_reason, abort_callback &p_abort)
-	{
-		if (p_reason == input_open_info_write) {
-			int len = strlen(p_path);
-			if (len < 4 || _stricmp(p_path + len - 4, ".sap") != 0)
-				throw exception_io_unsupported_format();
-			filename = strdup(p_path);
-		}
-		if (p_filehint.is_empty())
-			filesystem::g_open(p_filehint, p_path, filesystem::open_mode_read, p_abort);
-		m_file = p_filehint;
-		module_len = m_file->read(module, sizeof(module), p_abort);
-		if (!ASAP_Load(asap, p_path, module, module_len))
-			throw exception_io_unsupported_format();
-	}
-
-	t_uint32 get_subsong_count()
-	{
-		return ASAPInfo_GetSongs(ASAP_GetInfo(asap));
-	}
-
-	t_uint32 get_subsong(t_uint32 p_index)
-	{
-		return p_index;
-	}
-
-	void get_info(t_uint32 p_subsong, file_info &p_info, abort_callback &p_abort)
-	{
-		int duration = get_song_duration(p_subsong, false);
-		if (duration >= 0)
-			p_info.set_length(duration / 1000.0);
-		const ASAPInfo *info = ASAP_GetInfo(asap);
-		p_info.info_set_int("channels", ASAPInfo_GetChannels(info));
-		p_info.info_set_int("subsongs", ASAPInfo_GetSongs(info));
-		meta_set(p_info, "composer", ASAPInfo_GetAuthor(info));
-		meta_set(p_info, "title", ASAPInfo_GetTitle(info));
-		meta_set(p_info, "date", ASAPInfo_GetDate(info));
-	}
-
-	t_filestats get_file_stats(abort_callback &p_abort)
-	{
-		return m_file->get_stats(p_abort);
-	}
-
-	void decode_initialize(t_uint32 p_subsong, unsigned p_flags, abort_callback &p_abort)
-	{
-		int duration = get_song_duration(p_subsong, true);
-		if (!ASAP_PlaySong(asap, p_subsong, duration))
-			throw exception_io_unsupported_format();
-		ASAP_MutePokeyChannels(asap, mute_mask);
-	}
-
-	bool decode_run(audio_chunk &p_chunk, abort_callback &p_abort)
-	{
-		int channels = ASAPInfo_GetChannels(ASAP_GetInfo(asap));
-		int buffered_bytes = BUFFERED_BLOCKS * channels * (BITS_PER_SAMPLE / 8);
-		static BYTE buffer[BUFFERED_BLOCKS * 2 * (BITS_PER_SAMPLE / 8)];
-
-		buffered_bytes = ASAP_Generate(asap, buffer, buffered_bytes,
-			BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-		if (buffered_bytes == 0)
-			return false;
-		p_chunk.set_data_fixedpoint(buffer, buffered_bytes, ASAP_SAMPLE_RATE,
-			channels, BITS_PER_SAMPLE,
-			channels == 2 ? audio_chunk::channel_config_stereo : audio_chunk::channel_config_mono);
-		return true;
-	}
-
-	void decode_seek(double p_seconds, abort_callback &p_abort)
-	{
-		ASAP_Seek(asap, (int) (p_seconds * 1000));
-	}
-
-	bool decode_can_seek()
-	{
-		return true;
-	}
-
-	bool decode_get_dynamic_info(file_info &p_out, double &p_timestamp_delta)
-	{
-		return false;
-	}
-
-	bool decode_get_dynamic_info_track(file_info &p_out, double &p_timestamp_delta)
-	{
-		return false;
-	}
-
-	void decode_on_idle(abort_callback &p_abort)
-	{
-		m_file->on_idle(p_abort);
-	}
-
-	void retag_set_info(t_uint32 p_subsong, const file_info &p_info, abort_callback &p_abort)
-	{
-		ASAPInfo *info = const_cast<ASAPInfo *>(ASAP_GetInfo(asap));
-		ASAPInfo_SetAuthor(info, empty_if_null(p_info.meta_get("composer", 0)));
-		ASAPInfo_SetTitle(info, empty_if_null(p_info.meta_get("title", 0)));
-		ASAPInfo_SetDate(info, empty_if_null(p_info.meta_get("date", 0)));
-	}
-
-	void retag_commit(abort_callback &p_abort)
-	{
-		m_file.release();
-		filesystem::g_open(m_file, filename, filesystem::open_mode_write_new, p_abort);
-		this->p_abort = &p_abort;
-		ByteWriter bw = { this, static_write };
-		if (!ASAPWriter_Write(filename, bw, ASAP_GetInfo(asap), module, module_len, FALSE))
-			throw exception_io_unsupported_format();
-	}
-};
-
-input_asap *input_asap::head = NULL;
-static input_factory_t<input_asap> g_input_asap_factory;
-
-
-/* Configuration --------------------------------------------------------- */
-
-static preferences_page_callback::ptr g_callback;
-
-static INT_PTR CALLBACK settings_dialog_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch (uMsg) {
-	case WM_INITDIALOG:
-		settingsDialogSet(hDlg, song_length, silence_seconds, play_loops, mute_mask);
-		return TRUE;
-	case WM_COMMAND:
-		switch (wParam) {
-		case MAKEWPARAM(IDC_UNLIMITED, BN_CLICKED):
-			enableTimeInput(hDlg, FALSE);
-			g_callback->on_state_changed();
-			return TRUE;
-		case MAKEWPARAM(IDC_LIMITED, BN_CLICKED):
-			enableTimeInput(hDlg, TRUE);
-			setFocusAndSelect(hDlg, IDC_MINUTES);
-			g_callback->on_state_changed();
-			return TRUE;
-		case MAKEWPARAM(IDC_SILENCE, BN_CLICKED):
-		{
-			BOOL enabled = (IsDlgButtonChecked(hDlg, IDC_SILENCE) == BST_CHECKED);
-			EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), enabled);
-			if (enabled)
-				setFocusAndSelect(hDlg, IDC_SILSECONDS);
-			g_callback->on_state_changed();
-			return TRUE;
-		}
-		case MAKEWPARAM(IDC_MINUTES, EN_CHANGE):
-		case MAKEWPARAM(IDC_SECONDS, EN_CHANGE):
-		case MAKEWPARAM(IDC_SILSECONDS, EN_CHANGE):
-		case MAKEWPARAM(IDC_LOOPS, BN_CLICKED):
-		case MAKEWPARAM(IDC_NOLOOPS, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 1, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 2, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 3, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 4, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 5, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 6, BN_CLICKED):
-		case MAKEWPARAM(IDC_MUTE1 + 7, BN_CLICKED):
-			g_callback->on_state_changed();
-			return TRUE;
-		default:
-			break;
-		}
-		break;
-	default:
-		break;
-	}
-	return FALSE;
-}
-
-class preferences_page_instance_asap : public preferences_page_instance
-{
-	HWND m_parent;
-	HWND m_hWnd;
-
-	int get_time_input()
-	{
-		HWND hDlg = m_hWnd;
-		if (IsDlgButtonChecked(hDlg, IDC_UNLIMITED) == BST_CHECKED)
-			return -1;
-		UINT minutes = GetDlgItemInt(hDlg, IDC_MINUTES, NULL, FALSE);
-		UINT seconds = GetDlgItemInt(hDlg, IDC_SECONDS, NULL, FALSE);
-		return (int) (60 * minutes + seconds);
-	}
-
-	int get_silence_input()
-	{
-		HWND hDlg = m_hWnd;
-		if (IsDlgButtonChecked(hDlg, IDC_SILENCE) != BST_CHECKED)
-			return -1;
-		return GetDlgItemInt(hDlg, IDC_SILSECONDS, NULL, FALSE);
-	}
-
-	bool get_loops_input()
-	{
-		return IsDlgButtonChecked(m_hWnd, IDC_LOOPS) == BST_CHECKED;
-	}
-
-	int get_mute_input()
-	{
-		HWND hDlg = m_hWnd;
-		int mask = 0;
-		for (int i = 0; i < 8; i++)
-			if (IsDlgButtonChecked(hDlg, IDC_MUTE1 + i) == BST_CHECKED)
-				mask |= 1 << i;
-		return mask;
-	}
-
-public:
-
-	preferences_page_instance_asap(HWND parent) : m_parent(parent)
-	{
-		m_hWnd = CreateDialog(core_api::get_my_instance(), MAKEINTRESOURCE(IDD_SETTINGS), parent, ::settings_dialog_proc);
-	}
-
-	virtual t_uint32 get_state()
-	{
-		if (song_length != get_time_input()
-		 || silence_seconds != get_silence_input()
-		 || play_loops != get_loops_input())
-			return preferences_state::changed /* | preferences_state::needs_restart_playback */ | preferences_state::resettable;
-		if (mute_mask != get_mute_input())
-			return preferences_state::changed | preferences_state::resettable;
-		return preferences_state::resettable;
-	}
-
-	virtual HWND get_wnd()
-	{
-		return m_hWnd;
-	}
-
-	virtual void apply()
-	{
-		song_length = get_time_input();
-		silence_seconds = get_silence_input();
-		play_loops = get_loops_input();
-		mute_mask = get_mute_input();
-		input_asap::g_set_mute_mask(mute_mask);
-		g_callback->on_state_changed();
-	}
-
-	virtual void reset()
-	{
-		settingsDialogSet(m_hWnd, -1, -1, FALSE, 0);
-		g_callback->on_state_changed();
-	}
-};
-
-class preferences_page_asap : public preferences_page_v3
-{
-public:
-
-	virtual preferences_page_instance::ptr instantiate(HWND parent, preferences_page_callback::ptr callback)
-	{
-		g_callback = callback;
-		return new service_impl_t<preferences_page_instance_asap>(parent);
-	}
-
-	virtual const char *get_name()
-	{
-		return "ASAP";
-	}
-
-	virtual GUID get_guid()
-	{
-		static const GUID a_guid =
-			{ 0xf7c0a763, 0x7c20, 0x4b64, { 0x92, 0xbf, 0x11, 0xe5, 0x5d, 0x8, 0xe5, 0x53 } };
-		return a_guid;
-	}
-
-	virtual GUID get_parent_guid()
-	{
-		return guid_input;
-	}
-
-	virtual bool get_help_url(pfc::string_base &p_out)
-	{
-		p_out = "http://asap.sourceforge.net/";
-		return true;
-	}
-};
-
-static service_factory_single_t<preferences_page_asap> g_preferences_page_asap_factory;
-
-
-/* File types ------------------------------------------------------------ */
-
-static const char * const names_and_masks[][2] = {
-	{ "Slight Atari Player", "*.SAP" },
-	{ "Chaos Music Composer", "*.CMC;*.CM3;*.CMR;*.CMS;*.DMC" },
-	{ "Delta Music Composer", "*.DLT" },
-	{ "Music ProTracker", "*.MPT;*.MPD" },
-	{ "Raster Music Tracker", "*.RMT" },
-	{ "Theta Music Composer 1.x", "*.TMC;*.TM8" },
-	{ "Theta Music Composer 2.x", "*.TM2" },
-	{ "Future Composer", "*.FC" }
-};
-
-#define N_FILE_TYPES (sizeof(names_and_masks) / sizeof(names_and_masks[0]))
-
-class input_file_type_asap : public service_impl_single_t<input_file_type>
-{
-public:
-
-	virtual unsigned get_count()
-	{
-		return N_FILE_TYPES;
-	}
-
-	virtual bool get_name(unsigned idx, pfc::string_base &out)
-	{
-		if (idx < N_FILE_TYPES) {
-			out = ::names_and_masks[idx][0];
-			return true;
-		}
-		return false;
-	}
-
-	virtual bool get_mask(unsigned idx, pfc::string_base &out)
-	{
-		if (idx < N_FILE_TYPES) {
-			out = ::names_and_masks[idx][1];
-			return true;
-		}
-		return false;
-	}
-
-	virtual bool is_associatable(unsigned idx)
-	{
-		return true;
-	}
-};
-
-static service_factory_single_t<input_file_type_asap> g_input_file_type_asap_factory;
-
-/* ATR filesystem -------------------------------------------------------- */
-
-class archive_atr : public archive_impl
-{
-public:
-
-	virtual bool supports_content_types()
-	{
-		return false;
-	}
-
-	virtual const char *get_archive_type()
-	{
-		return "atr";
-	}
-
-	virtual t_filestats get_stats_in_archive(const char *p_archive, const char *p_file, abort_callback &p_abort)
-	{
-		int module_len = AATR_ReadFile(p_archive, p_file, NULL, ASAPInfo_MAX_MODULE_LENGTH);
-		if (module_len < 0)
-			throw exception_io_not_found();
-		t_filestats stats = { module_len, filetimestamp_invalid };
-		return stats;
-	}
-
-	virtual void open_archive(service_ptr_t<file> &p_out, const char *archive, const char *file, abort_callback &p_abort)
-	{
-		BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-		int module_len = AATR_ReadFile(archive, file, module, sizeof(module));
-		if (module_len < 0)
-			throw exception_io_not_found();
-		p_out = new service_impl_t<reader_membuffer_simple>(module, module_len);
-	}
-
-	virtual void archive_list(const char *path, const service_ptr_t<file> &p_reader, archive_callback &p_out, bool p_want_readers)
-	{
-		if (!_extract_native_path_ptr(path))
-			throw exception_io_data();
-		AATR *aatr = pfc::new_ptr_check_t(AATR_New());
-		if (!AATR_Open(aatr, path)) {
-			AATR_Delete(aatr);
-			throw exception_io_data();
-		}
-		pfc::string8_fastalloc url;
-		for (;;) {
-			const char *fn = AATR_NextFile(aatr);
-			if (fn == NULL)
-				break;
-			t_filestats stats = { filesize_invalid, filetimestamp_invalid };
-			service_ptr_t<file> p_file;
-			if (p_want_readers) {
-				BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-				int module_len = AATR_ReadCurrentFile(aatr, module, sizeof(module));
-				p_file = new service_impl_t<reader_membuffer_simple>(module, module_len);
-			}
-			archive_impl::g_make_unpack_path(url, path, fn, "atr");
-			if (!p_out.on_entry(this, url, stats, p_file))
-				break;
-		}
-		AATR_Delete(aatr);
-	}
-};
-
-static archive_factory_t<archive_atr> g_archive_atr_factory;
-
-DECLARE_COMPONENT_VERSION("ASAP", ASAPInfo_VERSION, ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT);
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/gsplayer/gspasap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/gsplayer/gspasap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/gsplayer/gspasap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/gsplayer/gspasap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,290 +0,0 @@
-/*
- * gspasap.c - ASAP plugin for GSPlayer
- *
- * Copyright (C) 2007-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <tchar.h>
-
-#include "mapplugin.h"
-
-#include "asap.h"
-#include "settings_dlg.h"
-
-#define BITS_PER_SAMPLE  16
-
-#define REG_KEY _T("Software\\GreenSoftware\\GSPlayer\\Plug-ins\\gspasap")
-
-static HINSTANCE hInstance;
-
-static BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-static DWORD module_len;
-ASAP *asap;
-
-#ifdef _UNICODE
-
-#define CHAR_TO_TCHAR(dest, src, destChars) \
-	MultiByteToWideChar(CP_ACP, 0, src, -1, dest, destChars)
-static char ansiFilename[MAX_PATH];
-#define ANSI_FILENAME ansiFilename
-#define CONVERT_FILENAME \
-	if (WideCharToMultiByte(CP_ACP, 0, pszFile, -1, ansiFilename, MAX_PATH, NULL, NULL) <= 0) \
-		return FALSE;
-
-#else
-
-#define CHAR_TO_TCHAR(dest, src, destChars) \
-	_tcscpy(dest, src)
-#define ANSI_FILENAME pszFile
-#define CONVERT_FILENAME
-
-#endif
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-	hInstance = hinstDLL;
-	return TRUE;
-}
-
-static void WINAPI asapInit()
-{
-	HKEY hKey;
-	DWORD type;
-	DWORD size;
-	asap = ASAP_New();
-	if (RegOpenKeyEx(HKEY_CURRENT_USER, REG_KEY, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
-		return;
-	size = sizeof(int);
-	RegQueryValueEx(hKey, _T("SongLength"), NULL, &type, (LPBYTE) &song_length, &size);
-	RegQueryValueEx(hKey, _T("SilenceSeconds"), NULL, &type, (LPBYTE) &silence_seconds, &size);
-	RegQueryValueEx(hKey, _T("PlayLoops"), NULL, &type, (LPBYTE) &play_loops, &size);
-	RegQueryValueEx(hKey, _T("MuteMask"), NULL, &type, (LPBYTE) &mute_mask, &size);
-	RegCloseKey(hKey);
-}
-
-static void WINAPI asapQuit()
-{
-	ASAP_Delete(asap);
-}
-
-static DWORD WINAPI asapGetFunc()
-{
-	return PLUGIN_FUNC_DECFILE | PLUGIN_FUNC_SEEKFILE | PLUGIN_FUNC_FILETAG;
-}
-
-static BOOL WINAPI asapGetPluginName(LPTSTR pszName)
-{
-	_tcscpy(pszName, _T("ASAP plug-in"));
-	return TRUE;
-}
-
-static BOOL WINAPI asapSetEqualizer(MAP_PLUGIN_EQ *pEQ)
-{
-	return FALSE;
-}
-
-static void WINAPI asapShowConfigDlg(HWND hwndParent)
-{
-	if (settingsDialog(hInstance, hwndParent)) {
-		HKEY hKey;
-		if (RegCreateKeyEx(HKEY_CURRENT_USER, REG_KEY, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS)
-			return;
-		RegSetValueEx(hKey, _T("SongLength"), 0, REG_DWORD, (LPBYTE) &song_length, sizeof(int));
-		RegSetValueEx(hKey, _T("SilenceSeconds"), 0, REG_DWORD, (LPBYTE) &silence_seconds, sizeof(int));
-		RegSetValueEx(hKey, _T("PlayLoops"), 0, REG_DWORD, (LPBYTE) &play_loops, sizeof(int));
-		RegSetValueEx(hKey, _T("MuteMask"), 0, REG_DWORD, (LPBYTE) &mute_mask, sizeof(int));
-		RegCloseKey(hKey);
-	}
-}
-
-static const char * const exts[] = {
-	"sap", "Slight Atari Player (*.sap)",
-	"cmc", "Chaos Music Composer (*.cmc)",
-	"cm3", "Chaos Music Composer 3/4 (*.cm3)",
-	"cmr", "Chaos Music Composer / Rzog (*.cmr)",
-	"cms", "Stereo Double Chaos Music Composer (*.cms)",
-	"dmc", "DoublePlay Chaos Music Composer (*.dmc)",
-	"dlt", "Delta Music Composer (*.dlt)",
-	"mpt", "Music ProTracker (*.mpt)",
-	"mpd", "Music ProTracker DoublePlay (*.mpd)",
-	"rmt", "Raster Music Tracker (*.rmt)",
-	"tmc", "Theta Music Composer 1.x (*.tmc)",
-	"tm8", "Theta Music Composer 1.x (*.tm8)",
-	"tm2", "Theta Music Composer 2.x (*.tm2)",
-	"fc", "Future Composer (*.fc)"
-};
-#define N_EXTS (sizeof(exts) / sizeof(exts[0]) / 2)
-
-static int WINAPI asapGetFileExtCount()
-{
-	return N_EXTS;
-}
-
-static BOOL WINAPI asapGetFileExt(int nIndex, LPTSTR pszExt, LPTSTR pszExtDesc)
-{
-	if (nIndex >= N_EXTS)
-		return FALSE;
-	CHAR_TO_TCHAR(pszExt, exts[nIndex * 2], MAX_PATH);
-	CHAR_TO_TCHAR(pszExtDesc, exts[nIndex * 2 + 1], MAX_PATH);
-	return TRUE;
-}
-
-static BOOL WINAPI asapIsValidFile(LPCTSTR pszFile)
-{
-	CONVERT_FILENAME;
-	return ASAPInfo_IsOurFile(ANSI_FILENAME);
-}
-
-static BOOL loadFile(LPCTSTR pszFile)
-{
-	HANDLE fh;
-	CONVERT_FILENAME;
-	if (!ASAPInfo_IsOurFile(ANSI_FILENAME))
-		return FALSE;
-	fh = CreateFile(pszFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (fh == INVALID_HANDLE_VALUE)
-		return FALSE;
-	if (!ReadFile(fh, module, sizeof(module), &module_len, NULL)) {
-		CloseHandle(fh);
-		return FALSE;
-	}
-	CloseHandle(fh);
-	return TRUE;
-}
-
-static BOOL WINAPI asapOpenFile(LPCTSTR pszFile, MAP_PLUGIN_FILE_INFO *pInfo)
-{
-	const ASAPInfo *info = ASAP_GetInfo(asap);
-	CONVERT_FILENAME;
-	if (!loadFile(pszFile))
-		return FALSE;
-	if (!ASAP_Load(asap, ANSI_FILENAME, module, module_len))
-		return FALSE;
-	pInfo->nChannels = ASAPInfo_GetChannels(info);
-	pInfo->nSampleRate = ASAP_SAMPLE_RATE;
-	pInfo->nBitsPerSample = BITS_PER_SAMPLE;
-	pInfo->nAvgBitrate = 8;
-	pInfo->nDuration = getSongDuration(info, ASAPInfo_GetDefaultSong(info));
-	return TRUE;
-}
-
-static long WINAPI asapSeekFile(long lTime)
-{
-	ASAP_Seek(asap, (int) lTime);
-	return lTime;
-}
-
-static BOOL WINAPI asapStartDecodeFile()
-{
-	playSong(ASAPInfo_GetDefaultSong(ASAP_GetInfo(asap)));
-	return TRUE;
-}
-
-static int WINAPI asapDecodeFile(WAVEHDR *pHdr)
-{
-	int len = ASAP_Generate(asap, (PBYTE) pHdr->lpData, pHdr->dwBufferLength, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-	pHdr->dwBytesRecorded = len;
-	return len < (int) pHdr->dwBufferLength ? PLUGIN_RET_EOF : PLUGIN_RET_SUCCESS;
-}
-
-static void WINAPI asapStopDecodeFile()
-{
-}
-
-static void WINAPI asapCloseFile()
-{
-}
-
-static void getTag(const ASAPInfo *info, MAP_PLUGIN_FILETAG *pTag)
-{
-	ZeroMemory(pTag, sizeof(MAP_PLUGIN_FILETAG));
-	CHAR_TO_TCHAR(pTag->szTrack, ASAPInfo_GetTitle(info), MAX_PLUGIN_TAG_STR);
-	CHAR_TO_TCHAR(pTag->szArtist, ASAPInfo_GetAuthor(info), MAX_PLUGIN_TAG_STR);
-}
-
-static BOOL WINAPI asapGetTag(MAP_PLUGIN_FILETAG *pTag)
-{
-	getTag(ASAP_GetInfo(asap), pTag);
-	return TRUE;
-}
-
-static BOOL WINAPI asapGetFileTag(LPCTSTR pszFile, MAP_PLUGIN_FILETAG *pTag)
-{
-	ASAPInfo *info;
-	CONVERT_FILENAME;
-	if (!loadFile(pszFile))
-		return FALSE;
-	info = ASAPInfo_New();
-	if (info == NULL)
-		return FALSE;
-	if (!ASAPInfo_Load(info, ANSI_FILENAME, module, module_len)) {
-		ASAPInfo_Delete(info);
-		return FALSE;
-	}
-	getTag(info, pTag);
-	ASAPInfo_Delete(info);
-	return TRUE;
-}
-
-static BOOL WINAPI asapOpenStreaming(LPBYTE pbBuf, DWORD cbBuf, MAP_PLUGIN_STREMING_INFO *pInfo)
-{
-	return FALSE;
-}
-
-static int WINAPI asapDecodeStreaming(LPBYTE pbInBuf, DWORD cbInBuf, DWORD *pcbInUsed, WAVEHDR *pHdr)
-{
-	return PLUGIN_RET_ERROR;
-}
-
-static void WINAPI asapCloseStreaming()
-{
-}
-
-static MAP_DEC_PLUGIN plugin = {
-	PLUGIN_DEC_VER,
-	sizeof(TCHAR),
-	0,
-	asapInit,
-	asapQuit,
-	asapGetFunc,
-	asapGetPluginName,
-	asapSetEqualizer,
-	asapShowConfigDlg,
-	asapGetFileExtCount,
-	asapGetFileExt,
-	asapIsValidFile,
-	asapOpenFile,
-	asapSeekFile,
-	asapStartDecodeFile,
-	asapDecodeFile,
-	asapStopDecodeFile,
-	asapCloseFile,
-	asapGetTag,
-	asapGetFileTag,
-	asapOpenStreaming,
-	asapDecodeStreaming,
-	asapCloseStreaming
-};
-
-__declspec(dllexport) MAP_DEC_PLUGIN * WINAPI mapGetDecoder()
-{
-	return &plugin;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/gsplayer/mapplugin.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/gsplayer/mapplugin.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/gsplayer/mapplugin.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/gsplayer/mapplugin.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- *  GSPlayer - The audio player for WindowsCE
- *  Copyright (C) 2003-2005  Y.Nagamidori
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-// Simply Decoder Plug-in
-#ifndef __MAPPLUGIN_H__
-#define __MAPPLUGIN_H__
-
-typedef struct _MAP_PLUGIN_EQ {
-	BOOL bEnable;	
-	int nPreamp;	// 0 - 64 (center: 31)
-	int nEq[10];	// 0 - 64 (center: 31)
-} MAP_PLUGIN_EQ;
-
-typedef struct _MAP_PLUGIN_FILE_INFO {
-	int		nChannels;
-	int		nSampleRate;
-	int		nBitsPerSample;
-	int		nAvgBitrate;	// kbps
-	int		nDuration;		// ms
-} MAP_PLUGIN_FILE_INFO;
-
-typedef struct _MAP_PLUGIN_STREMING_INFO
-{
-	int		nChannels;
-	int		nSampleRate;
-	int		nBitsPerSample;
-	int		nAvgBitrate;	// kbps
-} MAP_PLUGIN_STREMING_INFO;
-
-#define MAX_PLUGIN_TAG_STR		255
-typedef struct _MAP_PLUGIN_FILETAG
-{
-	TCHAR szTrack[MAX_PLUGIN_TAG_STR];
-	TCHAR szArtist[MAX_PLUGIN_TAG_STR];
-	TCHAR szAlbum[MAX_PLUGIN_TAG_STR];
-	TCHAR szComment[MAX_PLUGIN_TAG_STR];
-	TCHAR szGenre[MAX_PLUGIN_TAG_STR];
-	int nYear;
-	int nTrackNum;
-} MAP_PLUGIN_FILETAG;
-
-#define PLUGIN_RET_ERROR	-1
-#define PLUGIN_RET_SUCCESS	0
-#define PLUGIN_RET_EOF		1
-#define PLUGIN_DEC_VER		0x00000101
-
-#define PLUGIN_FUNC_DECFILE				0x00000001
-#define PLUGIN_FUNC_DECSTREAMING		0x00000002
-#define PLUGIN_FUNC_EQ					0x00000004
-#define PLUGIN_FUNC_SEEKFILE			0x00000008
-#define PLUGIN_FUNC_FILETAG				0x00000010
-
-typedef struct _MAP_DEC_PLUGIN {
-	DWORD	dwVersion;	// PLUGIN_DEC_VER
-	DWORD	dwChar;		// sizeof(TCHAR)
-	DWORD	dwUser; // for Plug-in author
-	void (WINAPI *Init)();
-	void (WINAPI *Quit)();
-	DWORD (WINAPI *GetFunc)();
-	BOOL (WINAPI *GetPluginName)(LPTSTR pszName); // MAX_PATH
-	BOOL (WINAPI *SetEqualizer)(MAP_PLUGIN_EQ* pEQ);
-	void (WINAPI *ShowConfigDlg)(HWND hwndParent);
-
-	// for file
-	BOOL (WINAPI *GetFileExtCount)();		
-	BOOL (WINAPI *GetFileExt)(int nIndex, LPTSTR pszExt, LPTSTR pszExtDesc); // MAX_PATH
-	BOOL (WINAPI *IsValidFile)(LPCTSTR pszFile);
-	BOOL (WINAPI *OpenFile)(LPCTSTR pszFile, MAP_PLUGIN_FILE_INFO* pInfo);
-	long (WINAPI *SeekFile)(long lTime); // ms
-	BOOL (WINAPI *StartDecodeFile)();
-	int  (WINAPI *DecodeFile)(WAVEHDR* pHdr);
-	void (WINAPI *StopDecodeFile)();
-	void (WINAPI *CloseFile)();
-	BOOL (WINAPI *GetTag)(MAP_PLUGIN_FILETAG* pTag);
-	BOOL (WINAPI *GetFileTag)(LPCTSTR pszFile, MAP_PLUGIN_FILETAG* pTag);
-
-	// for streaming
-	BOOL (WINAPI *OpenStreaming)(LPBYTE pbBuf, DWORD cbBuf, MAP_PLUGIN_STREMING_INFO* pInfo);
-	int (WINAPI *DecodeStreaming)(LPBYTE pbInBuf, DWORD cbInBuf, DWORD* pcbInUsed, WAVEHDR* pHdr);
-	void (WINAPI *CloseStreaming)();
-
-} MAP_DEC_PLUGIN;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif 
-
-__declspec(dllexport) MAP_DEC_PLUGIN* WINAPI mapGetDecoder();
-
-#ifdef __cplusplus
-};
-#endif 
-
-#endif // __MAPPLUGIN_H__
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/gui.rc kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/gui.rc
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/gui.rc	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/gui.rc	1970-01-01 00:00:00.000000000 +0000
@@ -1,299 +0,0 @@
-/*
- * gui.rc - Windows resources
- *
- * Copyright (C) 2005-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if defined(WASAP) || defined(WINAMP) || defined(FOOBAR2000) || defined(GSPLAYER) || defined(APOLLO) || defined(XMPLAY)
-#include <windows.h>
-#define IDC_STATIC  -1
-#endif
-
-#include "../asap.h"
-
-#ifdef WASAP
-
-#include "wasap/wasap.h"
-
-#define FILE_DESCRIPTION "WASAP - Windows Another Slight Atari Player"
-#define INTERNAL_NAME "wasap"
-#define ORIGINAL_FILENAME "wasap.exe"
-#define FILE_TYPE 1
-
-IDI_APP ICON "wasap/wasap.ico"
-IDI_STOP ICON "wasap/stop.ico"
-IDI_PLAY ICON "wasap/play.ico"
-
-IDR_TRAYMENU MENU
-{
-	POPUP "WASAP"
-	{
-		MENUITEM "&Open...", IDM_OPEN
-		POPUP "So&ng", GRAYED
-		{
-			MENUITEM "&1", IDM_SONG1
-		}
-		MENUITEM "&Stop", IDM_STOP, GRAYED
-#ifndef _UNICODE /* TODO */
-		MENUITEM "File &information...", IDM_FILE_INFO, GRAYED
-#endif
-#ifndef _WIN32_WCE /* disabled just because of limited computing power */
-		MENUITEM "Save as &WAV...", IDM_SAVE_WAV, GRAYED
-#endif
-		MENUITEM "&About WASAP...", IDM_ABOUT
-		MENUITEM "&Exit", IDM_EXIT
-	}
-}
-
-#ifndef _WIN32_WCE
-#ifdef _WIN64
-#define PROCESSOR_ARCHITECTURE  "amd64"
-#else
-#define PROCESSOR_ARCHITECTURE  "X86"
-#endif
-1 24
-{
-	"<?xml version=""1.0""?>"
-	"<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">"
-	"<assemblyIdentity version=""" ASAPInfo_VERSION ".0"" "
-		"processorArchitecture=""" PROCESSOR_ARCHITECTURE """ name=""WASAP"" type=""win32"" />"
-	"<dependency><dependentAssembly>"
-	"<assemblyIdentity type=""win32"" name=""Microsoft.Windows.Common-Controls"" "
-		"version=""6.0.0.0"" processorArchitecture=""" PROCESSOR_ARCHITECTURE """ publicKeyToken=""6595b64144ccf1df"" language=""*"" />"
-	"</dependentAssembly></dependency>"
-	"</assembly>"
-}
-#endif
-
-#endif /* WASAP */
-
-#if defined(WINAMP)
-#  define APP_NAME "Winamp"
-#  define INTERNAL_NAME "in_asap"
-#elif defined(FOOBAR2000)
-#  define APP_NAME "foobar2000"
-#  define INTERNAL_NAME "foo_asap"
-#elif defined(GSPLAYER)
-#  define APP_NAME "GSPlayer"
-#  define INTERNAL_NAME "gspasap"
-#elif defined(DSHOW)
-#  define INTERNAL_NAME "asap_dsf"
-#  define FILE_DESCRIPTION "ASAP DirectShow source filter"
-#elif defined(APOLLO)
-#  define APP_NAME "Apollo"
-#  define INTERNAL_NAME "ASAP_Apollo"
-#elif defined(XBMC)
-#  define APP_NAME "XBMC"
-#  define INTERNAL_NAME "xbmc_asap"
-#elif defined(XMPLAY)
-#  define APP_NAME "XMPlay"
-#  define INTERNAL_NAME "xmp-asap"
-#elif defined(BASS)
-#  define INTERNAL_NAME "bass_asap"
-#  define FILE_DESCRIPTION "ASAP add-on for BASS"
-#elif defined(APOKEYSND)
-#  define INTERNAL_NAME "apokeysnd"
-#  define FILE_DESCRIPTION "Another POKEY sound emulator"
-#elif defined(SHELLEX)
-#  define INTERNAL_NAME "ASAPShellEx"
-#  define FILE_DESCRIPTION "ASAP Windows Explorer extension"
-#elif defined(AUDACIOUS)
-#  define APP_NAME "Audacious"
-#  define INTERNAL_NAME "asapplug"
-#elif defined(VLC)
-#  define APP_NAME "VLC"
-#  define INTERNAL_NAME "libasap_plugin"
-#endif
-
-#ifndef FILE_DESCRIPTION
-#  define FILE_DESCRIPTION "ASAP " APP_NAME " plugin"
-#endif
-#ifndef ORIGINAL_FILENAME
-#  define ORIGINAL_FILENAME INTERNAL_NAME ".dll"
-#  define FILE_TYPE 2
-#endif
-
-#if defined(WINAMP) || defined(FOOBAR2000) || defined(GSPLAYER) || defined(APOLLO) || defined(XMPLAY)
-
-#include "settings_dlg.h"
-
-#ifndef _WIN32_WCE
-IDD_SETTINGS DIALOG 0, 0, 184, 216
-#else
-IDD_SETTINGS DIALOG 0, 0, 268, 142
-#endif
-#ifdef FOOBAR2000
-STYLE WS_CHILD
-#else
-#  ifdef _WIN32_WCE
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUP
-#  else
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW
-#  endif
-CAPTION "ASAP Settings"
-#endif
-FONT 8, "MS Sans Serif"
-{
-	AUTORADIOBUTTON "Play endlessly", IDC_UNLIMITED, 16, 16, 152, 12, BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP
-	AUTORADIOBUTTON "Finish after", IDC_LIMITED, 16, 30, 48, 12
-	EDITTEXT IDC_MINUTES, 68, 30, 16, 12, ES_NUMBER | ES_RIGHT | WS_BORDER | WS_TABSTOP
-	LTEXT "m", IDC_STATIC, 88, 32, 10, 12
-	EDITTEXT IDC_SECONDS, 100, 30, 16, 12, ES_NUMBER | ES_RIGHT | WS_BORDER | WS_TABSTOP
-	LTEXT "s", IDC_STATIC, 120, 32, 10, 12
-	AUTOCHECKBOX "Finish after", IDC_SILENCE, 16, 48, 48, 12
-	EDITTEXT IDC_SILSECONDS, 68, 48, 16, 12, ES_NUMBER | ES_RIGHT | WS_BORDER | WS_TABSTOP
-	LTEXT "seconds of silence", IDC_STATIC, 88, 50, 64, 12
-	AUTORADIOBUTTON "Play as above", IDC_LOOPS, 16, 84, 152, 12, BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP
-	AUTORADIOBUTTON "Play just once", IDC_NOLOOPS, 16, 98, 152, 12
-#ifndef _WIN32_WCE
-	AUTOCHECKBOX "Channel 1", IDC_MUTE1, 24, 132, 48, 12
-	AUTOCHECKBOX "Channel 2", IDC_MUTE1 + 1, 24, 144, 48, 12
-	AUTOCHECKBOX "Channel 3", IDC_MUTE1 + 2, 24, 156, 48, 12
-	AUTOCHECKBOX "Channel 4", IDC_MUTE1 + 3, 24, 168, 48, 12
-	AUTOCHECKBOX "Channel 1", IDC_MUTE1 + 4, 112, 132, 48, 12
-	AUTOCHECKBOX "Channel 2", IDC_MUTE1 + 5, 112, 144, 48, 12
-	AUTOCHECKBOX "Channel 3", IDC_MUTE1 + 6, 112, 156, 48, 12
-	AUTOCHECKBOX "Channel 4", IDC_MUTE1 + 7, 112, 168, 48, 12
-	GROUPBOX "Unknown song length", IDC_STATIC, 8, 4, 168, 64
-	GROUPBOX "Loops", IDC_STATIC, 8, 72, 168, 46
-	GROUPBOX "Mute base POKEY", IDC_STATIC, 8, 122, 80, 64
-	GROUPBOX "Mute extra POKEY", IDC_STATIC, 96, 122, 80, 64
-#  ifndef FOOBAR2000
-	DEFPUSHBUTTON "OK", IDOK, 38, 194, 50, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 96, 194, 50, 14
-#  endif
-#else
-	AUTOCHECKBOX "Channel 1", IDC_MUTE1, 196, 14, 48, 12
-	AUTOCHECKBOX "Channel 2", IDC_MUTE1 + 1, 196, 26, 48, 12
-	AUTOCHECKBOX "Channel 3", IDC_MUTE1 + 2, 196, 38, 48, 12
-	AUTOCHECKBOX "Channel 4", IDC_MUTE1 + 3, 196, 50, 48, 12
-	AUTOCHECKBOX "Channel 1", IDC_MUTE1 + 4, 196, 82, 48, 12
-	AUTOCHECKBOX "Channel 2", IDC_MUTE1 + 5, 196, 94, 48, 12
-	AUTOCHECKBOX "Channel 3", IDC_MUTE1 + 6, 196, 106, 48, 12
-	AUTOCHECKBOX "Channel 4", IDC_MUTE1 + 7, 196, 118, 48, 12
-	GROUPBOX "Unknown song length", IDC_STATIC, 8, 4, 168, 64
-	GROUPBOX "Loops", IDC_STATIC, 8, 72, 168, 46
-	GROUPBOX "Mute base POKEY", IDC_STATIC, 180, 4, 80, 64
-	GROUPBOX "Mute extra POKEY", IDC_STATIC, 180, 72, 80, 64
-	DEFPUSHBUTTON "OK", IDOK, 38, 122, 50, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 96, 122, 50, 14
-#endif
-}
-
-#endif /* defined(WINAMP) || defined(FOOBAR2000) || defined(GSPLAYER) || defined(APOLLO) || defined(XMPLAY) */
-
-#if defined(WASAP) || defined(WINAMP) || defined(APOLLO) || defined(XMPLAY)
-
-#include "info_dlg.h"
-
-#ifndef _UNICODE /* TODO */
-
-#define INFO_W  270
-#if defined(WINAMP) || defined(XMPLAY)
-#define INFO_Y  18
-#else
-#define INFO_Y  0
-#endif
-IDD_INFO DIALOG 0, 0, 54 + INFO_W, 214 + INFO_Y
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE
-CAPTION "File information"
-FONT 8, "MS Sans Serif"
-{
-#if defined(WINAMP) || defined(XMPLAY)
-	AUTOCHECKBOX "Show information about the currently &playing file", IDC_PLAYING, 46, 8, 284, 12
-#endif
-	RTEXT "&Filename:", IDC_STATIC, 8, 10 + INFO_Y, 32, 12
-	EDITTEXT IDC_FILENAME, 46, 8 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP
-	RTEXT "&Author:", IDC_STATIC, 8, 24 + INFO_Y, 32, 12
-	EDITTEXT IDC_AUTHOR, 46, 22 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
-	RTEXT "&Name:", IDC_STATIC, 8, 38 + INFO_Y, 32, 12
-	EDITTEXT IDC_NAME, 46, 36 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
-	RTEXT "&Date:", IDC_STATIC, 8, 52 + INFO_Y, 32, 12
-	EDITTEXT IDC_DATE, 46, 50 + INFO_Y, INFO_W - 56, 12, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
-	PUSHBUTTON "Pick date", IDC_PICKDATE, INFO_W - 4, 49 + INFO_Y, 50, 14
-	RTEXT "S&ong:", IDC_STATIC, 8, 66 + INFO_Y, 32, 12
-	COMBOBOX IDC_SONGNO, 46, 64 + INFO_Y, 26, 12, CBS_DROPDOWNLIST | WS_TABSTOP
-	RTEXT "&Time:", IDC_STATIC, 80, 66 + INFO_Y, 20, 12
-	EDITTEXT IDC_TIME, 108, 64 + INFO_Y, 40, 12
-	AUTOCHECKBOX "&Loop", IDC_LOOP, 156, 64 + INFO_Y, 40, 12
-	RTEXT "Technical:", IDC_STATIC, 8, 82 + INFO_Y, 32, 12
-	EDITTEXT IDC_TECHINFO, 46, 82 + INFO_Y, INFO_W, 48, ES_LEFT | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY | WS_BORDER | WS_TABSTOP | WS_VSCROLL
-	RTEXT "STIL file:", IDC_STATIC, 8, 132 + INFO_Y, 32, 12
-	EDITTEXT IDC_STILFILE, 46, 132 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP
-	RTEXT "STIL info:", IDC_STATIC, 8, 144 + INFO_Y, 32, 12
-	EDITTEXT IDC_STILINFO, 46, 144 + INFO_Y, INFO_W, 48, ES_LEFT | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY | WS_BORDER | WS_TABSTOP | WS_VSCROLL
-	DEFPUSHBUTTON "&Save", IDC_SAVE, INFO_W - 140, 194 + INFO_Y, 50, 14
-	PUSHBUTTON "Save as...", IDC_SAVEAS, INFO_W - 82, 194 + INFO_Y, 70, 14
-	PUSHBUTTON "Close", IDCANCEL, INFO_W - 4, 194 + INFO_Y, 50, 14
-}
-
-#endif /* _UNICODE */
-
-#endif /* defined(WASAP) || defined(WINAMP) || defined(APOLLO) || defined(XMPLAY) */
-
-#if defined(WASAP) || defined(WINAMP)
-#ifndef _WIN32_WCE /* disabled just because of limited computing power */
-
-#include <commctrl.h>
-
-IDD_PROGRESS DIALOG 0, 0, 160, 48
-STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_VISIBLE
-CAPTION "Please wait"
-FONT 8, "MS Sans Serif"
-{
-#ifdef WASAP
-	CTEXT "Writing WAV file", IDC_STATIC, 8, 8, 144, 12
-#else
-	CTEXT "Adding subsongs to the playlist", IDC_STATIC, 8, 8, 144, 12
-#endif
-	CONTROL "", IDC_PROGRESS, PROGRESS_CLASS, 0, 8, 24, 144, 12
-}
-
-#endif /* _WIN32_WCE */
-#endif /* defined(WASAP) || defined(WINAMP) */
-
-1 VERSIONINFO
-	FILEVERSION ASAPInfo_VERSION_MAJOR, ASAPInfo_VERSION_MINOR, ASAPInfo_VERSION_MICRO, 0
-	PRODUCTVERSION ASAPInfo_VERSION_MAJOR, ASAPInfo_VERSION_MINOR, ASAPInfo_VERSION_MICRO, 0
-	FILEFLAGSMASK 0x3fL
-	FILEFLAGS 0x0L
-	FILEOS 0x40004L
-	FILETYPE FILE_TYPE
-	FILESUBTYPE 0x0L
-{
-	BLOCK "StringFileInfo"
-	{
-		BLOCK "040904b0"
-		{
-			VALUE "CompanyName", "Piotr Fusik\0"
-			VALUE "FileDescription", FILE_DESCRIPTION "\0"
-			VALUE "FileVersion", ASAPInfo_VERSION "\0"
-			VALUE "InternalName", INTERNAL_NAME "\0"
-			VALUE "LegalCopyright", "Copyleft " ASAPInfo_YEARS "\0"
-			VALUE "OriginalFilename", ORIGINAL_FILENAME "\0"
-			VALUE "ProductName", "ASAP\0"
-			VALUE "ProductVersion", ASAPInfo_VERSION "\0"
-		}
-	}
-	BLOCK "VarFileInfo"
-	{
-		VALUE "Translation", 0x409, 1200
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/info_dlg.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/info_dlg.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/info_dlg.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/info_dlg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,739 +0,0 @@
-/*
- * info_dlg.c - file information dialog box
- *
- * Copyright (C) 2007-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <tchar.h>
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x400
-#endif
-#include <commctrl.h>
-
-#ifndef MCM_SETCURRENTVIEW
-/* missing in MinGW */
-#define MCMV_MONTH      0
-#define MCMV_YEAR       1
-#define MCMV_DECADE     2
-#define MCM_SETCURRENTVIEW 0x1020
-#define MonthCal_SetCurrentView(hmc, dwNewView)  (BOOL) SNDMSG(hmc, MCM_SETCURRENTVIEW, 0, (LPARAM)(dwNewView))
-#endif
-
-#include "asap.h"
-#include "astil.h"
-#include "info_dlg.h"
-#ifdef WINAMP
-#include "aatr.h"
-#endif
-
-void combineFilenameExt(LPTSTR dest, LPCTSTR filename, LPCTSTR ext)
-{
-	int filenameChars = _tcsrchr(filename, '.') + 1 - filename;
-	memcpy(dest, filename, filenameChars * sizeof(_TCHAR));
-	_tcscpy(dest + filenameChars, ext);
-}
-
-#ifdef WINAMP
-LPCTSTR atrFilenameHash(LPCTSTR filename)
-{
-	for ( ; *filename != '\0'; filename++) {
-		if (_tcsnicmp(filename, _T(".atr#"), 5) == 0)
-			return filename + 4;
-	}
-	return NULL;
-}
-#endif
-
-BOOL loadModule(LPCTSTR filename, BYTE *module, int *module_len)
-{
-	HANDLE fh;
-	BOOL ok;
-#ifdef WINAMP
-	LPCTSTR hash = atrFilenameHash(filename);
-	if (hash != NULL && hash < filename + MAX_PATH) {
-		_TCHAR atr_filename[MAX_PATH];
-		memcpy(atr_filename, filename, (hash - filename) * sizeof(_TCHAR));
-		atr_filename[hash - filename] = '\0';
-		*module_len = AATR_ReadFile(atr_filename, hash + 1, module, ASAPInfo_MAX_MODULE_LENGTH);
-		return *module_len >= 0;
-	}
-#endif
-	fh = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (fh == INVALID_HANDLE_VALUE)
-		return FALSE;
-	ok = ReadFile(fh, module, ASAPInfo_MAX_MODULE_LENGTH, (LPDWORD) module_len, NULL);
-	CloseHandle(fh);
-	return ok;
-}
-
-HWND infoDialog = NULL;
-
-#ifndef _UNICODE /* TODO */
-
-static _TCHAR playing_filename[MAX_PATH];
-static int playing_song = 0;
-BOOL playing_info = FALSE;
-static byte saved_module[ASAPInfo_MAX_MODULE_LENGTH];
-static int saved_module_len;
-static ASAPInfo *edited_info = NULL;
-static int edited_song;
-static _TCHAR saved_author[ASAPInfo_MAX_TEXT_LENGTH + 1];
-static _TCHAR saved_title[ASAPInfo_MAX_TEXT_LENGTH + 1];
-static _TCHAR saved_date[ASAPInfo_MAX_TEXT_LENGTH + 1];
-static int saved_durations[ASAPInfo_MAX_SONGS];
-static cibool saved_loops[ASAPInfo_MAX_SONGS];
-static BOOL can_save;
-static int invalid_fields;
-#define INVALID_FIELD_AUTHOR      1
-#define INVALID_FIELD_NAME        2
-#define INVALID_FIELD_DATE        4
-#define INVALID_FIELD_TIME        8
-#define INVALID_FIELD_TIME_SHOW  16
-static HWND monthcal = NULL;
-static WNDPROC monthcalOriginalWndProc;
-static ASTIL *astil = NULL;
-
-static char *appendStilString(char *p, const char *s)
-{
-	for (;;) {
-		char c = *s++;
-		switch (c) {
-		case '\0':
-			return p;
-		case '\n':
-			c = ' ';
-			break;
-		default:
-			break;
-		}
-		*p++ = c;
-	}
-}
-
-static char *appendStil(char *p, const char *prefix, const char *value)
-{
-	if (value[0] != '\0') {
-		p = appendStilString(p, prefix);
-		p = appendStilString(p, value);
-		*p++ = '\r';
-		*p++ = '\n';
-	}
-	return p;
-}
-
-static char *appendAddress(char *p, const char *format, int value)
-{
-	if (value >= 0)
-		p += sprintf(p, format, value);
-	return p;
-}
-
-static void chomp(char *s)
-{
-	size_t i = strlen(s);
-	if (i >= 2 && s[i - 2] == '\r' && s[i - 1] == '\n')
-		s[i - 2] = '\0';
-}
-
-static void updateTech(void)
-{
-	char buf[16000];
-	char *p = buf;
-	const char *ext;
-	int type;
-	int i;
-	ext = ASAPInfo_GetOriginalModuleExt(edited_info, saved_module, saved_module_len);
-	if (ext != NULL)
-		p += sprintf(p, "Composed in %s\r\n", ASAPInfo_GetExtDescription(ext));
-	i = ASAPInfo_GetSongs(edited_info);
-	if (i > 1) {
-		p += sprintf(p, "SONGS %d\r\n", i);
-		i = ASAPInfo_GetDefaultSong(edited_info);
-		if (i > 0)
-			p += sprintf(p, "DEFSONG %d (song %d)\r\n", i, i + 1);
-	}
-	p += sprintf(p, ASAPInfo_GetChannels(edited_info) > 1 ? "STEREO\r\n" : "MONO\r\n");
-	p += sprintf(p, ASAPInfo_IsNtsc(edited_info) ? "NTSC\r\n" : "PAL\r\n");
-	type = ASAPInfo_GetTypeLetter(edited_info);
-	if (type != 0)
-		p += sprintf(p, "TYPE %c\r\n", type);
-	p += sprintf(p, "FASTPLAY %d (%d Hz)\r\n", ASAPInfo_GetPlayerRateScanlines(edited_info), ASAPInfo_GetPlayerRateHz(edited_info));
-	if (type == 'C')
-		p += sprintf(p, "MUSIC %04X\r\n", ASAPInfo_GetMusicAddress(edited_info));
-	if (type != 0) {
-		p = appendAddress(p, "INIT %04X\r\n", ASAPInfo_GetInitAddress(edited_info));
-		p = appendAddress(p, "PLAYER %04X\r\n", ASAPInfo_GetPlayerAddress(edited_info));
-		p = appendAddress(p, "COVOX %04X\r\n", ASAPInfo_GetCovoxAddress(edited_info));
-	}
-	i = ASAPInfo_GetSapHeaderLength(edited_info);
-	if (i >= 0) {
-		while (p < buf + sizeof(buf) - 17 && i + 4 < saved_module_len) {
-			int start = saved_module[i] + (saved_module[i + 1] << 8);
-			int end;
-			if (start == 0xffff) {
-				i += 2;
-				start = saved_module[i] + (saved_module[i + 1] << 8);
-			}
-			end = saved_module[i + 2] + (saved_module[i + 3] << 8);
-			p += sprintf(p, "LOAD %04X-%04X\r\n", start, end);
-			i += 5 + end - start;
-		}
-	}
-	chomp(buf);
-	SendDlgItemMessage(infoDialog, IDC_TECHINFO, WM_SETTEXT, 0, (LPARAM) buf);
-}
-
-static void updateStil(void)
-{
-	char buf[16000];
-	char *p = buf;
-	int i;
-	p = appendStil(p, "", ASTIL_GetTitle(astil));
-	p = appendStil(p, "by ", ASTIL_GetAuthor(astil));
-	p = appendStil(p, "Directory comment: ", ASTIL_GetDirectoryComment(astil));
-	p = appendStil(p, "File comment: ", ASTIL_GetFileComment(astil));
-	p = appendStil(p, "Song comment: ", ASTIL_GetSongComment(astil));
-	for (i = 0; ; i++) {
-		const ASTILCover *cover = ASTIL_GetCover(astil, i);
-		int startSeconds;
-		const char *s;
-		if (cover == NULL)
-			break;
-		startSeconds = ASTILCover_GetStartSeconds(cover);
-		if (startSeconds >= 0) {
-			int endSeconds = ASTILCover_GetEndSeconds(cover);
-			if (endSeconds >= 0)
-				p += sprintf(p, "At %d:%02d-%d:%02d c", startSeconds / 60, startSeconds % 60, endSeconds / 60, endSeconds % 60);
-			else
-				p += sprintf(p, "At %d:%02d c", startSeconds / 60, startSeconds % 60);
-		}
-		else
-			*p++ = 'C';
-		s = ASTILCover_GetTitleAndSource(cover);
-		p = appendStil(p, "overs: ", s[0] != '\0' ? s : "<?>");
-		p = appendStil(p, "by ", ASTILCover_GetArtist(cover));
-		p = appendStil(p, "Comment: ", ASTILCover_GetComment(cover));
-	}
-	*p = '\0';
-	chomp(buf);
-#if 1
-	/* not compatible with Windows 9x */
-	if (ASTIL_IsUTF8(astil)) {
-		WCHAR wBuf[16000];
-		if (MultiByteToWideChar(CP_UTF8, 0, buf, -1, wBuf, 16000) > 0) {
-			SendDlgItemMessageW(infoDialog, IDC_STILINFO, WM_SETTEXT, 0, (LPARAM) wBuf);
-			return;
-		}
-	}
-#endif
-	SendDlgItemMessage(infoDialog, IDC_STILINFO, WM_SETTEXT, 0, (LPARAM) buf);
-}
-
-static void setEditedSong(int song)
-{
-	_TCHAR filename[MAX_PATH];
-	unsigned char str[ASAPWriter_MAX_DURATION_LENGTH + 1];
-	int len;
-
-	edited_song = song;
-	len = ASAPWriter_DurationToString(str, ASAPInfo_GetDuration(edited_info, song));
-	str[len] = '\0';
-	SendDlgItemMessage(infoDialog, IDC_TIME, WM_SETTEXT, 0, (LPARAM) str);
-	CheckDlgButton(infoDialog, IDC_LOOP, ASAPInfo_GetLoop(edited_info, song) ? BST_CHECKED : BST_UNCHECKED);
-	EnableWindow(GetDlgItem(infoDialog, IDC_LOOP), len > 0);
-
-	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_GETTEXT, MAX_PATH, (LPARAM) filename);
-	ASTIL_Load(astil, filename, song);
-	SendDlgItemMessage(infoDialog, IDC_STILFILE, WM_SETTEXT, 0, (LPARAM) ASTIL_GetStilFilename(astil));
-	updateStil();
-}
-
-static void showEditTip(int nID, LPCTSTR title, LPCTSTR message)
-{
-#ifndef _UNICODE
-
-#ifndef EM_SHOWBALLOONTIP
-/* missing in MinGW */
-typedef struct
-{
-	DWORD cbStruct;
-	LPCWSTR pszTitle;
-	LPCWSTR pszText;
-	INT ttiIcon;
-} EDITBALLOONTIP;
-#define TTI_ERROR  3
-#define EM_SHOWBALLOONTIP  0x1503
-#endif
-	WCHAR wTitle[64];
-	WCHAR wMessage[64];
-	EDITBALLOONTIP ebt = { sizeof(EDITBALLOONTIP), wTitle, wMessage, TTI_ERROR };
-	if (MultiByteToWideChar(CP_ACP, 0, title, -1, wTitle, 64) <= 0
-	 || MultiByteToWideChar(CP_ACP, 0, message, -1, wMessage, 64) <= 0
-	 || !SendDlgItemMessage(infoDialog, nID, EM_SHOWBALLOONTIP, 0, (LPARAM) &ebt))
-
-#endif /* _UNICODE */
-
-		/* Windows before XP don't support balloon tips */
-		MessageBox(infoDialog, message, title, MB_OK | MB_ICONERROR);
-}
-
-static BOOL isExt(LPCTSTR filename, LPCTSTR ext)
-{
-	return _tcsicmp(filename + _tcslen(filename) - 4, ext) == 0;
-}
-
-static void setSaved(void)
-{
-	int i;
-	_tcscpy(saved_author, ASAPInfo_GetAuthor(edited_info));
-	_tcscpy(saved_title, ASAPInfo_GetTitle(edited_info));
-	_tcscpy(saved_date, ASAPInfo_GetDate(edited_info));
-	for (i = 0; i < ASAPInfo_GetSongs(edited_info); i++) {
-		saved_durations[i] = ASAPInfo_GetDuration(edited_info, i);
-		saved_loops[i] = ASAPInfo_GetLoop(edited_info, i);
-	}
-}
-
-static BOOL infoChanged(void)
-{
-	int i;
-	if (_tcscmp(ASAPInfo_GetAuthor(edited_info), saved_author) != 0)
-		return TRUE;
-	if (_tcscmp(ASAPInfo_GetTitle(edited_info), saved_title) != 0)
-		return TRUE;
-	if (_tcscmp(ASAPInfo_GetDate(edited_info), saved_date) != 0)
-		return TRUE;
-	for (i = 0; i < ASAPInfo_GetSongs(edited_info); i++) {
-		if (ASAPInfo_GetDuration(edited_info, i) != saved_durations[i])
-			return TRUE;
-		if (saved_durations[i] >= 0 && ASAPInfo_GetLoop(edited_info, i) != saved_loops[i])
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static void updateSaveButtons(int mask, BOOL ok)
-{
-	if (ok) {
-		invalid_fields &= ~mask;
-		ok = invalid_fields == 0;
-	}
-	else
-		invalid_fields |= mask;
-	if (can_save)
-		EnableWindow(GetDlgItem(infoDialog, IDC_SAVE), ok && infoChanged());
-	EnableWindow(GetDlgItem(infoDialog, IDC_SAVEAS), ok);
-}
-
-static void updateInfoString(HWND hDlg, int nID, int mask, cibool (*func)(ASAPInfo *, LPCTSTR))
-{
-	_TCHAR str[ASAPInfo_MAX_TEXT_LENGTH + 1];
-	BOOL ok;
-	SendDlgItemMessage(hDlg, nID, WM_GETTEXT, ASAPInfo_MAX_TEXT_LENGTH + 1, (LPARAM) str);
-	ok = func(edited_info, str);
-	updateSaveButtons(mask, ok);
-	if (!ok)
-		showEditTip(nID, _T("Invalid characters"), _T("Avoid national characters and quotation marks"));
-}
-
-static LRESULT CALLBACK MonthCalWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch (uMsg) {
-	case WM_KILLFOCUS:
-		ShowWindow(hWnd, SW_HIDE);
-		break;
-	case WM_KEYDOWN:
-		if (wParam == VK_ESCAPE)
-			ShowWindow(hWnd, SW_HIDE);
-		break;
-	case WM_DESTROY:
-		SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR) monthcalOriginalWndProc);
-		break;
-	default:
-		break;
-	}
-	return CallWindowProc(monthcalOriginalWndProc, hWnd, uMsg, wParam, lParam);
-}
-
-static void toggleCalendar(HWND hDlg)
-{
-	if (monthcal == NULL) {
-		INITCOMMONCONTROLSEX icex;
-		icex.dwSize = sizeof(icex);
-		icex.dwICC = ICC_DATE_CLASSES;
-		InitCommonControlsEx(&icex);
-		monthcal = CreateWindowEx(0, MONTHCAL_CLASS, _T(""), WS_BORDER | WS_POPUP, 0, 0, 0, 0, hDlg, NULL, NULL, NULL);
-		/* subclass month calendar, so that it hides when looses focus */
-		monthcalOriginalWndProc = (WNDPROC) SetWindowLongPtr(monthcal, GWLP_WNDPROC, (LONG_PTR) MonthCalWndProc);
-	}
-	if (IsWindowVisible(monthcal))
-		ShowWindow(monthcal, SW_HIDE);
-	else {
-		RECT rc;
-		int x;
-		int y;
-		SYSTEMTIME st;
-		GetWindowRect(GetDlgItem(hDlg, IDC_PICKDATE), &rc);
-		x = rc.left;
-		y = rc.bottom;
-		MonthCal_GetMinReqRect(monthcal, &rc);
-		SetWindowPos(monthcal, NULL, x, y, rc.right, rc.bottom, SWP_SHOWWINDOW | SWP_NOZORDER);
-		y = ASAPInfo_GetYear(edited_info);
-		if (y > 0) {
-			DWORD view;
-			int month = ASAPInfo_GetMonth(edited_info);
-			st.wYear = y;
-			if (month > 0) {
-				int day = ASAPInfo_GetDayOfMonth(edited_info);
-				st.wMonth = month;
-				if (day > 0) {
-					st.wDay = day;
-					view = MCMV_MONTH;
-				}
-				else {
-					st.wDay = 1;
-					view = MCMV_YEAR;
-				}
-			}
-			else {
-				st.wMonth = 1;
-				st.wDay = 1;
-				view = MCMV_DECADE;
-			}
-			(void) MonthCal_SetCurSel(monthcal, &st);
-			(void) MonthCal_SetCurrentView(monthcal, view);
-		}
-		SetFocus(monthcal);
-	}
-}
-
-static void saveByte(void *obj, int data)
-{
-	putc(data, (FILE *) obj);
-}
-
-static BOOL doSaveFile(LPCTSTR filename, BOOL tag)
-{
-	FILE *fp = _tfopen(filename, _T("wb"));
-	ByteWriter bw;
-	if (fp == NULL)
-		return FALSE;
-	bw.obj = fp;
-	bw.func = saveByte;
-	if (!ASAPWriter_Write(filename, bw, edited_info, saved_module, saved_module_len, tag)) {
-		fclose(fp);
-		DeleteFile(filename);
-		return FALSE;
-	}
-	if (fclose(fp) != 0) {
-		DeleteFile(filename);
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static BOOL saveFile(LPCTSTR filename, BOOL tag)
-{
-	BOOL isSap = isExt(filename, _T(".sap"));
-	if (isSap) {
-		int song = ASAPInfo_GetSongs(edited_info);
-		while (--song >= 0 && ASAPInfo_GetDuration(edited_info, song) < 0);
-		while (--song >= 0) {
-			if (ASAPInfo_GetDuration(edited_info, song) < 0) {
-				MessageBox(infoDialog, _T("Cannot save file because time not set for all songs"), _T("Error"), MB_OK | MB_ICONERROR);
-				return FALSE;
-			}
-		}
-	}
-	if (!doSaveFile(filename, tag)) {
-		MessageBox(infoDialog, _T("Cannot save file"), _T("Error"), MB_OK | MB_ICONERROR);
-		// FIXME: delete file
-		return FALSE;
-	}
-	if (isSap)
-		setSaved();
-	return TRUE;
-}
-
-static BOOL saveInfo(void)
-{
-	_TCHAR filename[MAX_PATH];
-	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_GETTEXT, MAX_PATH, (LPARAM) filename);
-	return saveFile(filename, FALSE);
-}
-
-static void addFilterExt(void *obj, const char *ext)
-{
-	LPTSTR p = *(LPTSTR *) obj;
-	p += _stprintf(p, _T("%s (*.%s)"), ASAPInfo_GetExtDescription(ext), ext) + 1;
-	p += _stprintf(p, _T("*.%s"), ext) + 1;
-	*p = '\0';
-	*(LPTSTR *) obj = p;
-}
-
-static void setSaveFilters(LPTSTR p)
-{
-	StringConsumer sc = { &p, addFilterExt };
-	ASAPWriter_EnumSaveExts(sc, edited_info, saved_module, saved_module_len);
-}
-
-static BOOL saveInfoAs(void)
-{
-	_TCHAR filename[MAX_PATH];
-	_TCHAR filter[1024];
-	OPENFILENAME ofn = {
-		sizeof(OPENFILENAME),
-		infoDialog,
-		0,
-		filter,
-		NULL,
-		0,
-		1,
-		filename,
-		MAX_PATH,
-		NULL,
-		0,
-		NULL,
-		_T("Select output file"),
-		OFN_ENABLESIZING | OFN_EXPLORER | OFN_OVERWRITEPROMPT,
-		0,
-		0,
-		NULL,
-		0,
-		NULL,
-		NULL
-	};
-	LPTSTR ext;
-	BOOL tag = FALSE;
-	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_GETTEXT, MAX_PATH, (LPARAM) filename);
-	ext = _tcsrchr(filename, '.');
-	if (ext != NULL) {
-		*ext = '\0';
-		ofn.lpstrDefExt = ext + 1;
-	}
-	setSaveFilters(filter);
-	if (!GetSaveFileName(&ofn))
-		return FALSE;
-	if (isExt(filename, _T(".xex"))) {
-		switch (MessageBox(infoDialog, _T("Do you want to display information during playback?"), _T("ASAP"), MB_YESNOCANCEL | MB_ICONQUESTION)) {
-		case IDYES:
-			tag = TRUE;
-			break;
-		case IDCANCEL:
-			return FALSE;
-		default:
-			break;
-		}
-	}
-	return saveFile(filename, tag);
-}
-
-static void closeInfoDialog(void)
-{
-	DestroyWindow(infoDialog);
-	infoDialog = NULL;
-	ASAPInfo_Delete(edited_info);
-	edited_info = NULL;
-	ASTIL_Delete(astil);
-	astil = NULL;
-}
-
-static INT_PTR CALLBACK infoDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch (uMsg) {
-	case WM_INITDIALOG:
-#if defined(WINAMP) || defined(XMPLAY)
-		CheckDlgButton(hDlg, IDC_PLAYING, playing_info ? BST_CHECKED : BST_UNCHECKED);
-#endif
-		SendDlgItemMessage(hDlg, IDC_AUTHOR, EM_LIMITTEXT, ASAPInfo_MAX_TEXT_LENGTH, 0);
-		SendDlgItemMessage(hDlg, IDC_NAME, EM_LIMITTEXT, ASAPInfo_MAX_TEXT_LENGTH, 0);
-		SendDlgItemMessage(hDlg, IDC_DATE, EM_LIMITTEXT, ASAPInfo_MAX_TEXT_LENGTH, 0);
-		SendDlgItemMessage(hDlg, IDC_TIME, EM_LIMITTEXT, ASAPWriter_MAX_DURATION_LENGTH, 0);
-		return TRUE;
-	case WM_COMMAND:
-		switch (wParam) {
-#if defined(WINAMP) || defined(XMPLAY)
-		case MAKEWPARAM(IDC_PLAYING, BN_CLICKED):
-			playing_info = (IsDlgButtonChecked(hDlg, IDC_PLAYING) == BST_CHECKED);
-			if (playing_info && playing_filename[0] != '\0')
-				updateInfoDialog(playing_filename, playing_song);
-			onUpdatePlayingInfo();
-			return TRUE;
-#endif
-		case MAKEWPARAM(IDC_AUTHOR, EN_CHANGE):
-			updateInfoString(hDlg, IDC_AUTHOR, INVALID_FIELD_AUTHOR, ASAPInfo_SetAuthor);
-			return TRUE;
-		case MAKEWPARAM(IDC_NAME, EN_CHANGE):
-			updateInfoString(hDlg, IDC_NAME, INVALID_FIELD_NAME, ASAPInfo_SetTitle);
-			return TRUE;
-		case MAKEWPARAM(IDC_DATE, EN_CHANGE):
-			updateInfoString(hDlg, IDC_DATE, INVALID_FIELD_DATE, ASAPInfo_SetDate);
-			return TRUE;
-		case MAKEWPARAM(IDC_PICKDATE, BN_CLICKED):
-			toggleCalendar(hDlg);
-			return TRUE;
-		case MAKEWPARAM(IDC_TIME, EN_CHANGE):
-			{
-				char str[ASAPWriter_MAX_DURATION_LENGTH + 1];
-				int duration;
-				SendDlgItemMessage(hDlg, IDC_TIME, WM_GETTEXT, ASAPWriter_MAX_DURATION_LENGTH + 1, (LPARAM) str);
-				duration = ASAPInfo_ParseDuration(str);
-				ASAPInfo_SetDuration(edited_info, edited_song, duration);
-				EnableWindow(GetDlgItem(infoDialog, IDC_LOOP), str[0] != '\0');
-				updateSaveButtons(INVALID_FIELD_TIME | INVALID_FIELD_TIME_SHOW, duration >=0 || str[0] == '\0');
-			}
-			return TRUE;
-		case MAKEWPARAM(IDC_TIME, EN_KILLFOCUS):
-			if ((invalid_fields & INVALID_FIELD_TIME_SHOW) != 0) {
-				invalid_fields &= ~INVALID_FIELD_TIME_SHOW;
-				showEditTip(IDC_TIME, _T("Invalid format"), _T("Please type MM:SS.mmm"));
-			}
-			return TRUE;
-		case MAKEWPARAM(IDC_LOOP, BN_CLICKED):
-			ASAPInfo_SetLoop(edited_info, edited_song, IsDlgButtonChecked(hDlg, IDC_LOOP) == BST_CHECKED);
-			updateSaveButtons(0, TRUE);
-			return TRUE;
-		case MAKEWPARAM(IDC_SONGNO, CBN_SELCHANGE):
-			setEditedSong(SendDlgItemMessage(hDlg, IDC_SONGNO, CB_GETCURSEL, 0, 0));
-			updateSaveButtons(INVALID_FIELD_TIME | INVALID_FIELD_TIME_SHOW, TRUE);
-			return TRUE;
-		case MAKEWPARAM(IDC_SAVE, BN_CLICKED):
-			saveInfo();
-			return TRUE;
-		case MAKEWPARAM(IDC_SAVEAS, BN_CLICKED):
-			saveInfoAs();
-			return TRUE;
-		case MAKEWPARAM(IDCANCEL, BN_CLICKED):
-			if (invalid_fields == 0 && infoChanged()) {
-				switch (MessageBox(hDlg, _T("Save changes?"), _T("ASAP"), MB_YESNOCANCEL | MB_ICONQUESTION)) {
-				case IDYES:
-					if (!saveInfoAs())
-						return TRUE;
-					break;
-				case IDCANCEL:
-					return TRUE;
-				default:
-					break;
-				}
-			}
-			closeInfoDialog();
-			return TRUE;
-		}
-		break;
-	case WM_NOTIFY: {
-			LPNMSELCHANGE psc = (LPNMSELCHANGE) lParam;
-			if (psc->nmhdr.hwndFrom == monthcal && psc->nmhdr.code == MCN_SELECT) {
-				_TCHAR str[32];
-				ShowWindow(monthcal, SW_HIDE);
-				_stprintf(str, _T("%02d/%02d/%d"), psc->stSelStart.wDay, psc->stSelStart.wMonth, psc->stSelStart.wYear);
-				SetDlgItemText(hDlg, IDC_DATE, str);
-				ASAPInfo_SetDate(edited_info, str);
-				updateSaveButtons(INVALID_FIELD_DATE, TRUE);
-			}
-		}
-		break;
-	case WM_DESTROY:
-		if (monthcal != NULL) {
-			DestroyWindow(monthcal);
-			monthcal = NULL;
-		}
-		return 0;
-	default:
-		break;
-	}
-	return FALSE;
-}
-
-void showInfoDialog(HINSTANCE hInstance, HWND hwndParent, LPCTSTR filename, int song)
-{
-	if (infoDialog == NULL)
-		infoDialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_INFO), hwndParent, infoDialogProc);
-	if (playing_info || filename == NULL)
-		updateInfoDialog(playing_filename, playing_song);
-	else
-		updateInfoDialog(filename, song);
-}
-
-void updateInfoDialog(LPCTSTR filename, int song)
-{
-	int songs;
-	int i;
-	if (infoDialog == NULL)
-		return;
-	if (edited_info == NULL) {
-		edited_info = ASAPInfo_New();
-		if (astil == NULL)
-			astil = ASTIL_New();
-		if (edited_info == NULL || astil == NULL) {
-			closeInfoDialog();
-			return;
-		}
-	}
-	else if (infoChanged())
-		return;
-	if (!loadModule(filename, saved_module, &saved_module_len)
-	 || !ASAPInfo_Load(edited_info, filename, saved_module, saved_module_len)) {
-		closeInfoDialog();
-		return;
-	}
-	setSaved();
-	can_save = isExt(filename, _T(".sap"));
-	invalid_fields = 0;
-	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_SETTEXT, 0, (LPARAM) filename);
-	SendDlgItemMessage(infoDialog, IDC_AUTHOR, WM_SETTEXT, 0, (LPARAM) saved_author);
-	SendDlgItemMessage(infoDialog, IDC_NAME, WM_SETTEXT, 0, (LPARAM) saved_title);
-	SendDlgItemMessage(infoDialog, IDC_DATE, WM_SETTEXT, 0, (LPARAM) saved_date);
-	SendDlgItemMessage(infoDialog, IDC_SONGNO, CB_RESETCONTENT, 0, 0);
-	songs = ASAPInfo_GetSongs(edited_info);
-	EnableWindow(GetDlgItem(infoDialog, IDC_SONGNO), songs > 1);
-	for (i = 1; i <= songs; i++) {
-		_TCHAR str[16];
-		_stprintf(str, _T("%d"), i);
-		SendDlgItemMessage(infoDialog, IDC_SONGNO, CB_ADDSTRING, 0, (LPARAM) str);
-	}
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(edited_info);
-	SendDlgItemMessage(infoDialog, IDC_SONGNO, CB_SETCURSEL, song, 0);
-	setEditedSong(song);
-	EnableWindow(GetDlgItem(infoDialog, IDC_SAVE), FALSE);
-	updateTech();
-}
-
-void setPlayingSong(LPCTSTR filename, int song)
-{
-	if (filename != NULL && _tcslen(filename) < MAX_PATH - 1)
-		_tcscpy(playing_filename, filename);
-	playing_song = song;
-	if (playing_info)
-		updateInfoDialog(playing_filename, song);
-}
-
-const ASTIL *getPlayingASTIL(void)
-{
-	if (astil == NULL)
-		astil = ASTIL_New();
-	ASTIL_Load(astil, playing_filename, playing_song);
-	return astil;
-}
-
-#endif /* _UNICODE */
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/info_dlg.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/info_dlg.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/info_dlg.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/info_dlg.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
- * info_dlg.h - file information dialog box
- *
- * Copyright (C) 2007-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <tchar.h>
-
-#define IDD_INFO       300
-#define IDC_PLAYING    301
-#define IDC_FILENAME   302
-#define IDC_AUTHOR     303
-#define IDC_NAME       304
-#define IDC_DATE       305
-#define IDC_PICKDATE   306
-#define IDC_SONGNO     307
-#define IDC_TIME       308
-#define IDC_LOOP       309
-#define IDC_TECHINFO   310
-#define IDC_STILFILE   311
-#define IDC_STILINFO   312
-#define IDC_SAVE       313
-#define IDC_SAVEAS     314
-
-#define IDD_PROGRESS   500
-#define IDC_PROGRESS   501
-
-void combineFilenameExt(LPTSTR dest, LPCTSTR filename, LPCTSTR ext);
-BOOL loadModule(LPCTSTR filename, BYTE *module, int *module_len);
-
-extern HWND infoDialog;
-void showInfoDialog(HINSTANCE hInstance, HWND hwndParent, LPCTSTR filename, int song);
-void updateInfoDialog(LPCTSTR filename, int song);
-void setPlayingSong(LPCTSTR filename, int song);
-#ifdef XMPLAY
-const ASTIL *getPlayingASTIL(void);
-#endif
-#if defined(WINAMP) || defined(XMPLAY)
-extern BOOL playing_info;
-void onUpdatePlayingInfo(void);
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/rmt/apokeysnd_dll.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/rmt/apokeysnd_dll.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/rmt/apokeysnd_dll.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/rmt/apokeysnd_dll.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*
- * apokeysnd_dll.c - POKEY sound emulator for Raster Music Tracker
- *
- * Copyright (C) 2008-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stddef.h>
-#include "pokey.h"
-
-static PokeyPair *pokeys = NULL;
-
-__declspec(dllexport) void APokeySound_Initialize(bool stereo)
-{
-	PokeyPair_Delete(pokeys);
-	pokeys = PokeyPair_New();
-	PokeyPair_Initialize(pokeys, false, stereo);
-	PokeyPair_StartFrame(pokeys);
-}
-
-__declspec(dllexport) void APokeySound_PutByte(int addr, int data)
-{
-	PokeyPair_Poke(pokeys, addr, data, 0);
-}
-
-__declspec(dllexport) int APokeySound_GetRandom(int addr, int cycle)
-{
-	return PokeyPair_GetRandom(pokeys, addr, cycle);
-}
-
-__declspec(dllexport) int APokeySound_Generate(int cycles, unsigned char *buffer, int depth)
-{
-	int len = PokeyPair_EndFrame(pokeys, cycles);
-	len = PokeyPair_Generate(pokeys, buffer, 0, len, depth == 16 ? ASAPSampleFormat_S16_L_E : ASAPSampleFormat_U8);
-	PokeyPair_StartFrame(pokeys);
-	return len;
-}
-
-__declspec(dllexport) void APokeySound_About(const char **name, const char **author, const char **description)
-{
-	*name = "Another POKEY Sound Emulator, v3.1.5";
-	*author = "Piotr Fusik, (C) 2007-2013";
-	*description = "Part of ASAP, http://asap.sourceforge.net";
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/settings_dlg.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/settings_dlg.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/settings_dlg.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/settings_dlg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-/*
- * settings_dlg.c - settings dialog box
- *
- * Copyright (C) 2007-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <tchar.h>
-
-#include "asap.h"
-#include "settings_dlg.h"
-
-void enableTimeInput(HWND hDlg, BOOL enable)
-{
-	EnableWindow(GetDlgItem(hDlg, IDC_MINUTES), enable);
-	EnableWindow(GetDlgItem(hDlg, IDC_SECONDS), enable);
-}
-
-void setFocusAndSelect(HWND hDlg, int nID)
-{
-	HWND hWnd = GetDlgItem(hDlg, nID);
-	SetFocus(hWnd);
-	SendMessage(hWnd, EM_SETSEL, 0, -1);
-}
-
-void settingsDialogSet(HWND hDlg, int song_length, int silence_seconds, BOOL play_loops, int mute_mask)
-{
-	int i;
-	if (song_length <= 0) {
-		CheckRadioButton(hDlg, IDC_UNLIMITED, IDC_LIMITED, IDC_UNLIMITED);
-		SetDlgItemInt(hDlg, IDC_MINUTES, DEFAULT_SONG_LENGTH / 60, FALSE);
-		SetDlgItemInt(hDlg, IDC_SECONDS, DEFAULT_SONG_LENGTH % 60, FALSE);
-		enableTimeInput(hDlg, FALSE);
-	}
-	else {
-		CheckRadioButton(hDlg, IDC_UNLIMITED, IDC_LIMITED, IDC_LIMITED);
-		SetDlgItemInt(hDlg, IDC_MINUTES, (UINT) song_length / 60, FALSE);
-		SetDlgItemInt(hDlg, IDC_SECONDS, (UINT) song_length % 60, FALSE);
-		enableTimeInput(hDlg, TRUE);
-	}
-	if (silence_seconds <= 0) {
-		CheckDlgButton(hDlg, IDC_SILENCE, BST_UNCHECKED);
-		SetDlgItemInt(hDlg, IDC_SILSECONDS, DEFAULT_SILENCE_SECONDS, FALSE);
-		EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), FALSE);
-	}
-	else {
-		CheckDlgButton(hDlg, IDC_SILENCE, BST_CHECKED);
-		SetDlgItemInt(hDlg, IDC_SILSECONDS, (UINT) silence_seconds, FALSE);
-		EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), TRUE);
-	}
-	CheckRadioButton(hDlg, IDC_LOOPS, IDC_NOLOOPS, play_loops ? IDC_LOOPS : IDC_NOLOOPS);
-	for (i = 0; i < 8; i++)
-		CheckDlgButton(hDlg, IDC_MUTE1 + i, ((mute_mask >> i) & 1) != 0 ? BST_CHECKED : BST_UNCHECKED);
-}
-
-#ifndef FOOBAR2000
-
-int song_length = -1;
-int silence_seconds = -1;
-BOOL play_loops = FALSE;
-int mute_mask = 0;
-static int saved_mute_mask;
-
-static BOOL getDlgInt(HWND hDlg, int nID, int *result)
-{
-	BOOL translated;
-	UINT r = GetDlgItemInt(hDlg, nID, &translated, FALSE);
-	if (!translated) {
-		MessageBox(hDlg, _T("Invalid number"), _T("Error"), MB_OK | MB_ICONERROR);
-		return FALSE;
-	}
-	*result = (int) r;
-	return TRUE;
-}
-
-static INT_PTR CALLBACK settingsDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch (uMsg) {
-	case WM_INITDIALOG:
-		saved_mute_mask = mute_mask;
-		settingsDialogSet(hDlg, song_length, silence_seconds, play_loops, mute_mask);
-		return TRUE;
-	case WM_COMMAND:
-		if (HIWORD(wParam) == BN_CLICKED) {
-			WORD wCtrl = LOWORD(wParam);
-			BOOL enabled;
-			switch (wCtrl) {
-			case IDC_UNLIMITED:
-				enableTimeInput(hDlg, FALSE);
-				return TRUE;
-			case IDC_LIMITED:
-				enableTimeInput(hDlg, TRUE);
-				setFocusAndSelect(hDlg, IDC_MINUTES);
-				return TRUE;
-			case IDC_SILENCE:
-				enabled = (IsDlgButtonChecked(hDlg, IDC_SILENCE) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), enabled);
-				if (enabled)
-					setFocusAndSelect(hDlg, IDC_SILSECONDS);
-				return TRUE;
-			case IDC_LOOPS:
-			case IDC_NOLOOPS:
-				return TRUE;
-			case IDC_MUTE1:
-			case IDC_MUTE1 + 1:
-			case IDC_MUTE1 + 2:
-			case IDC_MUTE1 + 3:
-			case IDC_MUTE1 + 4:
-			case IDC_MUTE1 + 5:
-			case IDC_MUTE1 + 6:
-			case IDC_MUTE1 + 7:
-			{
-				int mask = 1 << (wCtrl - IDC_MUTE1);
-				if (IsDlgButtonChecked(hDlg, wCtrl) == BST_CHECKED)
-					mute_mask |= mask;
-				else
-					mute_mask &= ~mask;
-				ASAP_MutePokeyChannels(asap, mute_mask);
-				return TRUE;
-			}
-			case IDOK:
-			{
-				int new_song_length;
-				if (IsDlgButtonChecked(hDlg, IDC_UNLIMITED) == BST_CHECKED)
-					new_song_length = -1;
-				else {
-					int minutes;
-					int seconds;
-					if (!getDlgInt(hDlg, IDC_MINUTES, &minutes)
-					 || !getDlgInt(hDlg, IDC_SECONDS, &seconds))
-						return TRUE;
-					new_song_length = 60 * minutes + seconds;
-				}
-				if (IsDlgButtonChecked(hDlg, IDC_SILENCE) != BST_CHECKED)
-					silence_seconds = -1;
-				else if (!getDlgInt(hDlg, IDC_SILSECONDS, &silence_seconds))
-					return TRUE;
-				song_length = new_song_length;
-				play_loops = (IsDlgButtonChecked(hDlg, IDC_LOOPS) == BST_CHECKED);
-				EndDialog(hDlg, IDOK);
-				return TRUE;
-			}
-			case IDCANCEL:
-				mute_mask = saved_mute_mask;
-				ASAP_MutePokeyChannels(asap, mute_mask);
-				EndDialog(hDlg, IDCANCEL);
-				return TRUE;
-			}
-		}
-		break;
-	default:
-		break;
-	}
-	return FALSE;
-}
-
-BOOL settingsDialog(HINSTANCE hInstance, HWND hwndParent)
-{
-	return DialogBox(hInstance, MAKEINTRESOURCE(IDD_SETTINGS), hwndParent, settingsDialogProc) == IDOK;
-}
-
-int getSongDurationInternal(const ASAPInfo *info, int song, ASAP *asap)
-{
-	int duration = ASAPInfo_GetDuration(info, song);
-	if (duration < 0) {
-		if (asap != NULL)
-			ASAP_DetectSilence(asap, silence_seconds);
-		return 1000 * song_length;
-	}
-	if (asap != NULL)
-		ASAP_DetectSilence(asap, 0);
-	if (play_loops && ASAPInfo_GetLoop(info, song))
-		return 1000 * song_length;
-	return duration;
-}
-
-int playSong(int song)
-{
-	int duration = getSongDurationInternal(ASAP_GetInfo(asap), song, asap);
-	ASAP_PlaySong(asap, song, duration); /* FIXME: check errors */
-	ASAP_MutePokeyChannels(asap, mute_mask);
-	return duration;
-}
-
-#endif /* FOOBAR2000 */
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/settings_dlg.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/settings_dlg.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/settings_dlg.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/settings_dlg.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * settings_dlg.h - settings dialog box
- *
- * Copyright (C) 2007-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DEFAULT_SONG_LENGTH      180
-#define DEFAULT_SILENCE_SECONDS  2
-
-#define IDD_SETTINGS   400
-#define IDC_UNLIMITED  401
-#define IDC_LIMITED    402
-#define IDC_MINUTES    403
-#define IDC_SECONDS    404
-#define IDC_SILENCE    405
-#define IDC_SILSECONDS 406
-#define IDC_LOOPS      407
-#define IDC_NOLOOPS    408
-#define IDC_MUTE1      411
-
-#ifdef FOOBAR2000
-void enableTimeInput(HWND hDlg, BOOL enable);
-void setFocusAndSelect(HWND hDlg, int nID);
-void settingsDialogSet(HWND hDlg, int song_length, int silence_seconds, BOOL play_loops, int mute_mask);
-#else
-extern ASAP *asap;
-extern int song_length;
-extern int silence_seconds;
-extern BOOL play_loops;
-extern int mute_mask;
-BOOL settingsDialog(HINSTANCE hInstance, HWND hwndParent);
-int getSongDurationInternal(const ASAPInfo *module_info, int song, ASAP *asap);
-#define getSongDuration(module_info, song)  getSongDurationInternal(module_info, song, NULL)
-int playSong(int song);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/asap-banner.jpg and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/asap-banner.jpg differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/asap-dialog.jpg and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/asap-dialog.jpg differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/asap.wxs kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/asap.wxs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/asap.wxs	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/asap.wxs	1970-01-01 00:00:00.000000000 +0000
@@ -1,675 +0,0 @@
-<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<?if $(sys.BUILDARCH) = x86?>
-		<?define WIN64=no?>
-		<?define PLATFORM_SUFFIX=""?>
-		<?define UPGRADE_GUID=4250B3CB-D4A1-4486-828C-AC26A84D00D9?>
-		<?define PROGRAM_FILES_FOLDER=ProgramFilesFolder?>
-		<?define SRC_DIR=""?>
-		<?define SHELL_EX_LEVEL=9?>
-	<?elseif $(sys.BUILDARCH) = x64?>
-		<?define WIN64=yes?>
-		<?define PLATFORM_SUFFIX=" (64-bit)"?>
-		<?define UPGRADE_GUID=205ADAB1-56A1-42B9-9789-FD20FCD1DF9B?>
-		<?define PROGRAM_FILES_FOLDER=ProgramFiles64Folder?>
-		<?define SRC_DIR=x64\?>
-		<?define SHELL_EX_LEVEL=1?>
-	<?endif?>
-
-	<Product Id="*" Name="ASAP - Another Slight Atari Player $(var.VERSION)$(var.PLATFORM_SUFFIX)" Language="1033"
-		Version="$(var.VERSION)" Manufacturer="Piotr Fusik" UpgradeCode="$(var.UPGRADE_GUID)">
-
-		<Package Description="ASAP - Another Slight Atari Player" Manufacturer="Piotr Fusik"
-			InstallerVersion="200" Platform="$(sys.BUILDARCH)" Compressed="yes" />
-		<MajorUpgrade DowngradeErrorMessage="Newer version of ASAP is already installed!" MigrateFeatures="yes" />
-		<Media Id="1" Cabinet="asap.cab" EmbedCab="yes" CompressionLevel="high" />
-
-		<?define EXT_FILTER=*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc?>
-		<?define NATIVE_EXTS=cmc;cm3;cmr;cms;dmc;dlt;mpt;mpd;rmt;tmc;tm8;tm2;fc?>
-		<?define ASAP_EXTS=sap;$(var.NATIVE_EXTS)?>
-		<?define DOUBLECLICK=Double-click SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC file in Windows Explorer to play it in?>
-
-		<Icon Id="wasap.ico" SourceFile="wasap/wasap.ico" />
-		<Property Id="ARPHELPLINK" Value="http://asap.sourceforge.net/" />
-		<Property Id="ARPPRODUCTICON" Value="wasap.ico" />
-		<WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
-		<WixVariable Id="WixUIDialogBmp" Value="asap-dialog.jpg" />
-		<WixVariable Id="WixUIBannerBmp" Value="asap-banner.jpg" />
-
-		<UI Id="MyWixUI_FeatureTree">
-			<!-- customized WixUI_FeatureTree from Wix 3.0 - my changes commented -->
-			<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-			<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-			<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-			<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-			<Property Id="WixUI_Mode" Value="FeatureTree" />
-
-			<DialogRef Id="ErrorDlg" />
-			<DialogRef Id="FatalError" />
-			<DialogRef Id="FilesInUse" />
-			<DialogRef Id="MsiRMFilesInUse" />
-			<DialogRef Id="PrepareDlg" />
-			<DialogRef Id="ProgressDlg" />
-			<DialogRef Id="ResumeDlg" />
-			<DialogRef Id="UserExit" />
-
-			<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-			<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="MyLicenseAgreementDlg">1</Publish>
-
-			<Publish Dialog="MyLicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-			<Publish Dialog="MyLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="MyCustomizeDlg">1</Publish>
-
-			<Publish Dialog="MyCustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish>
-			<Publish Dialog="MyCustomizeDlg" Control="Back" Event="NewDialog" Value="MyLicenseAgreementDlg" Order="2">NOT Installed</Publish>
-			<Publish Dialog="MyCustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
-			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MyCustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
-			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish>
-
-			<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-			<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="MyCustomizeDlg">1</Publish>
-			<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-			<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-			<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-			<Dialog Id="MyLicenseAgreementDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
-				<!-- removed the checkbox and replaced the "Next" button with "I Accept" -->
-				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="I &amp;Accept">
-					<!-- sf bug #3294936
-					<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
-					-->
-				</Control>
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-					<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
-				<!-- higher license box because of the removed checkbox -->
-				<Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="155" Sunken="yes" TabSkip="no">
-					<Text SourceFile="!(wix.WixUILicenseRtf)" />
-				</Control>
-				<!-- removed the "Print" button -->
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
-			</Dialog>
-
-			<Dialog Id="MyCustomizeDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
-				<!-- wider and higher selection tree -->
-				<Control Id="Tree" Type="SelectionTree" X="10" Y="75" Width="190" Height="125" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
-				<Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
-					<Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
-					<Condition Action="hide">Installed</Condition>
-					<Condition Action="disable">Installed</Condition>
-				</Control>
-				<!-- removed the "Reset" and "Disk Cost" buttons, moved the "Back" and "Next" buttons to their position in other dialogs -->
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-					<Subscribe Event="SelectionNoItems" Attribute="Enabled" />
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-					<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
-				<Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
-				<Control Id="Box" Type="GroupBox" X="210" Y="71" Width="150" Height="128" />
-				<Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)">
-					<Subscribe Event="SelectionDescription" Attribute="Text" />
-				</Control>
-				<Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)">
-					<Subscribe Event="SelectionSize" Attribute="Text" />
-				</Control>
-				<Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)">
-					<Subscribe Event="SelectionPath" Attribute="Text" />
-					<Subscribe Event="SelectionPathOn" Attribute="Visible" />
-					<Condition Action="hide">Installed</Condition>
-				</Control>
-				<Control Id="LocationLabel" Type="Text" X="25" Y="210" Width="65" Height="10" Text="!(loc.CustomizeDlgLocationLabel)">
-					<Subscribe Event="SelectionPathOn" Attribute="Visible" />
-					<Condition Action="hide">Installed</Condition>
-				</Control>
-			</Dialog>
-
-			<?if $(sys.BUILDARCH) = x86?>
-			<!-- handle mutually exclusive file associations, conditions generated with wix_mutex.pl -->
-			<?foreach MUTEXCOND in (($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($asap_dsf.ext=3 OR ($asap_dsf.ext=-1 AND ?asap_dsf.ext=3) OR $in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)));
-(($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3) OR $ASAP_Apollo.ext=3 OR ($ASAP_Apollo.ext=-1 AND ?ASAP_Apollo.ext=3)));
-(($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3) OR $aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
-(($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
-(($asap_dsf.ext=3 OR ($asap_dsf.ext=-1 AND ?asap_dsf.ext=3)) AND ($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3) OR $foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)));
-(($asap_dsf.ext=3 OR ($asap_dsf.ext=-1 AND ?asap_dsf.ext=3)) AND ($ASAP_Apollo.ext=3 OR ($ASAP_Apollo.ext=-1 AND ?ASAP_Apollo.ext=3) OR $xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)));
-(($asap_dsf.ext=3 OR ($asap_dsf.ext=-1 AND ?asap_dsf.ext=3)) AND ($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
-(($asap_dsf.ext=3 OR ($asap_dsf.ext=-1 AND ?asap_dsf.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
-(($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)) AND ($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3) OR $ASAP_Apollo.ext=3 OR ($ASAP_Apollo.ext=-1 AND ?ASAP_Apollo.ext=3)));
-(($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)) AND ($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3) OR $aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
-(($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
-(($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)) AND ($ASAP_Apollo.ext=3 OR ($ASAP_Apollo.ext=-1 AND ?ASAP_Apollo.ext=3) OR $xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)));
-(($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)) AND ($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
-(($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
-(($ASAP_Apollo.ext=3 OR ($ASAP_Apollo.ext=-1 AND ?ASAP_Apollo.ext=3)) AND ($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3) OR $aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
-(($ASAP_Apollo.ext=3 OR ($ASAP_Apollo.ext=-1 AND ?ASAP_Apollo.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
-(($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)) AND ($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
-(($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
-(($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)))?>
-				<Publish Dialog="MyCustomizeDlg" Control="Next" Event="SpawnDialog" Value="MyManyAssociationsDlg" Order="3">
-					$(var.MUTEXCOND)
-				</Publish>
-			<?endforeach?>
-			<Dialog Id="MyManyAssociationsDlg" Width="270" Height="85" Title="!(loc.ErrorDlg_Title)">
-				<Control Id="ErrorText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" Text="You have selected &quot;Associate file types&quot; for many players. You may associate files with only one player." />
-				<Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" />
-				<Control Id="O" Type="PushButton" X="100" Y="60" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)">
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-			</Dialog>
-			<?endif?>
-		</UI>
-		<UIRef Id="WixUI_Common" />
-
-		<?if $(sys.BUILDARCH) = x86?>
-		<Property Id="TSVN.VER">
-			<RegistrySearch Id="tsvn.ver" Root="HKCU" Key="SOFTWARE\TortoiseSVN" Name="CurrentVersion" Type="raw" />
-		</Property>
-		<Property Id="TGIT.VER">
-			<RegistrySearch Id="tgit.ver" Root="HKCU" Key="SOFTWARE\TortoiseGit" Name="CurrentVersion" Type="raw" />
-		</Property>
-		<Property Id="WMP.EXE">
-			<RegistrySearch Id="wmp.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\MediaPlayer" Name="Installation Directory" Type="directory">
-				<FileSearch Id="wmp.exe" Name="wmplayer.exe" />
-			</RegistrySearch>
-		</Property>
-		<Property Id="WINAMP.DIR">
-			<RegistrySearch Id="winamp.installdir" Root="HKCU" Key="SOFTWARE\Winamp" Type="directory" />
-		</Property>
-		<Property Id="WINAMP.EXE">
-			<RegistrySearch Id="winamp.exe" Root="HKCU" Key="SOFTWARE\Winamp" Type="directory">
-				<FileSearch Name="winamp.exe" />
-			</RegistrySearch>
-		</Property>
-		<Property Id="FOO.DIR">
-			<RegistrySearch Id="foo.installdir" Root="HKLM" Key="SOFTWARE\foobar2000" Name="InstallDir" Type="directory" />
-		</Property>
-		<Property Id="FOO.EXE">
-			<RegistrySearch Id="foo.exe" Root="HKLM" Key="SOFTWARE\foobar2000" Name="InstallDir" Type="directory">
-				<FileSearch Name="foobar2000.exe" />
-			</RegistrySearch>
-		</Property>
-		<Property Id="XBMC.DIR">
-			<RegistrySearch Id="xbmc.installdir" Root="HKCU" Key="SOFTWARE\XBMC" Type="directory" />
-		</Property>
-		<Property Id="APOLLO.DIR">
-			<RegistrySearch Id="apollo.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apollo_is1" Name="InstallLocation" Type="directory" />
-		</Property>
-		<Property Id="APOLLO.EXE">
-			<RegistrySearch Id="apollo.exe" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apollo_is1" Name="InstallLocation" Type="directory">
-				<FileSearch Name="Apollo.exe" />
-			</RegistrySearch>
-		</Property>
-		<Property Id="XMPLAY.DIR">
-			<RegistrySearch Id="xmplay.installdir" Root="HKCR" Key="XMPlay\shell\Open\command" Type="file" />
-		</Property>
-		<Property Id="XMPLAY.EXE">
-			<RegistrySearch Id="xmplay.exe" Root="HKCR" Key="XMPlay\shell\Open\command" Type="file">
-				<FileSearch Name="xmplay.exe" />
-			</RegistrySearch>
-		</Property>
-		<Property Id="AIMP.DIR">
-			<RegistrySearch Id="aimp2.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\AIMP2" Name="InstallPath" Type="directory" />
-			<RegistrySearch Id="aimp3.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\AIMP3" Name="UninstallString" Type="file" />
-		</Property>
-		<Property Id="AIMP.EXE">
-			<RegistrySearch Id="aimp2.exe" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\AIMP2" Name="InstallPath" Type="directory">
-				<FileSearch Name="AIMP2.exe" />
-			</RegistrySearch>
-			<DirectorySearch Id="aimp3.exe" Path="[AIMP.DIR]">
-				<FileSearch Name="AIMP3.exe" />
-			</DirectorySearch>
-		</Property>
-		<Property Id="VLC.DIR">
-			<RegistrySearch Id="vlc.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VLC media player" Name="InstallLocation" Type="directory" />
-		</Property>
-		<Property Id="VLC.EXE">
-			<RegistrySearch Id="vlc.exe" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VLC media player" Name="InstallLocation" Type="directory">
-				<FileSearch Name="vlc.exe" />
-			</RegistrySearch>
-		</Property>
-		<?endif?>
-
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.PROGRAM_FILES_FOLDER)">
-				<Directory Id="ASAP.DIR" Name="ASAP">
-					<?if $(sys.BUILDARCH) = x86?>
-					<Component Id="wasap.exe">
-						<File Name="wasap.exe" Source="wasap.exe" Checksum="yes" KeyPath="yes" />
-					</Component>
-					<Component Id="wasap.ext">
-						<RegistryValue Root="HKCR" Key="asap.file" Name="wasap" Type="integer" Value="1" KeyPath="yes" />
-						<ProgId Id="asap.file">
-							<Extension Id="sap">
-								<!-- nothing special about "sap", just Verb needs to be defined only once per ProgId -->
-								<Verb Id="open" TargetFile="wasap.exe" Argument='"%1"' />
-							</Extension>
-							<?foreach EXT in $(var.NATIVE_EXTS)?>
-								<Extension Id="$(var.EXT)" />
-							<?endforeach?>
-						</ProgId>
-					</Component>
-
-					<Component Id="asapconv.exe">
-						<File Name="asapconv.exe" Source="asapconv.exe" Checksum="yes" KeyPath="yes" />
-					</Component>
-					<Component Id="path" Guid="D7247D41-0B9A-42D3-9847-06C37F88E2ED">
-						<Environment Id="path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[ASAP.DIR]" />
-						<CreateFolder />
-					</Component>
-					<?endif?>
-
-					<Component Id="asap_dsf.dll" Win64="$(var.WIN64)">
-						<File Name="asap_dsf.dll" Source="$(var.SRC_DIR)asap_dsf.dll" Checksum="yes" KeyPath="yes">
-							<Class Id="{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}" Context="InprocServer32" Description="ASAP source filter" ThreadingModel="both" />
-						</File>
-						<RegistryValue Root="HKCR" Key="CLSID\{083863F1-70DE-11D0-BD40-00A0C911CE86}\Instance\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}" Name="FriendlyName" Value="ASAP source filter" Type="string" Action="write" />
-						<RegistryValue Root="HKCR" Key="CLSID\{083863F1-70DE-11D0-BD40-00A0C911CE86}\Instance\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}" Name="CLSID" Value="{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}" Type="string" Action="write" />
-						<RegistryValue Root="HKCR" Key="CLSID\{083863F1-70DE-11D0-BD40-00A0C911CE86}\Instance\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}" Name="FilterData" Value="02000000000060000100000000000000307069330800000000000000010000000000000000000000307479330000000038000000480000006175647300001000800000AA00389B710100000000001000800000AA00389B71" Type="binary" Action="write" />
-						<?foreach EXT in $(var.ASAP_EXTS)?>
-							<RegistryValue Root="HKCR" Key="Media Type\Extensions\.$(var.EXT)" Name="Source Filter" Value="{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}" Type="string" Action="write" />
-						<?endforeach?>
-						<?foreach EXT in $(var.ASAP_EXTS)?>
-							<RegistryValue Root="HKLM" Key="Software\Microsoft\Multimedia\WMPlayer\Extensions\.$(var.EXT)" Name="Permissions" Value="15" Type="integer" Action="write" /><!-- 143 = transcoding -->
-							<RegistryValue Root="HKLM" Key="Software\Microsoft\Multimedia\WMPlayer\Extensions\.$(var.EXT)" Name="Runtime" Value="7" Type="integer" Action="write" />
-						<?endforeach?>
-						<RegistryValue Root="HKLM" Key="Software\Microsoft\MediaPlayer\Player\Extensions\MUIDescriptions" Name="ASAP" Value="ASAP files ($(var.EXT_FILTER))" Type="string" Action="write" />
-						<RegistryValue Root="HKLM" Key="Software\Microsoft\MediaPlayer\Player\Extensions\Types" Name="ASAP" Value="$(var.EXT_FILTER)" Type="string" Action="write" />
-					</Component>
-					<?if $(sys.BUILDARCH) = x86?>
-					<Component Id="asap_dsf.ext">
-						<RegistryValue Root="HKCR" Key="asap.file" Name="asap_dsf" Type="integer" Value="1" KeyPath="yes" />
-						<ProgId Id="asap.file">
-							<Extension Id="sap">
-								<Verb Id="open" TargetProperty="WMP.EXE" Argument='"%1"' />
-							</Extension>
-							<?foreach EXT in $(var.NATIVE_EXTS)?>
-								<Extension Id="$(var.EXT)" />
-							<?endforeach?>
-						</ProgId>
-					</Component>
-					<?endif?>
-
-					<Component Id="ASAPShellEx.dll" Win64="$(var.WIN64)">
-						<File Name="ASAPShellEx.dll" Source="$(var.SRC_DIR)ASAPShellEx.dll" Checksum="yes" KeyPath="yes">
-							<Class Id="{5AE26367-B5CF-444D-B163-2CBC99B41287}" Context="InprocServer32" Description="ASAP Metadata Handler" ThreadingModel="both" />
-						</File>
-						<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{5AE26367-B5CF-444D-B163-2CBC99B41287}" Value="ASAP Metadata Handler" Type="string" Action="write" />
-					</Component>
-					<Component Id="ASAPShellEx.propdesc" Win64="$(var.WIN64)">
-						<Condition>VersionNT &gt;= 600</Condition>
-						<File Name="ASAPShellEx.propdesc" Source="shellex\ASAPShellEx.propdesc" KeyPath="yes" />
-					</Component>
-					<Component Id="ASAPShellExXP.reg" Win64="$(var.WIN64)">
-						<Condition>VersionNT &lt; 600</Condition>
-						<RegistryValue Root="HKCR" Key="Folder\shellex\ColumnHandlers\{5AE26367-B5CF-444D-B163-2CBC99B41287}" Value="ASAP Column Handler" Type="string" Action="write" KeyPath="yes" />
-					</Component>
-					<Component Id="ASAPShellExVista.reg" Win64="$(var.WIN64)">
-						<Condition>VersionNT &gt;= 600</Condition>
-						<?foreach EXT in $(var.ASAP_EXTS)?>
-							<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.$(var.EXT)" Value="{5AE26367-B5CF-444D-B163-2CBC99B41287}" Type="string" Action="write" />
-							<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Explorer\KindMap" Name=".$(var.EXT)" Value="music" Type="string" Action="write" />
-							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="InfoTip" Value="prop:System.ItemType;System.Size;System.Media.Duration" Type="string" Action="write" />
-							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="ExtendedTileInfo" Value="prop:System.ItemType;System.Size;System.Media.Duration" Type="string" Action="write" />
-							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="PreviewDetails" Value="prop:*System.Title;*System.Media.Duration;*System.Size;*System.Author;*System.Media.Year" Type="string" Action="write" />
-						<?endforeach?>
-						<?define FULLDETAILS_COMMON=System.PropGroup.Audio;System.Media.Duration;System.Audio.ChannelCount;ASAP.Subsongs;ASAP.PALNTSC;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes?>
-						<RegistryValue Root="HKCR" Key=".sap" Name="FullDetails" Value="prop:System.PropGroup.Description;System.Author;System.Title;System.Media.Year;$(var.FULLDETAILS_COMMON)" Type="string" Action="write" />
-						<?foreach EXT in rmt;tmc;tm8;tm2?>
-							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="FullDetails" Value="prop:System.PropGroup.Description;System.Title;$(var.FULLDETAILS_COMMON)" Type="string" Action="write" />
-						<?endforeach?>
-						<?foreach EXT in cmc;cm3;cmr;cms;dmc;dlt;mpt;mpd;fc?>
-							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="FullDetails" Value="prop:$(var.FULLDETAILS_COMMON)" Type="string" Action="write" />
-						<?endforeach?>
-					</Component>
-
-					<?if $(sys.BUILDARCH) = x86?>
-					<Component Id="sap2txt.exe">
-						<File Name="sap2txt.exe" Source="sap2txt.exe" Checksum="yes" KeyPath="yes" />
-					</Component>
-					<Component Id="diff_sap.js">
-						<File Name="diff-sap.js" Source="diff-sap.js" KeyPath="yes" />
-					</Component>
-					<Component Id="diff_sap_tsvn.reg">
-						<RegistryValue Root="HKCU" Key="Software\TortoiseSVN\DiffTools" Name=".sap" Value="wscript.exe &quot;[#diff_sap.js]&quot; %base %mine %bname %yname //E:javascript" Type="string" Action="write" KeyPath="yes" />
-					</Component>
-					<Component Id="diff_sap_tgit.reg">
-						<RegistryValue Root="HKCU" Key="Software\TortoiseGit\DiffTools" Name=".sap" Value="wscript.exe &quot;[#diff_sap.js]&quot; %base %mine %bname %yname //E:javascript" Type="string" Action="write" KeyPath="yes" />
-					</Component>
-
-					<Component Id="README_WindowsSetup.html">
-						<File Name="README_WindowsSetup.html" Source="README_WindowsSetup.html" KeyPath="yes" />
-					</Component>
-					<?endif?>
-				</Directory>
-
-				<?if $(sys.BUILDARCH) = x86?>
-				<Directory Id="WINAMP.DIR" Name="Winamp">
-					<Directory Id="WINAMPPLUG.DIR" Name="Plugins">
-						<Component Id="in_asap.dll">
-							<File Name="in_asap.dll" Source="in_asap.dll" Checksum="yes" KeyPath="yes" />
-						</Component>
-						<Component Id="in_asap.ext">
-							<RegistryValue Root="HKCR" Key="Winamp.File" Name="in_asap" Type="integer" Value="1" KeyPath="yes" />
-							<ProgId Id="Winamp.File">
-								<Extension Id="sap">
-									<Verb Id="open" TargetProperty="WINAMP.EXE" Argument='"%1"' />
-								</Extension>
-								<?foreach EXT in $(var.NATIVE_EXTS)?>
-									<Extension Id="$(var.EXT)" />
-								<?endforeach?>
-							</ProgId>
-						</Component>
-					</Directory>
-				</Directory>
-				<Directory Id="FOO.DIR" Name="foobar2000">
-					<Directory Id="FOOCOMP.DIR" Name="components">
-						<Component Id="foo_asap.dll">
-							<File Name="foo_asap.dll" Source="foo_asap.dll" Checksum="yes" KeyPath="yes" />
-						</Component>
-						<Component Id="foo_asap.ext">
-							<RegistryValue Root="HKCR" Key="asap.file" Name="foo_asap" Type="integer" Value="1" KeyPath="yes" />
-							<?foreach EXT in $(var.NATIVE_EXTS)?>
-								<ProgId Id="foobar2000.$(var.EXT)">
-									<Extension Id="$(var.EXT)">
-										<Verb Id="open" TargetProperty="FOO.EXE" Argument='"%1"' />
-									</Extension>
-								</ProgId>
-							<?endforeach?>
-						</Component>
-					</Directory>
-				</Directory>
-				<Directory Id="XBMC.DIR" Name="XBMC">
-					<Directory Id="XBMCSYS.DIR" Name="system">
-						<Directory Id="XBMCPLS.DIR" Name="players">
-							<Directory Id="XBMCPAPL.DIR" Name="paplayer">
-								<Component Id="xbmc_asap.dll">
-									<File Name="xbmc_asap.dll" Source="xbmc_asap.dll" Checksum="yes" KeyPath="yes" />
-								</Component>
-							</Directory>
-						</Directory>
-					</Directory>
-				</Directory>
-				<Directory Id="APOLLO.DIR" Name="Apollo">
-					<Directory Id="APOLLOPLUG.DIR" Name="Plug-ins">
-						<Component Id="ASAP_Apollo.dll">
-							<File Name="ASAP_Apollo.dll" Source="ASAP_Apollo.dll" Checksum="yes" KeyPath="yes" />
-						</Component>
-						<Component Id="ASAP_Apollo.ext">
-							<RegistryValue Root="HKCR" Key="Apollo.Track" Name="ASAP_Apollo" Type="integer" Value="1" KeyPath="yes" />
-							<ProgId Id="Apollo.Track">
-								<Extension Id="sap">
-									<Verb Id="Play" TargetProperty="APOLLO.EXE" Argument='"%1"' />
-								</Extension>
-								<?foreach EXT in $(var.NATIVE_EXTS)?>
-									<Extension Id="$(var.EXT)" />
-								<?endforeach?>
-							</ProgId>
-						</Component>
-					</Directory>
-				</Directory>
-				<Directory Id="XMPLAY.DIR" Name="XMPlay">
-					<Component Id="xmp_asap.dll">
-						<File Name="xmp-asap.dll" Source="xmp-asap.dll" Checksum="yes" KeyPath="yes" />
-					</Component>
-					<Component Id="xmp_asap.ext">
-						<RegistryValue Root="HKCR" Key="asap.file" Name="xmp_asap" Type="integer" Value="1" KeyPath="yes" />
-						<ProgId Id="XMPlay">
-							<Extension Id="sap">
-								<Verb Id="open" Command="&amp;Open with XMPlay" TargetProperty="XMPLAY.EXE" />
-							</Extension>
-							<?foreach EXT in $(var.NATIVE_EXTS)?>
-								<Extension Id="$(var.EXT)" />
-							<?endforeach?>
-						</ProgId>
-					</Component>
-				</Directory>
-				<Directory Id="AIMP.DIR" Name="AIMP3">
-					<Directory Id="AIMPPLUG.DIR" Name="Plugins">
-						<Component Id="bass_asap.dll">
-							<File Name="bass_asap.dll" Source="bass_asap.dll" Checksum="yes" KeyPath="yes" />
-						</Component>
-						<Component Id="aimp_asap.ext">
-							<RegistryValue Root="HKCR" Key="asap.file" Name="aimp" Type="integer" Value="1" KeyPath="yes" />
-							<ProgId Id="AIMP.ASAP">
-								<Extension Id="sap">
-									<Verb Id="open" Command="Open with AIMP" TargetProperty="AIMP.EXE" Argument='"%1"' />
-								</Extension>
-								<?foreach EXT in $(var.NATIVE_EXTS)?>
-									<Extension Id="$(var.EXT)" />
-								<?endforeach?>
-							</ProgId>
-						</Component>
-					</Directory>
-				</Directory>
-				<Directory Id="GSP.DIR" Name="GSPlayer">
-					<Component Id="gspasap.dll">
-						<File Name="gspasap.dll" Source="gspasap.dll" Checksum="yes" KeyPath="yes" />
-					</Component>
-				</Directory>
-				<Directory Id="RMT.DIR" Name="RMT">
-					<Component Id="apokeysnd.dll">
-						<File Name="apokeysnd.dll" Source="apokeysnd.dll" Checksum="yes" KeyPath="yes" />
-					</Component>
-				</Directory>
-				<Directory Id="AUDACIOUS.DIR" Name="audacious-3.4">
-					<Directory Id="AUDLIB.DIR" Name="lib">
-						<Directory Id="AUDAUD.DIR" Name="audacious">
-							<Directory Id="AUDINPUT.DIR" Name="Input">
-								<Component Id="asapplug.dll">
-									<File Name="asapplug.dll" Source="asapplug.dll" Checksum="yes" KeyPath="yes" />
-								</Component>
-							</Directory>
-						</Directory>
-					</Directory>
-				</Directory>
-				<Directory Id="VIDEOLAN.DIR" Name="VideoLAN">
-					<Directory Id="VLC.DIR" Name="VLC">
-						<Directory Id="VLCPLUGINS.DIR" Name="plugins">
-							<Directory Id="VLCDEMUX.DIR" Name="demux">
-								<Component Id="libasap_plugin.dll">
-									<File Name="libasap_plugin.dll" Source="libasap_plugin.dll" Checksum="yes" KeyPath="yes" />
-								</Component>
-								<Component Id="libasap_plugin.ext">
-									<RegistryValue Root="HKCR" Key="asap.file" Name="vlc" Type="integer" Value="1" KeyPath="yes" />
-									<ProgId Id="VLC.sap">
-										<Extension Id="sap">
-											<Verb Id="open" TargetProperty="VLC.EXE" Argument='--started-from-file "%1"' />
-										</Extension>
-										<Extension Id="fc" />
-										<Extension Id="rmt" />
-									</ProgId>
-								</Component>
-							</Directory>
-						</Directory>
-					</Directory>
-				</Directory>
-				<?endif?>
-			</Directory>
-
-			<?if $(sys.BUILDARCH) = x86?>
-			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Directory Id="menu.dir" Name="ASAP">
-					<Component Id="WASAP.lnk">
-						<RegistryValue Root="HKCU" Key="Software\ASAP" Name="ProgramsMenuWASAP" Type="integer" Value="1" KeyPath="yes" />
-						<Shortcut Id="WASAP.lnk" Name="WASAP" Target="[#wasap.exe]" />
-					</Component>
-					<Component Id="Documentation.lnk">
-						<RemoveFolder Id="menu.dir" On="uninstall" />
-						<RegistryValue Root="HKCU" Key="Software\ASAP" Name="ProgramsMenuDoc" Type="integer" Value="1" KeyPath="yes" />
-						<Shortcut Id="Documentation.lnk" Name="Documentation" Target="[#README_WindowsSetup.html]" />
-					</Component>
-					<Component Id="Website.url" Guid="07CB02BE-17AE-49AA-87B1-D0315CF2D47A">
-						<RegistryValue Root="HKCU" Key="Software\ASAP" Name="ProgramsMenuWebsite" Type="integer" Value="1" KeyPath="yes" />
-						<!-- <util:InternetShortcut Id="Website.url" Name="Website" Target="http://asap.sourceforge.net/" /> = 150 kB overhead on MSI -->
-						<!-- <IniFile Id="Website.url" Name="Website.url" Directory="menu.dir" Action="addLine" Section="InternetShortcut" Key="URL" Value="http://asap.sourceforge.net/" /> = 0.5 kB bigger MSI than with File -->
-						<File Name="Website.url" Source="Website.url" />
-					</Component>
-					<!--
-					<Component Id="uninstall.lnk">
-						<RegistryValue Root="HKCU" Key="Software\ASAP" Name="ProgramsMenuUninstall" Type="integer" Value="1" KeyPath="yes" />
-						<Shortcut Id="uninstall.lnk" Name="Uninstall" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
-					</Component>
-					-->
-				</Directory>
-			</Directory>
-			<Directory Id="DesktopFolder" Name="Desktop">
-				<Component Id="WASAP.desktop">
-					<RegistryValue Root="HKCU" Key="Software\ASAP" Name="DesktopWASAP" Type="integer" Value="1" KeyPath="yes" />
-					<Shortcut Id="WASAP.desktop" Name="WASAP" Target="[#wasap.exe]" />
-				</Component>
-			</Directory>
-			<?endif?>
-		</Directory>
-
-		<?if $(sys.BUILDARCH) = x86?>
-		<Feature Id="wasap" Title="WASAP" Level="1" ConfigurableDirectory="ASAP.DIR" Description="Tiny player controlled by a tray icon." AllowAdvertise="no">
-			<ComponentRef Id="wasap.exe" />
-			<Feature Id="wasap.lnk" Title="Start menu shortcut" Level="1" Description="Adds WASAP to the Programs menu." AllowAdvertise="no">
-				<ComponentRef Id="WASAP.lnk" />
-			</Feature>
-			<Feature Id="wasap.desktop" Title="Desktop shortcut" Level="9" Description="Adds WASAP to the desktop." AllowAdvertise="no">
-				<ComponentRef Id="WASAP.desktop" />
-			</Feature>
-			<Feature Id="wasap.ext" Title="Associate file types" Level="9" Description="$(var.DOUBLECLICK) WASAP." AllowAdvertise="no">
-				<ComponentRef Id="wasap.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="asapconv" Title="asapconv" Level="1" ConfigurableDirectory="ASAP.DIR" Description="Command-line converter." AllowAdvertise="no">
-			<ComponentRef Id="asapconv.exe" />
-			<Feature Id="path" Title="Add to Path" Level="1" Description="Add the directory to the Path environment variable so that you don't have to type the location of asapconv at the command prompt." AllowAdvertise="no">
-				<ComponentRef Id="path" />
-			</Feature>
-		</Feature>
-		<?endif?>
-		<Feature Id="asap_dsf" Title="Windows Media Player plugin" Level="1" ConfigurableDirectory="ASAP.DIR" Description="Plugin for Windows Media Player." AllowAdvertise="no">
-			<ComponentRef Id="asap_dsf.dll" />
-			<?if $(sys.BUILDARCH) = x86?>
-			<Feature Id="asap_dsf.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) Windows Media Player." AllowAdvertise="no">
-				<Condition Level="9">WMP.EXE</Condition>
-				<ComponentRef Id="asap_dsf.ext" />
-			</Feature>
-			<?endif?>
-		</Feature>
-		<?if $(sys.BUILDARCH) = x86?>
-		<Feature Id="in_asap" Title="Winamp plugin" Level="9" ConfigurableDirectory="WINAMPPLUG.DIR" Description="Plugin for Winamp." AllowAdvertise="no">
-			<Condition Level="1">WINAMP.DIR</Condition>
-			<ComponentRef Id="in_asap.dll" />
-			<Feature Id="in_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) Winamp." AllowAdvertise="no">
-				<Condition Level="9">WINAMP.EXE</Condition>
-				<ComponentRef Id="in_asap.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="foo_asap" Title="foobar2000 plugin" Level="9" ConfigurableDirectory="FOOCOMP.DIR" Description="Plugin for foobar2000." AllowAdvertise="no">
-			<Condition Level="1">FOO.DIR</Condition>
-			<ComponentRef Id="foo_asap.dll" />
-			<Feature Id="foo_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) foobar2000." AllowAdvertise="no">
-				<Condition Level="9">FOO.EXE</Condition>
-				<ComponentRef Id="foo_asap.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="xbmc_asap" Title="XBMC plugin" Level="9" ConfigurableDirectory="XBMCPAPL.DIR" Description="Plugin for XBMC (Windows and XBox)." AllowAdvertise="no">
-			<Condition Level="1">XBMC.DIR</Condition>
-			<ComponentRef Id="xbmc_asap.dll" />
-		</Feature>
-		<Feature Id="ASAP_Apollo" Title="Apollo plugin" Level="9" ConfigurableDirectory="APOLLOPLUG.DIR" Description="Plugin for Apollo." AllowAdvertise="no">
-			<Condition Level="1">APOLLO.DIR</Condition>
-			<ComponentRef Id="ASAP_Apollo.dll" />
-			<Feature Id="ASAP_Apollo.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) Apollo." AllowAdvertise="no">
-				<Condition Level="9">APOLLO.EXE</Condition>
-				<ComponentRef Id="ASAP_Apollo.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="xmp_asap" Title="XMPlay plugin" Level="9" ConfigurableDirectory="XMPLAY.DIR" Description="Plugin for XMPlay." AllowAdvertise="no">
-			<Condition Level="1">XMPLAY.DIR</Condition>
-			<ComponentRef Id="xmp_asap.dll" />
-			<Feature Id="xmp_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) XMPlay." AllowAdvertise="no">
-				<Condition Level="9">XMPLAY.EXE</Condition>
-				<ComponentRef Id="xmp_asap.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="aimp_asap" Title="AIMP plugin" Level="9" ConfigurableDirectory="AIMPPLUG.DIR" Description="Plugin for AIMP." AllowAdvertise="no">
-			<Condition Level="1">AIMP.DIR</Condition>
-			<ComponentRef Id="bass_asap.dll" />
-			<Feature Id="aimp_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) AIMP." AllowAdvertise="no">
-				<Condition Level="9">AIMP.EXE</Condition>
-				<ComponentRef Id="aimp_asap.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="gspasap" Title="GSPlayer plugin" Level="9" ConfigurableDirectory="GSP.DIR" Description="Plugin for GSPlayer (desktop Windows only)." AllowAdvertise="no">
-			<ComponentRef Id="gspasap.dll" />
-		</Feature>
-		<Feature Id="asapplug" Title="Audacious 3.4 plugin" Level="9" ConfigurableDirectory="AUDACIOUS.DIR" Description="Plugin for Audacious (not guaranteed to work with Audacious other than 3.4)." AllowAdvertise="no">
-			<ComponentRef Id="asapplug.dll" />
-		</Feature>
-		<Feature Id="libasap_plugin" Title="VLC plugin" Level="9" ConfigurableDirectory="VLC.DIR" Description="Plugin for VLC (SAP format only)." AllowAdvertise="no">
-			<Condition Level="1">VLC.DIR</Condition>
-			<ComponentRef Id="libasap_plugin.dll" />
-			<Feature Id="libasap_plugin.ext" Title="Associate file types" Level="0" Description="Double-click SAP file in Windows Explorer to play it in VLC." AllowAdvertise="no">
-				<Condition Level="9">VLC.EXE</Condition>
-				<ComponentRef Id="libasap_plugin.ext" />
-			</Feature>
-		</Feature>
-		<Feature Id="apokeysnd" Title="RMT sound emulator" Level="9" ConfigurableDirectory="RMT.DIR" Description="POKEY sound emulation engine for Raster Music Tracker." AllowAdvertise="no">
-			<ComponentRef Id="apokeysnd.dll" />
-		</Feature>
-		<?endif?>
-
-		<Feature Id="ASAPShellEx" Title="Windows Explorer extension" Level="$(var.SHELL_EX_LEVEL)" ConfigurableDirectory="ASAP.DIR" Description="Shows metadata (title, author, year, duration, subsongs) in Windows Explorer." AllowAdvertise="no">
-			<ComponentRef Id="ASAPShellEx.dll" />
-			<ComponentRef Id="ASAPShellEx.propdesc" />
-			<ComponentRef Id="ASAPShellExXP.reg" />
-			<ComponentRef Id="ASAPShellExVista.reg" />
-		</Feature>
-
-		<?if $(sys.BUILDARCH) = x86?>
-		<Feature Id="diff_sap_tsvn" Title="TortoiseSVN diff viewer" Level="0" Description="Compare changes in SAP files." AllowAdvertise="no">
-			<Condition Level="1">TSVN.VER</Condition>
-			<ComponentRef Id="sap2txt.exe" />
-			<ComponentRef Id="diff_sap.js" />
-			<ComponentRef Id="diff_sap_tsvn.reg" />
-		</Feature>
-		<Feature Id="diff_sap_tgit" Title="TortoiseGit diff viewer" Level="0" Description="Compare changes in SAP files." AllowAdvertise="no">
-			<Condition Level="1">TGIT.VER</Condition>
-			<ComponentRef Id="sap2txt.exe" />
-			<ComponentRef Id="diff_sap.js" />
-			<ComponentRef Id="diff_sap_tgit.reg" />
-		</Feature>
-
-		<Feature Id="docs" Title="Documentation" Level="1" ConfigurableDirectory="ASAP.DIR" Description="Documentation file." AllowAdvertise="no">
-			<ComponentRef Id="README_WindowsSetup.html" />
-			<Feature Id="docs.lnk" Title="Start menu shortcuts" Level="1" Description="Adds documentation and website links to the Programs menu." AllowAdvertise="no">
-				<ComponentRef Id="Documentation.lnk" />
-				<ComponentRef Id="Website.url" />
-			</Feature>
-		</Feature>
-		<!--
-		<Feature Id="uninstall" Title="Uninstall shortcut" Level="1" Description="Adds uninstall link to the Programs menu (in addition to the Control Panel which is always available)." AllowAdvertise="no">
-			<ComponentRef Id="uninstall.lnk" />
-		</Feature>
-		-->
-		<?endif?>
-
-		<CustomAction Id="InstallPropertySchema" DllEntry="InstallPropertySchema" FileKey="ASAPShellEx.dll" Execute="deferred" Impersonate="no" />
-		<CustomAction Id="UninstallPropertySchema" DllEntry="UninstallPropertySchema" FileKey="ASAPShellEx.dll" Execute="deferred" Impersonate="no" />
-
-		<InstallExecuteSequence>
-			<Custom Action="UninstallPropertySchema" After="SelfUnregModules">$ASAPShellEx.propdesc = 2</Custom>
-			<Custom Action="InstallPropertySchema" After="SelfRegModules">$ASAPShellEx.propdesc = 3</Custom>
-		</InstallExecuteSequence>
-
-	</Product>
-</Wix>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/license.rtf kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/license.rtf
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/license.rtf	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/license.rtf	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-{\rtf1\ansi\ansicpg1252
-{\fonttbl {\f0\fswiss\fcharset0 Arial;}}
-\f0\sa100\fs18\lang1033
-
-Copyright (C) 2005-2012 - Piotr Fusik
-
-\par\ql
-ASAP is free. You don't have to pay for it, and you can use it 
-any way you want. It is developed as an Open Source project under the 
-GNU General Public License (GPL). That means you have full access to 
-the source code of this program. You can find it on our website at 
-http://asap.sourceforge.net/
-
-\par
-Should you wish to modify or redistribute this program, or any part of it, 
-you should read the full terms and conditions set out in the license 
-agreement before doing so. A copy of the license is in the COPYING file 
-attached to the source code.
-
-\par
-If you simply wish to install and use this software, you need only be aware of 
-the disclaimer conditions in the license, which are set out below.
-
-\par\b
-NO WARRANTY
-
-\par\b0
-Because the program is licensed free of charge, there is no warranty 
-for the program, to the extent permitted by applicable law.  Except when 
-otherwise stated in writing the copyright holders and/or other parties 
-provide the program "as is" without warranty of any kind, either expressed 
-or implied, including, but not limited to, the implied warranties of 
-merchantability and fitness for a particular purpose.  The entire risk as 
-to the quality and performance of the program is with you.  Should the 
-program prove defective, you assume the cost of all necessary servicing, 
-repair or correction.
-
-\par
-In no event unless required by applicable law or agreed to in writing 
-will any copyright holder, or any other party who may modify and/or 
-redistribute the program as permitted above, be liable to you for damages, 
-including any general, special, incidental or consequential damages arising 
-out of the use or inability to use the program (including but not limited 
-to loss of data or data being rendered inaccurate or losses sustained by 
-you or third parties or a failure of the program to operate with any other 
-programs), even if such holder or other party has been advised of the 
-possibility of such damages.
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/Website.url kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/Website.url
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/Website.url	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/Website.url	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=http://asap.sourceforge.net/
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/wix_mutex.pl kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/wix_mutex.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/setup/wix_mutex.pl	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/setup/wix_mutex.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-# Generate mutual exclusion conditions
-use strict;
-my @c = qw(wasap.ext asap_dsf.ext in_asap.ext foo_asap.ext ASAP_Apollo.ext xmp_asap.ext aimp_asap.ext libasap_plugin.ext);
-my @a = map "\$$_=3 OR (\$$_=-1 AND ?$_=3)", @c; # action is install or (action is nothing and already installed)
-my $i = 0;
-for my $a (@a[0 .. $#a - 1]) {
-	my @b = @a[++$i .. $#a];
-	while (@b) {
-		$_ = "(($a) AND (" . shift @b;
-		while (@b) {
-			my $t = "$_ OR $b[0]";
-			last if length($t) > 198;
-			$_ = $t;
-			shift @b;
-		}
-		print "$_));\n";
-	}
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/shellex/ASAPShellEx.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/shellex/ASAPShellEx.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/shellex/ASAPShellEx.cpp	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/shellex/ASAPShellEx.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,835 +0,0 @@
-/*
- * ASAPShellEx.cpp - ASAP Column Handler and Property Handler shell extensions
- *
- * Copyright (C) 2010-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* There are two separate implementations for different Windows versions:
-   Column Handler (IColumnProvider) works in Windows XP and 2003 (probably 2000 too and maybe 98).
-   Property Handler (IInitializeWithStream+IPropertyStore+IPropertyStoreCapabilities) works in Windows Vista and 7. */
-
-#include <stdio.h>
-#define _WIN32_IE 0x500
-#include <shlobj.h>
-#include <shlwapi.h>
-
-#ifdef __MINGW32__
-/* missing in MinGW */
-
-extern "C" const FMTID FMTID_AudioSummaryInformation =
-	{ 0x64440490, 0x4c8b, 0x11d1, { 0x8b, 0x70, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03 } };
-
-#ifndef __MINGW64__
-/* missing just in 32-bit MinGW */
-extern "C" const FMTID FMTID_MUSIC =
-	{ 0x56a3372e, 0xce9c, 0x11d2, { 0x9f, 0x0e, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6 } };
-extern "C" const FMTID FMTID_SummaryInformation =
-	{ 0xf29f85e0, 0x4ff9, 0x1068, { 0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9 } };
-#define PIDSI_ARTIST          2
-#define PIDSI_YEAR            5
-#define PIDASI_TIMELENGTH     3
-#define PIDASI_CHANNEL_COUNT  7
-#define SHCDF_UPDATEITEM      1
-
-typedef SHCOLUMNID PROPERTYKEY;
-#define REFPROPERTYKEY const PROPERTYKEY &
-#define REFPROPVARIANT const PROPVARIANT &
-
-#undef INTERFACE
-
-static const IID IID_IInitializeWithStream =
-	{ 0xb824b49d, 0x22ac, 0x4161, { 0xac, 0x8a, 0x99, 0x16, 0xe8, 0xfa, 0x3f, 0x7f } };
-#define INTERFACE IInitializeWithStream
-DECLARE_INTERFACE_(IInitializeWithStream, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID, PVOID *) PURE;
-	STDMETHOD_(ULONG, AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG, Release)(THIS) PURE;
-	STDMETHOD(Initialize)(THIS_ IStream *, DWORD) PURE;
-};
-#undef INTERFACE
-
-static const IID IID_IPropertyStore =
-	{ 0x886d8eeb, 0x8cf2, 0x4446, { 0x8d, 0x02, 0xcd, 0xba, 0x1d, 0xbd, 0xcf, 0x99 } };
-#define INTERFACE IPropertyStore
-DECLARE_INTERFACE_(IPropertyStore, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID, PVOID *) PURE;
-	STDMETHOD_(ULONG, AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG, Release)(THIS) PURE;
-	STDMETHOD(GetCount)(THIS_ DWORD *) PURE;
-	STDMETHOD(GetAt)(THIS_ DWORD, PROPERTYKEY *) PURE;
-	STDMETHOD(GetValue)(THIS_ REFPROPERTYKEY, PROPVARIANT *) PURE;
-	STDMETHOD(SetValue)(THIS_ REFPROPERTYKEY, REFPROPVARIANT) PURE;
-	STDMETHOD(Commit)(THIS) PURE;
-};
-#undef INTERFACE
-
-static const IID IID_IPropertyStoreCapabilities =
-    { 0xc8e2d566, 0x186e, 0x4d49, { 0xbf, 0x41, 0x69, 0x09, 0xea, 0xd5, 0x6a, 0xcc } };
-#define INTERFACE IPropertyStoreCapabilities
-DECLARE_INTERFACE_(IPropertyStoreCapabilities, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID, PVOID *) PURE;
-	STDMETHOD_(ULONG, AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG, Release)(THIS) PURE;
-	STDMETHOD(IsPropertyWritable)(THIS_ REFPROPERTYKEY) PURE;
-};
-#undef INTERFACE
-
-#endif
-/* end missing in MinGW */
-#endif
-
-#include "asap-infowriter.h"
-
-static const char extensions[][5] =
-	{ ".sap", ".cmc", ".cm3", ".cmr", ".cms", ".dmc", ".dlt", ".mpt", ".mpd", ".rmt", ".tmc", ".tm8", ".tm2", ".fc" };
-#define N_EXTS (int) (sizeof(extensions) / sizeof(extensions[0]))
-
-static HINSTANCE g_hDll;
-static LONG g_cRef = 0;
-static enum { WINDOWS_OLD, WINDOWS_XP, WINDOWS_VISTA } g_windowsVer;
-
-static void DllAddRef(void)
-{
-	InterlockedIncrement(&g_cRef);
-}
-
-static void DllRelease(void)
-{
-	InterlockedDecrement(&g_cRef);
-}
-
-#define CLSID_ASAPMetadataHandler_str "{5AE26367-B5CF-444D-B163-2CBC99B41287}"
-static const GUID CLSID_ASAPMetadataHandler =
-	{ 0x5ae26367, 0xb5cf, 0x444d, { 0xb1, 0x63, 0x2c, 0xbc, 0x99, 0xb4, 0x12, 0x87 } };
-
-struct CMyPropertyDef
-{
-	SHCOLUMNID scid;
-	UINT cChars;
-	DWORD csFlags;
-	LPCWSTR wszTitle;
-
-	void CopyTo(SHCOLUMNINFO *psci) const
-	{
-		psci->scid = this->scid;
-		psci->vt = VT_LPWSTR;
-		psci->fmt = LVCFMT_LEFT;
-		psci->cChars = this->cChars;
-		psci->csFlags = this->csFlags;
-		lstrcpyW(psci->wszTitle, this->wszTitle);
-		lstrcpyW(psci->wszDescription, this->wszTitle);
-	}
-};
-
-static const CMyPropertyDef g_propertyDefs[] = {
-	{ { FMTID_SummaryInformation, PIDSI_TITLE }, 25, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Title" },
-	{ { FMTID_SummaryInformation, PIDSI_AUTHOR }, 25, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Author" },
-	{ { FMTID_MUSIC, PIDSI_ARTIST }, 25, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Artist" },
-	{ { FMTID_MUSIC, PIDSI_YEAR }, 4, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Year" },
-	{ { FMTID_AudioSummaryInformation, PIDASI_TIMELENGTH }, 8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Duration" },
-	{ { FMTID_AudioSummaryInformation, PIDASI_CHANNEL_COUNT }, 9, SHCOLSTATE_TYPE_INT | SHCOLSTATE_SLOW, L"Channels" },
-	{ { CLSID_ASAPMetadataHandler, 1 }, 8, SHCOLSTATE_TYPE_INT | SHCOLSTATE_SLOW, L"Subsongs" },
-	{ { CLSID_ASAPMetadataHandler, 2 }, 8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"PAL/NTSC" }
-};
-#define N_PROPERTYDEFS (sizeof(g_propertyDefs) / sizeof(g_propertyDefs[0]))
-
-class CMyLock
-{
-	PCRITICAL_SECTION m_pLock;
-
-public:
-
-	CMyLock(PCRITICAL_SECTION pLock)
-	{
-		m_pLock = pLock;
-		EnterCriticalSection(pLock);
-	}
-
-	~CMyLock()
-	{
-		LeaveCriticalSection(m_pLock);
-	}
-};
-
-class CMemoryByteWriter
-{
-	static void WriteByte(void *obj, int value)
-	{
-		CMemoryByteWriter *self = (CMemoryByteWriter *) obj;
-		if (self->length < ASAPInfo_MAX_MODULE_LENGTH)
-			self->module[self->length++] = (byte) value;
-	}
-
-public:
-
-	byte module[ASAPInfo_MAX_MODULE_LENGTH];
-	int length;
-
-	CMemoryByteWriter() : length(0) { }
-
-	ByteWriter GetByteWriter()
-	{
-		ByteWriter bw = { this, WriteByte };
-		return bw;
-	}
-};
-
-class CASAPMetadataHandler : IColumnProvider, IInitializeWithStream, IPropertyStore, IPropertyStoreCapabilities
-{
-	LONG m_cRef;
-	CRITICAL_SECTION m_lock;
-	WCHAR m_filename[MAX_PATH];
-	BOOL m_hasInfo;
-	IStream *m_pstream;
-	ASAPInfo *m_pinfo;
-
-	HRESULT LoadFile(LPCWSTR wszFile, IStream *pstream, DWORD grfMode)
-	{
-		m_hasInfo = FALSE;
-		if (m_pstream != NULL) {
-			m_pstream->Release();
-			m_pstream = NULL;
-		}
-
-		int cbFilename = WideCharToMultiByte(CP_ACP, 0, wszFile, -1, NULL, 0, NULL, NULL);
-		char filename[cbFilename];
-		if (WideCharToMultiByte(CP_ACP, 0, wszFile, -1, filename, cbFilename, NULL, NULL) <= 0)
-			return HRESULT_FROM_WIN32(GetLastError());
-
-		byte module[ASAPInfo_MAX_MODULE_LENGTH];
-		int module_len;
-		if (pstream != NULL) {
-			HRESULT hr = pstream->Read(module, ASAPInfo_MAX_MODULE_LENGTH, (ULONG *) &module_len);
-			if (FAILED(hr))
-				return hr;
-		}
-		else {
-			HANDLE fh = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
-			if (fh == INVALID_HANDLE_VALUE)
-				return HRESULT_FROM_WIN32(GetLastError());
-			if (!ReadFile(fh, module, ASAPInfo_MAX_MODULE_LENGTH, (LPDWORD) &module_len, NULL)) {
-				HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
-				CloseHandle(fh);
-				return hr;
-			}
-			CloseHandle(fh);
-		}
-
-		m_hasInfo = ASAPInfo_Load(m_pinfo, filename, module, module_len);
-		if (m_hasInfo && (grfMode & STGM_READWRITE) != 0) {
-			const char *ext = strrchr(filename, '.');
-			if (ext != NULL && _stricmp(ext, ".sap") == 0) {
-				m_pstream = pstream;
-				pstream->AddRef();
-			}
-		}
-		return S_OK;
-	}
-
-	static HRESULT GetString(PROPVARIANT *pvarData, const char *s)
-	{
-		pvarData->vt = VT_BSTR;
-		// pvarData->bstrVal = A2BSTR(s); - just don't want dependency on ATL
-		int cch = MultiByteToWideChar(CP_ACP, 0, s, -1, NULL, 0);
-		pvarData->bstrVal = SysAllocStringLen(NULL, cch - 1);
-		if (pvarData->bstrVal == NULL)
-			return E_OUTOFMEMORY;
-		if (MultiByteToWideChar(CP_ACP, 0, s, -1, pvarData->bstrVal, cch) <= 0)
-			return HRESULT_FROM_WIN32(GetLastError());
-		return S_OK;
-	}
-
-	HRESULT GetAuthors(PROPVARIANT *pvarData, BOOL vista)
-	{
-		const char *author = ASAPInfo_GetAuthor(m_pinfo);
-		if (!vista)
-			return GetString(pvarData, author);
-		if (author[0] == '\0') {
-			pvarData->vt = VT_EMPTY;
-			return S_OK;
-		}
-		// split on " & "
-		int i;
-		const char *s = author;
-		for (i = 1; ; i++) {
-			s = strstr(s, " & ");
-			if (s == NULL)
-				break;
-			s += 3;
-		}
-		pvarData->vt = VT_VECTOR | VT_LPSTR;
-		pvarData->calpstr.cElems = i;
-		LPSTR *pElems = (LPSTR *) CoTaskMemAlloc(i * sizeof(LPSTR));
-		pvarData->calpstr.pElems = pElems;
-		if (pElems == NULL)
-			return E_OUTOFMEMORY;
-		s = author;
-		for (i = 0; ; i++) {
-			const char *e = strstr(s, " & ");
-			size_t len = e != NULL ? e - s : strlen(s);
-			pElems[i] = (LPSTR) CoTaskMemAlloc(len + 1);
-			if (pElems[i] == NULL)
-				return E_OUTOFMEMORY;
-			memcpy(pElems[i], s, len);
-			pElems[i][len] = '\0';
-			if (e == NULL)
-				break;
-			s = e + 3;
-		}
-		return S_OK;
-	}
-
-	HRESULT GetData(LPCSHCOLUMNID pscid, PROPVARIANT *pvarData, BOOL vista)
-	{
-		if (!m_hasInfo)
-			return S_FALSE;
-
-		if (pscid->fmtid == FMTID_SummaryInformation) {
-			if (pscid->pid == PIDSI_TITLE)
-				return GetString(pvarData, ASAPInfo_GetTitle(m_pinfo));
-			if (pscid->pid == PIDSI_AUTHOR)
-				return GetAuthors(pvarData, vista);
-		}
-		else if (pscid->fmtid == FMTID_MUSIC) {
-			if (pscid->pid == PIDSI_ARTIST)
-				return GetAuthors(pvarData, vista);
-			if (pscid->pid == PIDSI_YEAR) {
-				int year = ASAPInfo_GetYear(m_pinfo);
-				if (year < 0) {
-					pvarData->vt = VT_EMPTY;
-					return S_OK;
-				}
-				pvarData->vt = VT_UI8;
-				pvarData->ulVal = (ULONG) year;
-				return S_OK;
-			}
-		}
-		else if (pscid->fmtid == FMTID_AudioSummaryInformation) {
-			if (pscid->pid == PIDASI_TIMELENGTH) {
-				int duration = ASAPInfo_GetDuration(m_pinfo, ASAPInfo_GetDefaultSong(m_pinfo));
-				if (duration < 0) {
-					pvarData->vt = VT_EMPTY;
-					return S_OK;
-				}
-				if (g_windowsVer == WINDOWS_OLD) {
-					duration /= 1000;
-					char timeStr[16];
-					sprintf(timeStr, "%02d:%02d:%02d", duration / 3600, duration / 60 % 60, duration % 60);
-					return GetString(pvarData, timeStr);
-				}
-				else {
-					pvarData->vt = VT_UI8;
-					pvarData->uhVal.QuadPart = 10000ULL * duration;
-					return S_OK;
-				}
-			}
-			if (pscid->pid == PIDASI_CHANNEL_COUNT) {
-				pvarData->vt = VT_UI4;
-				pvarData->ulVal = (ULONG) ASAPInfo_GetChannels(m_pinfo);
-				return S_OK;
-			}
-		}
-		else if (pscid->fmtid == CLSID_ASAPMetadataHandler) {
-			if (pscid->pid == 1) {
-				pvarData->vt = VT_UI4;
-				pvarData->ulVal = (ULONG) ASAPInfo_GetSongs(m_pinfo);
-				return S_OK;
-			}
-			if (pscid->pid == 2)
-				return GetString(pvarData, ASAPInfo_IsNtsc(m_pinfo) ? "NTSC" : "PAL");
-		}
-		return S_FALSE;
-	}
-
-	static HRESULT AppendString(char *dest, int *offset, LPCWSTR wszVal)
-	{
-		int i = *offset;
-		while (*wszVal != 0) {
-			if (i >= ASAPInfo_MAX_TEXT_LENGTH) {
-				dest[i] = '\0';
-				return INPLACE_S_TRUNCATED;
-			}
-			WCHAR c = *wszVal++;
-			if (c < ' ' || c > 'z')
-				return E_FAIL;
-			dest[i++] = (char) c;
-		}
-		dest[i] = '\0';
-		*offset = i;
-		return S_OK;
-	}
-
-	HRESULT SetString(cibool (*psetfunc)(ASAPInfo *, const char *), REFPROPVARIANT propvar)
-	{
-		char s[ASAPInfo_MAX_TEXT_LENGTH + 1];
-		int offset = 0;
-		HRESULT hr = S_OK;
-		switch (propvar.vt) {
-		case VT_EMPTY:
-			s[0] = '\0';
-			break;
-		case VT_UI4:
-			if (sprintf(s, "%lu", propvar.ulVal) != 4)
-				return E_FAIL;
-			break;
-		case VT_LPWSTR:
-			hr = AppendString(s, &offset, propvar.pwszVal);
-			if (FAILED(hr))
-				return hr;
-			break;
-		case VT_VECTOR | VT_LPWSTR:
-			ULONG i;
-			s[0] = '\0';
-			for (i = 0; i < propvar.calpwstr.cElems; i++) {
-				if (i > 0) {
-					hr = AppendString(s, &offset, L" & ");
-					if (FAILED(hr))
-						return hr;
-				}
-				hr = AppendString(s, &offset, propvar.calpwstr.pElems[i]);
-				if (FAILED(hr))
-					return hr;
-			}
-			break;
-		default:
-			return E_NOTIMPL;
-		}
-		if (!psetfunc(m_pinfo, s))
-			return E_FAIL;
-		return hr;
-	}
-
-public:
-
-	CASAPMetadataHandler() : m_cRef(1), m_hasInfo(FALSE), m_pstream(NULL)
-	{
-		DllAddRef();
-		InitializeCriticalSection(&m_lock);
-		m_filename[0] = '\0';
-		m_pinfo = ASAPInfo_New();
-	}
-
-	~CASAPMetadataHandler()
-	{
-		ASAPInfo_Delete(m_pinfo);
-		if (m_pstream != NULL)
-			m_pstream->Release();
-		DeleteCriticalSection(&m_lock);
-		DllRelease();
-	}
-
-	STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
-	{
-		if (riid == IID_IUnknown || riid == IID_IColumnProvider) {
-			*ppv = (IColumnProvider *) this;
-			AddRef();
-			return S_OK;
-		}
-		if (riid == IID_IInitializeWithStream) {
-			*ppv = (IInitializeWithStream *) this;
-			AddRef();
-			return S_OK;
-		}
-		if (riid == IID_IPropertyStore) {
-			*ppv = (IPropertyStore *) this;
-			AddRef();
-			return S_OK;
-		}
-		if (riid == IID_IPropertyStoreCapabilities) {
-			*ppv = (IPropertyStoreCapabilities *) this;
-			AddRef();
-			return S_OK;
-		}
-		*ppv = NULL;
-		return E_NOINTERFACE;
-	}
-
-	STDMETHODIMP_(ULONG) AddRef()
-	{
-		return InterlockedIncrement(&m_cRef);
-	}
-
-	STDMETHODIMP_(ULONG) Release()
-	{
-		ULONG r = InterlockedDecrement(&m_cRef);
-		if (r == 0)
-			delete this;
-		return r;
-	}
-
-	// IColumnProvider
-
-	STDMETHODIMP Initialize(LPCSHCOLUMNINIT psci)
-	{
-		return S_OK;
-	}
-
-	STDMETHODIMP GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
-	{
-		if (dwIndex >= 0 && dwIndex < N_PROPERTYDEFS) {
-			g_propertyDefs[dwIndex].CopyTo(psci);
-			return S_OK;
-		}
-		return S_FALSE;
-	}
-
-	STDMETHODIMP GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
-	{
-		if ((pscd->dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_OFFLINE)) != 0)
-			return S_FALSE;
-		char ext[4];
-		for (int i = 0; i < 3; i++) {
-			WCHAR c = pscd->pwszExt[1 + i];
-			if (c <= ' ' || c > 'z')
-				return S_FALSE;
-			ext[i] = (char) c;
-		}
-		if (pscd->pwszExt[5] != '\0')
-			return S_FALSE;
-		ext[3] = '\0';
-		if (!ASAPInfo_IsOurExt(ext))
-			return S_FALSE;
-
-		CMyLock lck(&m_lock);
-		if ((pscd->dwFlags & SHCDF_UPDATEITEM) != 0 || lstrcmpW(m_filename, pscd->wszFile) != 0) {
-			lstrcpyW(m_filename, pscd->wszFile);
-			HRESULT hr = LoadFile(pscd->wszFile, NULL, STGM_READ);
-			if (FAILED(hr))
-				return hr;
-		}
-		return GetData(pscid, (PROPVARIANT *) pvarData, FALSE);
-	}
-
-	// IInitializeWithStream
-
-	STDMETHODIMP Initialize(IStream *pstream, DWORD grfMode)
-	{
-		STATSTG statstg;
-		HRESULT hr = pstream->Stat(&statstg, STATFLAG_DEFAULT);
-		if (FAILED(hr))
-			return hr;
-		CMyLock lck(&m_lock);
-		hr = LoadFile(statstg.pwcsName, pstream, grfMode);
-		CoTaskMemFree(statstg.pwcsName);
-		return hr;
-	}
-
-	// IPropertyStore
-
-	STDMETHODIMP GetCount(DWORD *cProps)
-	{
-		CMyLock lck(&m_lock);
-		return m_hasInfo ? N_PROPERTYDEFS : 0;
-	}
-
-	STDMETHODIMP GetAt(DWORD iProp, PROPERTYKEY *pkey)
-	{
-		CMyLock lck(&m_lock);
-		if (m_hasInfo && iProp >= 0 && iProp < N_PROPERTYDEFS) {
-			*pkey = g_propertyDefs[iProp].scid;
-			return S_OK;
-		}
-		return E_INVALIDARG;
-	}
-
-	STDMETHODIMP GetValue(REFPROPERTYKEY key, PROPVARIANT *pv)
-	{
-		CMyLock lck(&m_lock);
-		HRESULT hr = GetData(&key, pv, TRUE);
-		if (hr == S_FALSE) {
-			pv->vt = VT_EMPTY;
-			return S_OK;
-		}
-		return hr;
-	}
-
-	STDMETHODIMP SetValue(REFPROPERTYKEY key, REFPROPVARIANT propvar)
-	{
-		CMyLock lck(&m_lock);
-		if (m_pstream == NULL)
-			return STG_E_ACCESSDENIED;
-		if (key.fmtid == FMTID_SummaryInformation) {
-			if (key.pid == PIDSI_TITLE)
-				return SetString(ASAPInfo_SetTitle, propvar);
-			if (key.pid == PIDSI_AUTHOR)
-				return SetString(ASAPInfo_SetAuthor, propvar);
-		}
-		else if (key.fmtid == FMTID_MUSIC) {
-			if (key.pid == PIDSI_ARTIST)
-				return SetString(ASAPInfo_SetAuthor, propvar);
-			if (key.pid == PIDSI_YEAR)
-				return SetString(ASAPInfo_SetDate, propvar);
-		}
-		return E_FAIL;
-	}
-
-	STDMETHODIMP Commit(void)
-	{
-		CMyLock lck(&m_lock);
-		if (m_pstream == NULL)
-			return STG_E_ACCESSDENIED;
-		LARGE_INTEGER liZero;
-		liZero.LowPart = 0;
-		liZero.HighPart = 0;
-		HRESULT hr = m_pstream->Seek(liZero, STREAM_SEEK_SET, NULL);
-		if (SUCCEEDED(hr)) {
-			byte module[ASAPInfo_MAX_MODULE_LENGTH];
-			int module_len;
-			hr = m_pstream->Read(module, ASAPInfo_MAX_MODULE_LENGTH, (ULONG *) &module_len);
-			if (SUCCEEDED(hr)) {
-				hr = m_pstream->Seek(liZero, STREAM_SEEK_SET, NULL);
-				if (SUCCEEDED(hr)) {
-					CMemoryByteWriter mbw;
-					if (!ASAPWriter_Write("dummy.sap", mbw.GetByteWriter(), m_pinfo, module, module_len, FALSE))
-						hr = E_FAIL;
-					else {
-						ULARGE_INTEGER liSize;
-						liSize.LowPart = mbw.length;
-						liSize.HighPart = 0;
-						hr = m_pstream->SetSize(liSize);
-						if (SUCCEEDED(hr)) {
-							hr = m_pstream->Write(mbw.module, mbw.length, NULL);
-							if (SUCCEEDED(hr))
-								hr = m_pstream->Commit(STGC_DEFAULT);
-						}
-					}
-				}
-			}
-		}
-		m_pstream->Release();
-		m_pstream = NULL;
-		return hr;
-	}
-
-	// IPropertyStoreCapabilities
-
-	STDMETHODIMP IsPropertyWritable(REFPROPERTYKEY key)
-	{
-		if (key.fmtid == FMTID_SummaryInformation) {
-			if (key.pid == PIDSI_TITLE || key.pid == PIDSI_AUTHOR)
-				return S_OK;
-		}
-		else if (key.fmtid == FMTID_MUSIC) {
-			if (key.pid == PIDSI_ARTIST || key.pid == PIDSI_YEAR)
-				return S_OK;
-		}
-		return S_FALSE;
-	}
-};
-
-class CASAPMetadataHandlerFactory : public IClassFactory
-{
-public:
-
-	STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
-	{
-		if (riid == IID_IUnknown || riid == IID_IClassFactory) {
-			*ppv = (IClassFactory *) this;
-			DllAddRef();
-			return S_OK;
-		}
-		*ppv = NULL;
-		return E_NOINTERFACE;
-	}
-
-	STDMETHODIMP_(ULONG) AddRef()
-	{
-		DllAddRef();
-		return 2;
-	}
-
-	STDMETHODIMP_(ULONG) Release()
-	{
-		DllRelease();
-		return 1;
-	}
-
-	STDMETHODIMP CreateInstance(LPUNKNOWN punkOuter, REFIID riid, void **ppv)
-	{
-		*ppv = NULL;
-		if (punkOuter != NULL)
-			return CLASS_E_NOAGGREGATION;
-		CASAPMetadataHandler *punk = new CASAPMetadataHandler;
-		if (punk == NULL)
-			return E_OUTOFMEMORY;
-		HRESULT hr = punk->QueryInterface(riid, ppv);
-		punk->Release();
-		return hr;
-	}
-
-	STDMETHODIMP LockServer(BOOL fLock)
-	{
-		if (fLock)
-			DllAddRef();
-		else
-			DllRelease();
-		return S_OK;
-	};
-};
-
-STDAPI_(BOOL) __declspec(dllexport) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
-	if (dwReason == DLL_PROCESS_ATTACH) {
-		g_hDll = hInstance;
-		OSVERSIONINFO osvi;
-		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		GetVersionEx(&osvi);
-		g_windowsVer = WINDOWS_OLD;
-		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
-			if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion >= 1)
-				g_windowsVer = WINDOWS_XP;
-			else if (osvi.dwMajorVersion >= 6)
-				g_windowsVer = WINDOWS_VISTA;
-		}
-	}
-	return TRUE;
-}
-
-STDAPI __declspec(dllexport) DllRegisterServer(void)
-{
-	HKEY hk1;
-	if (RegCreateKeyEx(HKEY_CLASSES_ROOT, "CLSID\\" CLSID_ASAPMetadataHandler_str, 0, NULL, 0, KEY_WRITE, NULL, &hk1, NULL) != ERROR_SUCCESS)
-		return E_FAIL;
-	HKEY hk2;
-	if (RegCreateKeyEx(hk1, "InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hk2, NULL) != ERROR_SUCCESS) {
-		RegCloseKey(hk1);
-		return E_FAIL;
-	}
-	char szModulePath[MAX_PATH];
-	DWORD nModulePathLen = GetModuleFileName(g_hDll, szModulePath, MAX_PATH);
-	static const char szThreadingModel[] = "Both";
-	if (RegSetValueEx(hk2, NULL, 0, REG_SZ, (CONST BYTE *) szModulePath, nModulePathLen) != ERROR_SUCCESS
-	 || RegSetValueEx(hk2, "ThreadingModel", 0, REG_SZ, (CONST BYTE *) szThreadingModel, sizeof(szThreadingModel)) != ERROR_SUCCESS) {
-		RegCloseKey(hk2);
-		RegCloseKey(hk1);
-		return E_FAIL;
-	}
-	RegCloseKey(hk2);
-	RegCloseKey(hk1);
-	if (g_windowsVer == WINDOWS_VISTA) {
-		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\PropertySystem\\PropertyHandlers", 0, KEY_WRITE, &hk1) != ERROR_SUCCESS)
-			return E_FAIL;
-		for (int i = 0; i < N_EXTS; i++) {
-			if (RegCreateKeyEx(hk1, extensions[i], 0, NULL, 0, KEY_WRITE, NULL, &hk2, NULL) != ERROR_SUCCESS) {
-				RegCloseKey(hk1);
-				return E_FAIL;
-			}
-			static const char CLSID_ASAPMetadataHandler_str2[] = CLSID_ASAPMetadataHandler_str;
-			if (RegSetValueEx(hk2, NULL, 0, REG_SZ, (CONST BYTE *) CLSID_ASAPMetadataHandler_str2, sizeof(CLSID_ASAPMetadataHandler_str2)) != ERROR_SUCCESS) {
-				RegCloseKey(hk2);
-				RegCloseKey(hk1);
-				return E_FAIL;
-			}
-			RegCloseKey(hk2);
-		}
-		RegCloseKey(hk1);
-	}
-	else {
-		if (RegCreateKeyEx(HKEY_CLASSES_ROOT, "Folder\\shellex\\ColumnHandlers\\" CLSID_ASAPMetadataHandler_str, 0, NULL, 0, KEY_WRITE, NULL, &hk1, NULL) != ERROR_SUCCESS)
-			return E_FAIL;
-		RegCloseKey(hk1);
-	}
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", 0, KEY_SET_VALUE, &hk1) != ERROR_SUCCESS)
-		return E_FAIL;
-	static const char szDescription[] = "ASAP Metadata Handler";
-	if (RegSetValueEx(hk1, CLSID_ASAPMetadataHandler_str, 0, REG_SZ, (CONST BYTE *) szDescription, sizeof(szDescription)) != ERROR_SUCCESS) {
-		RegCloseKey(hk1);
-		return E_FAIL;
-	}
-	RegCloseKey(hk1);
-	return S_OK;
-}
-
-STDAPI __declspec(dllexport) DllUnregisterServer(void)
-{
-	HKEY hk1;
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", 0, KEY_SET_VALUE, &hk1) == ERROR_SUCCESS) {
-		RegDeleteValue(hk1, CLSID_ASAPMetadataHandler_str);
-		RegCloseKey(hk1);
-	}
-	if (g_windowsVer == WINDOWS_VISTA) {
-		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\PropertySystem\\PropertyHandlers", 0, DELETE, &hk1) == ERROR_SUCCESS) {
-			for (int i = 0; i < N_EXTS; i++)
-				RegDeleteKey(hk1, extensions[i]);
-			RegCloseKey(hk1);
-		}
-	}
-	else
-		RegDeleteKey(HKEY_CLASSES_ROOT, "Folder\\shellex\\ColumnHandlers\\" CLSID_ASAPMetadataHandler_str);
-	RegDeleteKey(HKEY_CLASSES_ROOT, "CLSID\\" CLSID_ASAPMetadataHandler_str "\\InProcServer32");
-	RegDeleteKey(HKEY_CLASSES_ROOT, "CLSID\\" CLSID_ASAPMetadataHandler_str);
-	return S_OK;
-}
-
-STDAPI __declspec(dllexport) DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
-{
-	if (ppv == NULL)
-		return E_INVALIDARG;
-	if (rclsid == CLSID_ASAPMetadataHandler) {
-		static CASAPMetadataHandlerFactory g_ClassFactory;
-		return g_ClassFactory.QueryInterface(riid, ppv);
-	}
-	*ppv = NULL;
-	return CLASS_E_CLASSNOTAVAILABLE;
-}
-
-STDAPI __declspec(dllexport) DllCanUnloadNow(void)
-{
-    return g_cRef == 0 ? S_OK : S_FALSE;
-}
-
-static HRESULT DoPropertySchema(LPCSTR funcName)
-{
-	HRESULT hr = CoInitialize(NULL);
-	if (SUCCEEDED(hr)) {
-		WCHAR szSchemaPath[MAX_PATH];
-		hr = E_FAIL;
-		if (GetModuleFileNameW(g_hDll, szSchemaPath, MAX_PATH)
-		 && PathRemoveFileSpecW(szSchemaPath)
-		 && PathAppendW(szSchemaPath, L"ASAPShellEx.propdesc")) {
-			HMODULE propsysDll = LoadLibrary("propsys.dll");
-			if (propsysDll != NULL) {
-				typedef HRESULT (__stdcall *FuncType)(PCWSTR);
-				FuncType func = (FuncType) GetProcAddress(propsysDll, funcName);
-				if (func != NULL)
-					hr = func(szSchemaPath);
-				FreeLibrary(propsysDll);
-			}
-		}
-		CoUninitialize();
-	}
-	return hr;
-}
-
-STDAPI __declspec(dllexport) InstallPropertySchema(void)
-{
-	HRESULT hr = DoPropertySchema("PSRegisterPropertySchema");
-	if (SUCCEEDED(hr))
-		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
-	return hr;
-}
-
-STDAPI __declspec(dllexport) UninstallPropertySchema(void)
-{
-	return DoPropertySchema("PSUnregisterPropertySchema");
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/shellex/ASAPShellEx.propdesc kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/shellex/ASAPShellEx.propdesc
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/shellex/ASAPShellEx.propdesc	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/shellex/ASAPShellEx.propdesc	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<schema xmlns="http://schemas.microsoft.com/windows/2006/propertydescription" schemaVersion="1.0">
-	<propertyDescriptionList publisher="Piotr Fusik" product="ASAP">
-		<propertyDescription name="ASAP.Subsongs" formatID="{5AE26367-B5CF-444D-B163-2CBC99B41287}" propID="1">
-			<description>Number of songs in the file.</description>
-			<typeInfo type="UInt32" isViewable="true" />
-			<labelInfo label="Subsongs" />
-		</propertyDescription>
-		<propertyDescription name="ASAP.PALNTSC" formatID="{5AE26367-B5CF-444D-B163-2CBC99B41287}" propID="2">
-			<description>PAL/NTSC system.</description>
-			<typeInfo type="String" isViewable="true" />
-			<labelInfo label="PAL/NTSC" />
-			<displayInfo displayType="Enumerated">
-				<editControl control="DropList"/>
-				<enumeratedList>
-					<enum value="PAL" text="PAL" />
-					<enum value="NTSC" text="NTSC" />
-				</enumeratedList>
-			</displayInfo>
-		</propertyDescription>
-	</propertyDescriptionList>
-</schema>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/USAGE kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/USAGE
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/USAGE	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/USAGE	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-How to install and use
-----------------------
-
-asapconv::
-{asapsetup%}Extract `asapconv.exe` to a directory of your choice
-{asapsetup%}(for convenience, this directory should be included in your `Path` environment variable).
-{asapsetup%}+
-Run the program from command line to see the syntax.
-The `-o`/`--output` option selects the output format and is mandatory.
-
-WASAP::
-{asapsetup%}Extract `wasap.exe` to a directory of your choice.
-{asapsetup%}+
-When you run WASAP, an "Open file" dialog appears. Simply select the file
-you want to listen to. WASAP is later controlled by its tray icon.
-When you hover the mouse pointer over the icon, the name of the loaded file appears.
-To open another file, left-click the tray icon. The other options are
-available in the menu which appears when you right-click the icon.
-
-{asapsetup%}Apollo plugin::
-{asapsetup%}Extract `ASAP_Apollo.dll` to the `Plug-ins` directory of your Apollo installation.
-
-{asapsetup%}foobar2000 plugin::
-{asapsetup%}Extract `foo_asap.dll` to the `components` directory of your foobar2000 installation.
-
-{asapsetup%}GSPlayer plugin::
-{asapsetup%}Put `gspasap.dll` in the directory which contains the GSPlayer executable.
-
-Winamp plugin::
-{asapsetup%}Extract `in_asap.dll` to the `Plugins` directory of your Winamp installation.
-It is recommended that you remove other plugins that support Atari 8-bit music.
-
-{asapsetup%}Windows Media Player plugin::
-{asapsetup%}To install: extract `asap_dsf.dll`, `install_dsf.bat` and `uninstall_dsf.bat`
-{asapsetup%}to a directory of your choice, then run `install_dsf.bat`.
-{asapsetup%}+
-{asapsetup%}To uninstall: run `uninstall_dsf.bat`, then delete the files.
-
-XBMC plugin::
-{asapsetup%}Put `xbmc_asap.dll` in the `system/players/paplayer` directory.
-This DLL can be used with XBox and Windows versions of XBMC.
-Your XBMC must include support for ASAP.
-
-XMPlay plugin::
-{asapsetup%}Extract `xmp-asap.dll` to your XMPlay directory.
-{asapsetup%}+
-If you want to use the "File information" window (to edit tags or convert between SAP and other formats),
-assign a shortcut to it from XMPlay options.
-
-{asapsetup%}DLL for Raster Music Tracker::
-{asapsetup%}Extract `apokeysnd.dll` to the directory which contains `Rmt.exe`.
-
-{asapsetup%}Audacious plugin::
-{asapsetup%}Extract `asapplug.dll` to `lib/audacious/Input` inside the Audacious directory.
-
-{asapsetup%}VLC plugin::
-{asapsetup%}Extract `libasap_plugin.dll` to `plugins/demux` inside the VLC directory.
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/play.ico and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/play.ico differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/stop.ico and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/stop.ico differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/wasap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/wasap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/wasap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/wasap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,688 +0,0 @@
-/*
- * wasap.c - Another Slight Atari Player for Win32 systems
- *
- * Copyright (C) 2005-2013  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <commctrl.h>
-#include <stdio.h>
-#include <shellapi.h>
-#include <tchar.h>
-
-#ifdef _WIN32_WCE
-/* missing in wince: */
-#define SetMenuDefaultItem(hMenu, uItem, fByPos)
-/* workaround for a bug in mingw32ce: */
-#undef Shell_NotifyIcon
-BOOL WINAPI Shell_NotifyIcon(DWORD,PNOTIFYICONDATAW);
-#endif
-
-#include "asap.h"
-#include "info_dlg.h"
-#include "wasap.h"
-
-#define APP_TITLE        _T("WASAP")
-#define WND_CLASS_NAME   _T("WASAP")
-#define OPEN_TITLE       _T("Select Atari 8-bit music")
-#define BITS_PER_SAMPLE  16
-#define BUFFERS          2
-#define BUFFERED_BLOCKS  4096
-
-static ASAP *asap;
-static int songs = 0;
-static _TCHAR current_filename[MAX_PATH] = _T("");
-static int current_song;
-
-static HWND hWnd;
-
-
-/* WaveOut ---------------------------------------------------------------- */
-
-static HANDLE waveEvent = NULL;
-static HWAVEOUT hwo = INVALID_HANDLE_VALUE;
-/* double-buffering, *2 for 16-bit, *2 for stereo */
-static char buffer[BUFFERS][BUFFERED_BLOCKS * 2 * 2];
-static WAVEHDR wh[BUFFERS];
-static HANDLE waveThread = NULL;
-static BOOL playing = FALSE;
-
-static BOOL WaveOut_Write(LPWAVEHDR pwh)
-{
-	int len = ASAP_Generate(asap, (PBYTE) pwh->lpData, pwh->dwBufferLength, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-	if (len <= 0)
-		return FALSE;
-	pwh->dwBufferLength = len;
-	pwh->dwFlags &= ~WHDR_DONE;
-	return waveOutWrite(hwo, pwh, sizeof(WAVEHDR)) == MMSYSERR_NOERROR;
-}
-
-static DWORD WINAPI WaveOut_Thread(LPVOID lpParameter)
-{
-	while (playing) {
-		BOOL finished = TRUE;
-		int i;
-		for (i = 0; i < BUFFERS; i++) {
-			if ((wh[i].dwFlags & WHDR_DONE) == 0 || WaveOut_Write(&wh[i]))
-				finished = FALSE;
-		}
-		if (finished) {
-			PostMessage(hWnd, WM_COMMAND, IDM_STOP, 0);
-			break;
-		}
-		WaitForSingleObject(waveEvent, 200);
-	}
-	return 0;
-}
-
-static void WaveOut_Close(void)
-{
-	if (waveEvent != NULL) {
-		if (hwo != INVALID_HANDLE_VALUE) {
-			int i;
-			playing = FALSE;
-			if (waveThread != NULL) {
-				SetEvent(waveEvent);
-				WaitForSingleObject(waveThread, 300);
-				CloseHandle(waveThread);
-				waveThread = NULL;
-			}
-			waveOutReset(hwo);
-			for (i = 0; i < BUFFERS; i++) {
-				if (wh[i].dwFlags & WHDR_PREPARED)
-					waveOutUnprepareHeader(hwo, &wh[i], sizeof(WAVEHDR));
-			}
-			waveOutClose(hwo);
-			hwo = INVALID_HANDLE_VALUE;
-		}
-		CloseHandle(waveEvent);
-		waveEvent = NULL;
-	}
-}
-
-static int WaveOut_Open(int channels)
-{
-	WAVEFORMATEX wfx;
-	int i;
-	DWORD waveThreadId;
-
-	waveEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-	if (waveEvent == NULL)
-		return FALSE;
-
-	wfx.wFormatTag = WAVE_FORMAT_PCM;
-	wfx.nChannels = channels;
-	wfx.nSamplesPerSec = ASAP_SAMPLE_RATE;
-	wfx.nBlockAlign = channels * (BITS_PER_SAMPLE / 8);
-	wfx.nAvgBytesPerSec = ASAP_SAMPLE_RATE * wfx.nBlockAlign;
-	wfx.wBitsPerSample = BITS_PER_SAMPLE;
-	wfx.cbSize = 0;
-	if (waveOutOpen(&hwo, WAVE_MAPPER, &wfx, (DWORD_PTR) waveEvent, 0, CALLBACK_EVENT) != MMSYSERR_NOERROR)
-		return FALSE;
-
-	ZeroMemory(&wh, sizeof(wh));
-	for (i = 0; i < BUFFERS; i++) {
-		wh[i].lpData = buffer[i];
-		wh[i].dwBufferLength = BUFFERED_BLOCKS * wfx.nBlockAlign;
-		if (waveOutPrepareHeader(hwo, &wh[i], sizeof(WAVEHDR)) != MMSYSERR_NOERROR) {
-			WaveOut_Close();
-			return FALSE;
-		}
-		wh[i].dwFlags |= WHDR_DONE;
-	}
-
-	playing = TRUE;
-	waveThread = CreateThread(NULL, 0, WaveOut_Thread, NULL, 0, &waveThreadId);
-	if (waveThread == NULL) {
-		WaveOut_Close();
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-/* Tray ------------------------------------------------------------------- */
-
-#define MYWM_NOTIFYICON  (WM_APP + 1)
-static NOTIFYICONDATA nid = {
-	sizeof(NOTIFYICONDATA),
-	NULL,
-	15, /* wince: "Values from 0 to 12 are reserved and should not be used." */
-	NIF_ICON | NIF_MESSAGE | NIF_TIP,
-	MYWM_NOTIFYICON,
-	NULL,
-	APP_TITLE
-};
-static UINT taskbarCreatedMessage;
-
-static void Tray_Modify(HICON hIcon)
-{
-	nid.hIcon = hIcon;
-	if (songs > 0) {
-		LPCTSTR pb;
-		LPCTSTR pe;
-		int len;
-		for (pb = pe = current_filename; *pe != '\0'; pe++) {
-			if (*pe == '\\' || *pe == '/')
-				pb = pe + 1;
-		}
-		/* we need to be careful because szTip is only 64 characters */
-		/* 5 + 2 + max 33 */
-		len = _stprintf(nid.szTip, pe - pb <= 33 ? APP_TITLE ": %s" : APP_TITLE ": %.30s...", pb);
-		if (songs > 1) {
-			/* 7 + max 3 + 4 + max 3 + 1*/
-			_stprintf(nid.szTip + len, _T(" (song %d of %d)"), current_song + 1, songs);
-		}
-	}
-	else
-		_tcscpy(nid.szTip, APP_TITLE);
-	Shell_NotifyIcon(NIM_MODIFY, &nid);
-}
-
-
-/* GUI -------------------------------------------------------------------- */
-
-static int popupShown = FALSE;
-static BOOL errorShown = FALSE;
-static HINSTANCE hInst;
-static HICON hStopIcon;
-static HICON hPlayIcon;
-static HMENU hTrayMenu;
-static HMENU hSongMenu;
-
-static void ShowError(LPCTSTR message)
-{
-	errorShown = TRUE;
-	MessageBox(hWnd, message, APP_TITLE, MB_OK | MB_ICONERROR);
-	errorShown = FALSE;
-}
-
-static void ShowAbout(void)
-{
-#ifdef _WIN32_WCE
-	popupShown = TRUE;
-	MessageBox(hWnd,
-		_T("Another Slight Atari Player (C) " ASAPInfo_YEARS " Piotr Fusik\n"
-		"This program is free software, see GNU General Public License."),
-		APP_TITLE " " ASAPInfo_VERSION,
-		MB_OK);
-#else
-	MSGBOXPARAMS mbp = {
-		sizeof(MSGBOXPARAMS),
-		hWnd,
-		hInst,
-		_T(ASAPInfo_CREDITS
-		"WASAP icons (C) 2005 Lukasz Sychowicz\n\n"
-		ASAPInfo_COPYRIGHT),
-		APP_TITLE " " ASAPInfo_VERSION,
-		MB_OK | MB_USERICON,
-		MAKEINTRESOURCE(IDI_APP),
-		0,
-		NULL,
-		LANG_NEUTRAL
-	};
-	popupShown = TRUE;
-	MessageBoxIndirect(&mbp);
-#endif
-	popupShown = FALSE;
-}
-
-static void SetSongsMenu(int n)
-{
-	static int count = 1; /* GetMenuItemCount unavailable on wince */
-	int i = count;
-	count = n;
-	while (i > n)
-		DeleteMenu(hSongMenu, --i, MF_BYPOSITION);
-	while (++i <= n) {
-		_TCHAR str[3];
-		str[0] = i <= 9 ? '&' : '0' + i / 10;
-		str[1] = '0' + i % 10;
-		str[2] = '\0';
-		AppendMenu(hSongMenu, MF_ENABLED | MF_STRING, IDM_SONG1 + i - 1, str);
-	}
-}
-
-static void OpenMenu(HWND hWnd, HMENU hMenu)
-{
-	POINT pt;
-	GetCursorPos(&pt);
-	SetForegroundWindow(hWnd);
-	TrackPopupMenu(hMenu, TPM_RIGHTALIGN | TPM_BOTTOMALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hWnd, NULL);
-	PostMessage(hWnd, WM_NULL, 0, 0);
-}
-
-static void StopPlayback(void)
-{
-	WaveOut_Close();
-	Tray_Modify(hStopIcon);
-	EnableMenuItem(hTrayMenu, IDM_STOP, MF_BYCOMMAND | MF_GRAYED);
-}
-
-static BOOL DoLoad(ASAP *asap, BYTE *module, int module_len)
-{
-#ifdef _UNICODE
-	static char ansi_filename[MAX_PATH];
-	if (WideCharToMultiByte(CP_ACP, 0, current_filename, -1, ansi_filename, MAX_PATH, NULL, NULL) <= 0) {
-		ShowError(_T("Invalid characters in filename"));
-		return FALSE;
-	}
-#else
-#define ansi_filename current_filename
-#endif
-	if (!ASAP_Load(asap, ansi_filename, module, module_len)) {
-		ShowError(_T("Unsupported file format"));
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static void LoadAndPlay(int song)
-{
-	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	const ASAPInfo *info;
-	int duration;
-	if (!loadModule(current_filename, module, &module_len))
-		return;
-	if (songs > 0) {
-		songs = 0;
-		StopPlayback();
-		EnableMenuItem(hTrayMenu, 1, MF_BYPOSITION | MF_GRAYED); /* songs */
-		EnableMenuItem(hTrayMenu, IDM_FILE_INFO, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(hTrayMenu, IDM_SAVE_WAV, MF_BYCOMMAND | MF_GRAYED);
-	}
-	if (!DoLoad(asap, module, module_len))
-		return;
-	info = ASAP_GetInfo(asap);
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(info);
-	songs = ASAPInfo_GetSongs(info);
-	EnableMenuItem(hTrayMenu, 1, MF_BYPOSITION | MF_ENABLED); /* songs */
-	EnableMenuItem(hTrayMenu, IDM_FILE_INFO, MF_BYCOMMAND | MF_ENABLED);
-	EnableMenuItem(hTrayMenu, IDM_SAVE_WAV, MF_BYCOMMAND | MF_ENABLED);
-#ifndef _UNICODE /* TODO */
-	updateInfoDialog(current_filename, song);
-#endif
-	SetSongsMenu(songs);
-	CheckMenuRadioItem(hSongMenu, 0, songs - 1, song, MF_BYPOSITION);
-	current_song = song;
-	if (ASAPInfo_GetLoop(info, song))
-		duration = -1;
-	else
-		duration = ASAPInfo_GetDuration(info, song);
-	if (!ASAP_PlaySong(asap, song, duration)) {
-		ShowError(_T("This file is a bad rip!"));
-		return;
-	}
-	if (!WaveOut_Open(ASAPInfo_GetChannels(info))) {
-		ShowError(_T("Error initalizing WaveOut"));
-		return;
-	}
-	EnableMenuItem(hTrayMenu, IDM_STOP, MF_BYCOMMAND | MF_ENABLED);
-	Tray_Modify(hPlayIcon);
-}
-
-static void SelectAndLoadFile(void)
-{
-	static OPENFILENAME ofn = {
-		sizeof(OPENFILENAME),
-		NULL,
-		0,
-		_T("All supported\0"
-		"*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc\0"
-#ifdef _WIN32_WCE
-#define ASAP_FILTER(description, masks) description "\0" masks "\0"
-#else
-#define ASAP_FILTER(description, masks) description " (" masks ")\0" masks "\0"
-#endif
-		ASAP_FILTER("Slight Atari Player", "*.sap")
-		ASAP_FILTER("Chaos Music Composer", "*.cmc;*.cm3;*.cmr;*.cms;*.dmc")
-		ASAP_FILTER("Delta Music Composer", "*.dlt")
-		ASAP_FILTER("Music ProTracker", "*.mpt;*.mpd")
-		ASAP_FILTER("Raster Music Tracker", "*.rmt")
-		ASAP_FILTER("Theta Music Composer 1.x", "*.tmc;*.tm8")
-		ASAP_FILTER("Theta Music Composer 2.x", "*.tm2")
-		ASAP_FILTER("Future Composer", "*.fc")
-		"\0"),
-		NULL,
-		0,
-		1,
-		current_filename,
-		MAX_PATH,
-		NULL,
-		0,
-		NULL,
-		OPEN_TITLE,
-#ifndef _WIN32_WCE
-		OFN_ENABLESIZING | OFN_EXPLORER |
-#endif
-		OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST,
-		0,
-		0,
-		NULL,
-		0,
-		NULL,
-		NULL
-	};
-	popupShown = TRUE;
-#ifndef _WIN32_WCE
-	ofn.hwndOwner = hWnd;
-#endif
-	if (GetOpenFileName(&ofn))
-		LoadAndPlay(-1);
-	popupShown = FALSE;
-}
-
-#ifndef _WIN32_WCE /* disabled just because of limited computing power */
-
-/* Defined so that the progress bar is responsive, but isn't updated too often and doesn't overflow (65535 limit) */
-#define WAV_PROGRESS_DURATION_SHIFT 10
-
-static int wav_progressLimit;
-static _TCHAR wav_filename[MAX_PATH];
-
-static INT_PTR CALLBACK WavProgressDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (uMsg == WM_INITDIALOG)
-		SendDlgItemMessage(hDlg, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, wav_progressLimit));
-	return FALSE;
-}
-
-static BOOL DoSaveWav(ASAP *asap)
-{
-	HANDLE fh;
-	BYTE buffer[8192];
-	DWORD len;
-	HWND progressWnd;
-	int progressPos;
-	int newProgressPos;
-	fh = CreateFile(wav_filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (fh == INVALID_HANDLE_VALUE)
-		return FALSE;
-	progressWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROGRESS), hWnd, WavProgressDialogProc);
-	progressPos = 0;
-	len = ASAP_GetWavHeader(asap, buffer, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E, FALSE);
-	while (len > 0) {
-		if (!WriteFile(fh, buffer, len, &len, NULL)) {
-			DestroyWindow(progressWnd);
-			CloseHandle(fh);
-			return FALSE;
-		}
-		newProgressPos = ASAP_GetPosition(asap) >> WAV_PROGRESS_DURATION_SHIFT;
-		if (progressPos != newProgressPos) {
-			progressPos = newProgressPos;
-			SendDlgItemMessage(progressWnd, IDC_PROGRESS, PBM_SETPOS, progressPos, 0);
-		}
-		len = ASAP_Generate(asap, buffer, sizeof(buffer), BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-	}
-	DestroyWindow(progressWnd);
-	return CloseHandle(fh);
-}
-
-static void SaveWav(void)
-{
-	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAP *asap;
-	int duration;
-	static OPENFILENAME ofn = {
-		sizeof(OPENFILENAME),
-		NULL,
-		0,
-		_T("WAV files (*.wav)\0*.wav\0\0"),
-		NULL,
-		0,
-		0,
-		wav_filename,
-		MAX_PATH,
-		NULL,
-		0,
-		NULL,
-		_T("Select output file"),
-#ifndef _WIN32_WCE
-		OFN_ENABLESIZING | OFN_EXPLORER |
-#endif
-		OFN_OVERWRITEPROMPT,
-		0,
-		0,
-		_T("wav"),
-		0,
-		NULL,
-		NULL
-	};
-	if (!loadModule(current_filename, module, &module_len))
-		return;
-	asap = ASAP_New();
-	if (asap == NULL)
-		return;
-	if (!DoLoad(asap, module, module_len))
-		return;
-	duration = ASAPInfo_GetDuration(ASAP_GetInfo(asap), current_song);
-	if (duration < 0) {
-		if (MessageBox(hWnd,
-			_T("This song has unknown duration.\n"
-			"Use \"File information\" to update the source file with the correct duration.\n"
-			"Do you want to save 3 minutes?"),
-			_T("Unknown duration"), MB_YESNO | MB_ICONWARNING) != IDYES)
-			return;
-		duration = 180000;
-	}
-	ASAP_PlaySong(asap, current_song, duration);
-	combineFilenameExt(wav_filename, current_filename, _T("wav"));
-	popupShown = TRUE;
-	ofn.hwndOwner = hWnd;
-	if (GetSaveFileName(&ofn)) {
-		wav_progressLimit = duration >> WAV_PROGRESS_DURATION_SHIFT;
-		if (!DoSaveWav(asap))
-			ShowError(_T("Cannot save file"));
-	}
-	popupShown = FALSE;
-}
-
-#endif /* _WIN32_WCE */
-
-static LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	int idc;
-	PCOPYDATASTRUCT pcds;
-	switch (msg) {
-	case WM_COMMAND:
-		idc = LOWORD(wParam);
-		switch (idc) {
-		case IDM_OPEN:
-			SelectAndLoadFile();
-			break;
-		case IDM_STOP:
-			StopPlayback();
-			break;
-#ifndef _UNICODE /* TODO */
-		case IDM_FILE_INFO:
-			showInfoDialog(hInst, hWnd, current_filename, current_song);
-			break;
-#endif
-#ifndef _WIN32_WCE /* disabled just because of limited computing power */
-		case IDM_SAVE_WAV:
-			SaveWav();
-			break;
-#endif
-		case IDM_ABOUT:
-			ShowAbout();
-			break;
-		case IDM_EXIT:
-			PostQuitMessage(0);
-			break;
-		default:
-			if (idc >= IDM_SONG1 && idc < IDM_SONG1 + songs)
-				LoadAndPlay(idc - IDM_SONG1);
-			break;
-		}
-		break;
-	case WM_DESTROY:
-		PostQuitMessage(0);
-		break;
-	case MYWM_NOTIFYICON:
-		if (popupShown) {
-			SetForegroundWindow(hWnd);
-			break;
-		}
-		switch (lParam) {
-		case WM_LBUTTONDOWN:
-#ifndef _WIN32_WCE
-			SelectAndLoadFile();
-			break;
-		case WM_MBUTTONDOWN:
-			if (songs > 1)
-				OpenMenu(hWnd, hSongMenu);
-			break;
-#endif
-		case WM_RBUTTONUP:
-			OpenMenu(hWnd, hTrayMenu);
-			break;
-		default:
-			break;
-		}
-		break;
-	case WM_COPYDATA:
-		pcds = (PCOPYDATASTRUCT) lParam;
-		if (pcds->dwData == 'O' && pcds->cbData <= sizeof(current_filename)) {
-#ifndef _WIN32_WCE
-			if (errorShown) {
-				HWND hChild = GetLastActivePopup(hWnd);
-				if (hChild != hWnd)
-					SendMessage(hChild, WM_CLOSE, 0, 0);
-			}
-#endif
-			memcpy(current_filename, pcds->lpData, pcds->cbData);
-			LoadAndPlay(-1);
-		}
-		break;
-	default:
-		if (msg == taskbarCreatedMessage)
-			Shell_NotifyIcon(NIM_ADD, &nid);
-		return DefWindowProc(hWnd, msg, wParam, lParam);
-	}
-	return 0;
-}
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
-{
-	LPTSTR pb;
-	LPTSTR pe;
-	WNDCLASS wc;
-	HMENU hMainMenu;
-	MSG msg;
-
-	for (pb = lpCmdLine; *pb == ' ' || *pb == '\t'; pb++);
-	for (pe = pb; *pe != '\0'; pe++);
-	while (--pe > pb && (*pe == ' ' || *pe == '\t'));
-	/* Now pb and pe point at respectively the first and last non-blank
-	   character in lpCmdLine. If pb > pe then the command line is blank. */
-	if (*pb == '"' && *pe == '"')
-		pb++;
-	else
-		pe++;
-	*pe = '\0';
-	/* Now pb contains the filename, if any, specified on the command line. */
-
-	hWnd = FindWindow(WND_CLASS_NAME, NULL);
-	if (hWnd != NULL) {
-		/* an instance of WASAP is already running */
-		if (*pb != '\0') {
-			/* pass the filename */
-			COPYDATASTRUCT cds = { 'O', (DWORD) (pe + 1 - pb) * sizeof(_TCHAR), pb };
-			SendMessage(hWnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) &cds);
-		}
-		else {
-			/* wince: open menu; desktop: open file */
-#ifdef _WIN32_WCE
-			HWND hChild = FindWindow(NULL, OPEN_TITLE);
-			if (hChild != NULL)
-				SetForegroundWindow(hChild);
-#else
-			SetForegroundWindow(hWnd);
-#endif
-			PostMessage(hWnd, MYWM_NOTIFYICON, 15, WM_LBUTTONDOWN);
-		}
-		return 0;
-	}
-
-	asap = ASAP_New();
-	if (asap == NULL)
-		return 1;
-
-	hInst = hInstance;
-
-	wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
-	wc.lpfnWndProc = MainWndProc;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = 0;
-	wc.hInstance = hInstance;
-	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APP));
-	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1);
-	wc.lpszMenuName = NULL;
-	wc.lpszClassName = WND_CLASS_NAME;
-	RegisterClass(&wc);
-
-	hWnd = CreateWindow(WND_CLASS_NAME,
-		APP_TITLE,
-		WS_OVERLAPPEDWINDOW,
-		CW_USEDEFAULT,
-		CW_USEDEFAULT,
-		CW_USEDEFAULT,
-		CW_USEDEFAULT,
-		NULL,
-		NULL,
-		hInstance,
-		NULL
-	);
-
-	hStopIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_STOP));
-	hPlayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_PLAY));
-	hMainMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_TRAYMENU));
-	hTrayMenu = GetSubMenu(hMainMenu, 0);
-	hSongMenu = GetSubMenu(hTrayMenu, 1);
-	SetMenuDefaultItem(hTrayMenu, 0, TRUE);
-	nid.hWnd = hWnd;
-	nid.hIcon = hStopIcon;
-	Shell_NotifyIcon(NIM_ADD, &nid);
-	taskbarCreatedMessage = RegisterWindowMessage(_T("TaskbarCreated"));
-
-	if (*pb != '\0') {
-		memcpy(current_filename, pb, (pe + 1 - pb) * sizeof(_TCHAR));
-		LoadAndPlay(-1);
-	}
-	else
-		SelectAndLoadFile();
-
-	while (GetMessage(&msg, NULL, 0, 0)) {
-		if (infoDialog == NULL || !IsDialogMessage(infoDialog, &msg)) {
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-	}
-
-	WaveOut_Close();
-	Shell_NotifyIcon(NIM_DELETE, &nid);
-	DestroyMenu(hMainMenu);
-	return 0;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/wasap.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/wasap.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/wasap.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/wasap.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * wasap.c - Another Slight Atari Player for Win32 systems
- *
- * Copyright (C) 2005-2010  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define IDI_APP        101
-#define IDI_STOP       102
-#define IDI_PLAY       103
-#define IDR_TRAYMENU   200
-#define IDM_OPEN       201
-#define IDM_STOP       202
-#define IDM_FILE_INFO  203
-#define IDM_SAVE_WAV   204
-#define IDM_ABOUT      205
-#define IDM_EXIT       206
-#define IDM_SONG1      211
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wasap/wasap.ico and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wasap/wasap.ico differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/win32.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/win32.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/win32.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/win32.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,377 +0,0 @@
-# MinGW for most ports
-WIN32_CC = $(DO)mingw32-gcc $(WIN32_CARGS)
-WIN32_CXX = $(DO)mingw32-g++ -static $(WIN32_CARGS)
-WIN32_WINDRES = $(DO)windres -o $@ $<
-GTK_DIR = ../porty/audacious/gtk
-AUDACIOUS_INCLUDE = ../porty/audacious/audacious-3.3.2/src
-AUDACIOUS_LIB = "C:/Program Files (x86)/audacious-3.3.4/bin"
-VLC_SDK_DIR = "C:/Program Files (x86)/VideoLAN/VLC/sdk"
-GST_SDK_DIR = "C:/gstreamer-sdk/0.10/x86"
-
-# Microsoft compiler for Windows Media Player and foobar2000
-DSHOW_BASECLASSES_DIR = "C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses"
-FOOBAR2000_SDK_DIR = ../foobar2000_SDK
-WIN32_CL = $(WIN32_CLDO)cl -GR- -GS- -wd4996 -DNDEBUG $(WIN32_CLARGS)
-WIN32_LINKOPT = -link -release
-WIN32_MKLIB = $(DO)lib -nologo -ltcg -out:$@ $^
-WIN64_CL = $(WIN32_CLDO)"C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/x86_amd64/cl" -GR- -GS- -wd4996 -DNDEBUG $(WIN32_CLARGS)
-WIN64_LINKOPT = -link -release -libpath:"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib/x64" -libpath:"C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/lib/amd64"
-
-# MinGW x64
-WIN64_CC = $(DO)x86_64-w64-mingw32-gcc $(WIN32_CARGS)
-WIN64_CXX = $(DO)x86_64-w64-mingw32-g++ -static $(WIN32_CARGS)
-WIN64_WINDRES = $(DO)x86_64-w64-mingw32-windres -o $@ $<
-
-# old Microsoft compiler for XBMC plugin
-WIN32_CL71 = $(WIN32_CLDO)cl -GR- -DNDEBUG $(WIN32_CLARGS)
-
-# gcc for Windows Mobile
-WINCE_CC = $(DO)arm-mingw32ce-gcc -s -O2 -Wall -o $@ $(INCLUDEOPTS) $(filter-out %.h,$^)
-WINCE_WINDRES = $(DO)arm-mingw32ce-windres -o $@ -D_WIN32_WCE $<
-
-# Microsoft compiler for Windows Mobile
-WINCE_VC = "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/ce"
-WINCE_CL = $(WIN32_CLDO)$(WINCE_VC)/bin/x86_arm/cl -DUNICODE -D_UNICODE -DUNDER_CE -D_ARM_ -I$(WINCE_SDK)/Include/Armv4i $(WIN32_CLARGS)
-WINCE_SDK = "C:/Program Files (x86)/Windows Mobile 5.0 SDK R2/PocketPC"
-WINCE_CABWIZ = "C:/Program Files (x86)/Windows Mobile 6 SDK/Tools/CabWiz/cabwiz.exe"
-WINCE_LINKOPT = -link -subsystem:windowsce,4.02 -release -libpath:$(WINCE_VC)/lib/armv4i -libpath:$(WINCE_SDK)/Lib/ARMV4I
-
-# Windows Installer XML
-CANDLE = $(DO)candle -nologo -o $@
-LIGHT = $(DO)light -nologo -o $@ -spdb
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "win32.mk")
-endif
-
-comma = ,
-WIN32_CARGS = -s -O2 -Wall -Wl,--nxcompat -o $@ $(if $(filter %.dll,$@),-shared -Wl$(comma)-subsystem$(comma)windows) $(INCLUDEOPTS) $(filter-out %.h,$^)
-WIN32_CLDO = $(DO)$(if $(filter-out %.obj,$@),mkdir -p win32/obj/$@ && )
-WIN32_CLARGS = -nologo -O2 -GL -W3 $(if $(filter %.obj,$@),-c -Fo$@,-Fe$@ -Fowin32/obj/$@/) $(if $(filter %.dll,$@),-LD) $(INCLUDEOPTS) $(filter-out %.h,$^)
-
-mingw: $(addprefix win32/,asapconv.exe libasap.a asapscan.exe wasap.exe ASAP_Apollo.dll bass_asap.dll gspasap.dll in_asap.dll xmp-asap.dll apokeysnd.dll ASAPShellEx.dll)
-.PHONY: mingw
-
-wince: $(addprefix win32/wince/,wasap.exe gspasap.dll asap_dsf.dll)
-.PHONY: wince
-
-# asapconv
-
-win32/asapconv.exe: $(call src,asapconv.c asap.[ch])
-	$(WIN32_CC) -DHAVE_LIBMP3LAME -DHAVE_LIBMP3LAME_DLL
-CLEAN += win32/asapconv.exe
-
-win32/asapconv-static-lame.exe: $(call src,asapconv.c asap.[ch])
-	$(WIN32_CC) -DHAVE_LIBMP3LAME -lmp3lame
-CLEAN += win32/asapconv-static-lame.exe
-
-win32/asapconv-no-lame.exe: $(call src,asapconv.c asap.[ch])
-	$(WIN32_CC)
-CLEAN += win32/asapconv-no-lame.exe
-
-win32/msvc/asapconv.exe: $(call src,asapconv.c asap.[ch])
-	$(WIN32_CL) -DHAVE_LIBMP3LAME -DHAVE_LIBMP3LAME_DLL
-CLEAN += win32/msvc/asapconv.exe
-
-win32/x64/asapconv.exe: $(call src,asapconv.c asap.[ch])
-	$(WIN64_CC)
-CLEAN += win32/x64/asapconv.exe
-
-# lib
-
-win32/libasap.a: win32/asap.o
-	$(AR)
-CLEAN += win32/libasap.a
-
-win32/asap.o: $(call src,asap.[ch])
-	$(WIN32_CC) -c
-CLEAN += win32/asap.o
-
-win32/asap.lib: win32/asap.obj
-	$(WIN32_MKLIB)
-CLEAN += win32/asap.lib
-
-win32/asap.obj: $(call src,asap.[ch])
-	$(WIN32_CL)
-CLEAN += win32/asap.obj
-
-# SDL
-
-win32/asap-sdl.exe: $(call src,asap-sdl.c asap.[ch])
-	$(WIN32_CC) -lmingw32 -lSDLmain -lSDL
-CLEAN += win32/asap-sdl.exe
-
-# asapscan
-
-win32/asapscan.exe: $(srcdir)asapscan.c asap-asapscan.h
-	$(WIN32_CC)
-CLEAN += win32/asapscan.exe
-
-# sap2txt
-
-win32/sap2txt.exe: $(srcdir)sap2txt.c
-	$(WIN32_CC) -static -lz
-CLEAN += win32/sap2txt.exe
-
-# sap2ntsc
-
-win32/sap2ntsc.exe: $(call src,sap2ntsc.c asap.h) # FIXME: also asap.c, but we #include it and not link
-	$(WIN32_CC)
-CLEAN += win32/sap2ntsc.exe
-
-# WASAP
-
-win32/wasap.exe: $(call src,win32/wasap/wasap.[ch] asap.[ch] astil.[ch] win32/info_dlg.[ch]) win32/wasap/wasap-res.o
-	$(WIN32_CC) -Wl,-subsystem,windows -DWASAP -lcomctl32 -lcomdlg32 -lwinmm
-CLEAN += win32/wasap.exe
-
-win32/wasap/wasap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/wasap/wasap.h win32/wasap/wasap.ico win32/wasap/play.ico win32/wasap/stop.ico)
-	$(WIN32_WINDRES) -DWASAP
-CLEAN += win32/wasap/wasap-res.o
-
-win32/wince/wasap.exe: $(call src,win32/wasap/wasap.[ch] asap.[ch] win32/info_dlg.[ch]) win32/wince/wasap-res.o
-	$(WINCE_CC) -DWASAP
-CLEAN += win32/wince/wasap.exe
-
-win32/wince/wasap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/wasap/wasap.h win32/wasap/wasap.ico win32/wasap/play.ico win32/wasap/stop.ico)
-	$(WINCE_WINDRES) -DWASAP
-CLEAN += win32/wince/wasap-res.o
-
-win32/x64/wasap.exe: $(call src,win32/wasap/wasap.[ch] asap.[ch] astil.[ch] win32/info_dlg.[ch]) win32/x64/wasap-res.o
-	$(WIN64_CC) -Wl,-subsystem,windows -DWASAP -lcomctl32 -lcomdlg32 -lwinmm
-CLEAN += win32/x64/wasap.exe
-
-win32/x64/wasap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/wasap/wasap.h win32/wasap/wasap.ico win32/wasap/play.ico win32/wasap/stop.ico)
-	$(WIN64_WINDRES) -DWASAP
-CLEAN += win32/x64/wasap-res.o
-
-# Apollo
-
-win32/ASAP_Apollo.dll: $(call src,win32/apollo/ASAP_Apollo.cpp asap.[ch] astil.[ch] win32/info_dlg.[ch] win32/settings_dlg.[ch] win32/apollo/InputPlugin.h) win32/apollo/ASAP_Apollo-res.o
-	$(WIN32_CXX) -DAPOLLO -lcomctl32 -lcomdlg32
-CLEAN += win32/ASAP_Apollo.dll
-
-win32/apollo/ASAP_Apollo-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/settings_dlg.h)
-	$(WIN32_WINDRES) -DAPOLLO
-CLEAN += win32/apollo/ASAP_Apollo-res.o
-
-# Audacious
-
-win32/asapplug.dll: $(call src,audacious/asapplug.c asap.[ch]) win32/audacious/asapplug-res.o
-	$(WIN32_CC) -I$(GTK_DIR)/include/glib-2.0 -I$(GTK_DIR)/lib/glib-2.0/include -I$(AUDACIOUS_INCLUDE) -L$(AUDACIOUS_LIB) -laudcore -lglib-2.0-0 -lpthreadGC2
-CLEAN += win32/asapplug.dll
-
-win32/audacious/asapplug-res.o: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DAUDACIOUS
-CLEAN += win32/audacious/asapplug-res.o
-
-# VLC
-
-win32/libasap_plugin.dll: $(call src,vlc/libasap_plugin.c asap.[ch]) win32/libasap_plugin-res.o
-	$(WIN32_CC) -std=gnu99 -I$(VLC_SDK_DIR)/include/vlc/plugins -L$(VLC_SDK_DIR)/lib -lvlccore
-CLEAN += win32/libasap_plugin.dll
-
-win32/libasap_plugin-res.o: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DVLC
-CLEAN += win32/libasap_plugin-res.o
-
-# BASS
-
-win32/bass_asap.dll: $(call src,win32/bass/bass_asap.c asap.[ch] win32/bass/bass-addon.h win32/bass/bass.h win32/bass/bass.lib) win32/bass/bass_asap-res.o
-	$(WIN32_CC) -Wl,--kill-at -DBASS
-CLEAN += win32/bass_asap.dll
-
-win32/bass/bass_asap-res.o: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DBASS
-CLEAN += win32/bass/bass_asap-res.o
-
-# DirectShow
-
-DSHOW_BASECLASSES = $(patsubst %,$(DSHOW_BASECLASSES_DIR)/%.cpp,amfilter combase dllentry dllsetup mtype source wxlist wxutil)
-
-win32/asap_dsf.dll: $(call src,win32/dshow/asap_dsf.cpp asap.[ch] win32/dshow/asap_dsf.def) win32/dshow/asap_dsf.res
-	$(WIN32_CL) $(DSHOW_BASECLASSES) -DDSHOW -I$(DSHOW_BASECLASSES_DIR) advapi32.lib ole32.lib oleaut32.lib shlwapi.lib strmiids.lib user32.lib winmm.lib $(WIN32_LINKOPT)
-CLEAN += win32/asap_dsf.dll win32/asap_dsf.exp win32/asap_dsf.lib win32/dshow/*.obj
-
-win32/dshow/asap_dsf.res: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DDSHOW
-CLEAN += win32/dshow/asap_dsf.res
-
-win32/wince/asap_dsf.dll: $(call src,win32/dshow/asap_dsf.cpp asap.[ch] win32/dshow/asap_dsf.def) win32/wince/asap_dsf-res.obj
-	$(WINCE_CL) -Zc:wchar_t- ole32.lib oleaut32.lib strmbase.lib strmiids.lib uuid.lib $(WINCE_LINKOPT)
-CLEAN += win32/wince/asap_dsf.dll win32/wince/asap_dsf.exp win32/wince/asap_dsf.lib win32/wince/asap_dsf.obj win32/wince/asap.obj
-
-win32/wince/asap_dsf-res.obj: $(call src,win32/gui.rc asap.h)
-	$(WINCE_WINDRES) -DDSHOW
-CLEAN += win32/wince/asap_dsf-res.obj
-
-win32/x64/asap_dsf.dll: $(call src,win32/dshow/asap_dsf.cpp asap.[ch] win32/dshow/asap_dsf.def) win32/x64/asap_dsf.res
-	$(WIN64_CL) $(DSHOW_BASECLASSES) -DDSHOW -I$(DSHOW_BASECLASSES_DIR) advapi32.lib ole32.lib oleaut32.lib shlwapi.lib strmiids.lib user32.lib winmm.lib $(WIN64_LINKOPT)
-CLEAN += win32/x64/asap_dsf.dll win32/x64/asap_dsf.exp win32/x64/asap_dsf.lib win32/x64/*.obj
-
-win32/x64/asap_dsf.res: $(call src,win32/gui.rc asap.h)
-	$(WIN64_WINDRES) -DDSHOW
-CLEAN += win32/x64/asap_dsf.res
-
-win32/install_dsf.bat:
-	$(DO)echo regsvr32 asap_dsf.dll >$@
-CLEAN += win32/install_dsf.bat
-
-win32/uninstall_dsf.bat:
-	$(DO)echo regsvr32 /u asap_dsf.dll >$@
-CLEAN += win32/uninstall_dsf.bat
-
-# foobar2000
-
-FOOBAR2000_RUNTIME = $(FOOBAR2000_SDK_DIR)/foobar2000/foobar2000_component_client/component_client.cpp win32/foobar2000/foobar2000_SDK.lib win32/foobar2000/pfc.lib $(FOOBAR2000_SDK_DIR)/foobar2000/shared/shared.lib
-
-win32/foo_asap.dll: $(call src,win32/foobar2000/foo_asap.cpp asap.[ch] aatr.[ch] win32/settings_dlg.[ch]) win32/foobar2000/foo_asap.res $(FOOBAR2000_RUNTIME)
-	$(WIN32_CL) -DFOOBAR2000 -DWIN32 -DUNICODE -EHsc -I$(FOOBAR2000_SDK_DIR) user32.lib $(WIN32_LINKOPT)
-CLEAN += win32/foo_asap.dll win32/foo_asap.exp win32/foo_asap.lib
-
-win32/foobar2000/foobar2000_SDK.lib: $(patsubst %,win32/foobar2000/%.obj,abort_callback audio_chunk audio_chunk_channel_config console file_info filesystem filesystem_helper guids mem_block_container playable_location preferences_page replaygain_info service)
-	$(WIN32_MKLIB)
-CLEAN += win32/foobar2000/foobar2000_SDK.lib
-
-win32/foobar2000/%.obj: $(FOOBAR2000_SDK_DIR)/foobar2000/SDK/%.cpp
-	$(WIN32_CL) -DWIN32 -DUNICODE -EHsc -I$(FOOBAR2000_SDK_DIR)
-CLEAN += win32/foobar2000/*.obj
-
-win32/foobar2000/pfc.lib: $(patsubst %,win32/foobar2000/%.obj,cfg_var guid other string string_conv utf8)
-	$(WIN32_MKLIB)
-CLEAN += win32/foobar2000/pfc.lib
-
-win32/foobar2000/%.obj: $(FOOBAR2000_SDK_DIR)/pfc/%.cpp
-	$(WIN32_CL) -DWIN32 -DUNICODE -EHsc
-
-win32/foobar2000/foo_asap.res: $(call src,win32/gui.rc asap.h win32/settings_dlg.h)
-	$(WIN32_WINDRES) -DFOOBAR2000
-CLEAN += win32/foobar2000/foo_asap.res
-
-# GSPlayer
-
-win32/gspasap.dll: $(call src,win32/gsplayer/gspasap.c asap.[ch] win32/settings_dlg.[ch]) win32/gsplayer/gspasap-res.o
-	$(WIN32_CC) -Wl,--kill-at -DGSPLAYER
-CLEAN += win32/gspasap.dll
-
-win32/gsplayer/gspasap-res.o: $(call src,win32/gui.rc asap.h win32/settings_dlg.h)
-	$(WIN32_WINDRES) -DGSPLAYER
-CLEAN += win32/gsplayer/gspasap-res.o
-
-win32/wince/gspasap.dll: $(call src,win32/gsplayer/gspasap.c asap.[ch] win32/settings_dlg.[ch]) win32/wince/gspasap-res.obj
-	$(WINCE_CL) -DGSPLAYER coredll.lib corelibc.lib $(WINCE_LINKOPT)
-CLEAN += win32/wince/gspasap.dll win32/wince/gspasap.exp win32/wince/gspasap.lib win32/wince/gspasap.obj win32/wince/asap.obj
-
-win32/wince/gspasap-res.obj: $(call src,win32/gui.rc asap.h win32/settings_dlg.h)
-	$(WINCE_WINDRES) -DGSPLAYER
-CLEAN += win32/wince/gspasap-res.obj
-
-# Winamp
-
-win32/in_asap.dll: $(call src,win32/winamp/in_asap.c asap.[ch] astil.[ch] aatr.[ch] win32/info_dlg.[ch] win32/settings_dlg.[ch] win32/winamp/in2.h win32/winamp/out.h win32/winamp/ipc_pe.h win32/winamp/wa_ipc.h) win32/winamp/in_asap-res.o
-	$(WIN32_CC) -DWINAMP -lcomctl32 -lcomdlg32
-CLEAN += win32/in_asap.dll
-
-win32/winamp/in_asap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/settings_dlg.h)
-	$(WIN32_WINDRES) -DWINAMP
-CLEAN += win32/winamp/in_asap-res.o
-
-# XBMC
-
-win32/xbmc_asap.dll: $(call src,xbmc/xbmc_asap.c asap.[ch]) win32/xbmc/xbmc_asap.res
-	$(WIN32_CL71) -MD $(WIN32_LINKOPT)
-CLEAN += win32/xbmc_asap.dll win32/xbmc_asap.exp win32/xbmc_asap.lib win32/xbmc/xbmc_asap.obj win32/xbmc/asap.obj
-
-win32/xbmc/xbmc_asap.res: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DXBMC
-CLEAN += win32/xbmc/xbmc_asap.res
-
-# XMPlay
-
-win32/xmp-asap.dll: $(call src,win32/xmplay/xmp-asap.c asap.[ch] astil.[ch] win32/info_dlg.[ch] win32/settings_dlg.[ch] win32/xmplay/xmpin.h win32/xmplay/xmpfunc.h) win32/xmplay/xmp-asap-res.o
-	$(WIN32_CC) -Wl,--kill-at -DXMPLAY -lcomctl32 -lcomdlg32
-CLEAN += win32/xmp-asap.dll
-
-win32/xmplay/xmp-asap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/settings_dlg.h)
-	$(WIN32_WINDRES) -DXMPLAY
-CLEAN += win32/xmplay/xmp-asap-res.o
-
-# GStreamer
-
-win32/libgstasapdec.dll: $(call src,gstreamer/gstasapdec.c asap.[ch])
-	$(WIN32_CC) -I$(GST_SDK_DIR)/include/gstreamer-0.10 -I$(GST_SDK_DIR)/include/glib-2.0 -I$(GST_SDK_DIR)/lib/glib-2.0/include -I$(GST_SDK_DIR)/include/libxml2 -L$(GST_SDK_DIR)/lib -lgstreamer-0.10 -lglib-2.0 -lgobject-2.0
-CLEAN += win32/libgstasapdec.dll
-
-# Raster Music Tracker
-
-win32/apokeysnd.dll: $(call src,win32/rmt/apokeysnd_dll.c) win32/rmt/pokey.c win32/rmt/pokey.h win32/rmt/apokeysnd-res.o
-	$(WIN32_CC) --std=c99 -DAPOKEYSND
-CLEAN += win32/apokeysnd.dll
-
-win32/rmt/pokey.h: $(srcdir)pokey.ci | win32/rmt/pokey.c
-
-win32/rmt/pokey.c: $(srcdir)pokey.ci
-	$(CITO) -l c99 -D APOKEYSND
-CLEAN += win32/rmt/pokey.c win32/rmt/pokey.h
-
-win32/rmt/apokeysnd-res.o: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DAPOKEYSND
-CLEAN += win32/rmt/apokeysnd-res.o
-
-# ASAPShellEx
-
-win32/ASAPShellEx.dll: $(srcdir)win32/shellex/ASAPShellEx.cpp win32/shellex/asap-infowriter.c win32/shellex/asap-infowriter.h win32/shellex/ASAPShellEx-res.o
-	$(WIN32_CXX) -Wl,--kill-at -lole32 -loleaut32 -lshlwapi -luuid
-CLEAN += win32/ASAPShellEx.dll
-
-win32/shellex/ASAPShellEx-res.o: $(call src,win32/gui.rc asap.h)
-	$(WIN32_WINDRES) -DSHELLEX
-CLEAN += win32/shellex/ASAPShellEx-res.o
-
-win32/x64/ASAPShellEx.dll: $(srcdir)win32/shellex/ASAPShellEx.cpp win32/shellex/asap-infowriter.c win32/shellex/asap-infowriter.h win32/x64/ASAPShellEx-res.o
-	$(WIN64_CXX) -Wl,--kill-at -lole32 -loleaut32 -lshlwapi -luuid
-CLEAN += win32/x64/ASAPShellEx.dll
-
-win32/x64/ASAPShellEx-res.o: $(call src,win32/gui.rc asap.h)
-	$(WIN64_WINDRES) -DSHELLEX
-CLEAN += win32/x64/ASAPShellEx-res.o
-
-win32/shellex/asap-infowriter.h: $(call src,asapinfo.ci asap6502.ci asapwriter.ci) $(ASM6502_OBX) | win32/shellex/asap-infowriter.c
-
-win32/shellex/asap-infowriter.c: $(call src,asapinfo.ci asap6502.ci asapwriter.ci) $(ASM6502_OBX)
-	$(CITO)
-CLEAN += win32/shellex/asap-infowriter.c win32/shellex/asap-infowriter.h
-
-# setups
-
-win32/setup: release/asap-$(VERSION)-win32.msi
-.PHONY: win32/setup
-
-release/asap-$(VERSION)-win32.msi: win32/setup/asap.wixobj release/README_WindowsSetup.html \
-	$(call src,win32/wasap/wasap.ico win32/setup/license.rtf win32/setup/asap-banner.jpg win32/setup/asap-dialog.jpg win32/setup/Website.url win32/diff-sap.js win32/shellex/ASAPShellEx.propdesc) \
-	$(addprefix win32/,asapconv.exe sap2txt.exe wasap.exe in_asap.dll gspasap.dll ASAP_Apollo.dll xmp-asap.dll bass_asap.dll apokeysnd.dll ASAPShellEx.dll asap_dsf.dll foo_asap.dll xbmc_asap.dll asapplug.dll libasap_plugin.dll)
-	$(LIGHT) -ext WixUIExtension -sice:ICE69 -b win32 -b release -b $(srcdir)win32/setup -b $(srcdir)win32 $<
-
-win32/setup/asap.wixobj: $(srcdir)win32/setup/asap.wxs
-	$(CANDLE) -dVERSION=$(VERSION) $<
-CLEAN += win32/setup/asap.wixobj
-
-release/README_WindowsSetup.html: $(call src,README win32/USAGE CREDITS)
-	$(call ASCIIDOC,-a asapwin -a asapsetup)
-CLEAN += release/README_WindowsSetup.html
-
-release/asap-$(VERSION)-win64.msi: win32/x64/asap.wixobj \
-	$(call src,win32/wasap/wasap.ico win32/setup/license.rtf win32/setup/asap-banner.jpg win32/setup/asap-dialog.jpg win32/shellex/ASAPShellEx.propdesc) \
-	win32/x64/asap_dsf.dll win32/x64/ASAPShellEx.dll
-	$(LIGHT) -ext WixUIExtension -sice:ICE69 -b win32 -b $(srcdir)/win32/setup -b $(srcdir)win32 $<
-
-win32/x64/asap.wixobj: $(srcdir)win32/setup/asap.wxs
-	$(CANDLE) -arch x64 -dVERSION=$(VERSION) $<
-CLEAN += win32/x64/asap.wixobj
-
-release/asap-$(VERSION)-wince-arm.cab: $(srcdir)win32/wince/asap.inf \
-	$(addprefix win32/wince/,wasap.exe gspasap.dll asap_dsf.dll)
-	$(DO)cd win32/wince && $(WINCE_CABWIZ) '$(shell cygpath -wa $<)' /cpu ARM
-	@mv win32/wince/asap.ARM.CAB $@
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/in2.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/in2.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/in2.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/in2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-#include "out.h"
-
-// note: exported symbol is now winampGetInModule2.
-
-#define IN_VER 0x100
-
-typedef struct 
-{
-	int version;				// module type (IN_VER)
-	char *description;			// description of module, with version string
-
-	HWND hMainWindow;			// winamp's main window (filled in by winamp)
-	HINSTANCE hDllInstance;		// DLL instance handle (Also filled in by winamp)
-
-	char *FileExtensions;		// "mp3\0Layer 3 MPEG\0mp2\0Layer 2 MPEG\0mpg\0Layer 1 MPEG\0"
-								// May be altered from Config, so the user can select what they want
-	
-	int is_seekable;			// is this stream seekable? 
-	int UsesOutputPlug;			// does this plug-in use the output plug-ins? (musn't ever change, ever :)
-
-	void (*Config)(HWND hwndParent); // configuration dialog
-	void (*About)(HWND hwndParent);  // about dialog
-
-	void (*Init)();				// called at program init
-	void (*Quit)();				// called at program quit
-
-	void (*GetFileInfo)(char *file, char *title, int *length_in_ms); // if file == NULL, current playing is used
-	int (*InfoBox)(char *file, HWND hwndParent);
-	
-	int (*IsOurFile)(char *fn);	// called before extension checks, to allow detection of mms://, etc
-	// playback stuff
-	int (*Play)(char *fn);		// return zero on success, -1 on file-not-found, some other value on other (stopping winamp) error
-	void (*Pause)();			// pause stream
-	void (*UnPause)();			// unpause stream
-	int (*IsPaused)();			// ispaused? return 1 if paused, 0 if not
-	void (*Stop)();				// stop (unload) stream
-
-	// time stuff
-	int (*GetLength)();			// get length in ms
-	int (*GetOutputTime)();		// returns current output time in ms. (usually returns outMod->GetOutputTime()
-	void (*SetOutputTime)(int time_in_ms);	// seeks to point in stream (in ms). Usually you signal yoru thread to seek, which seeks and calls outMod->Flush()..
-
-	// volume stuff
-	void (*SetVolume)(int volume);	// from 0 to 255.. usually just call outMod->SetVolume
-	void (*SetPan)(int pan);	// from -127 to 127.. usually just call outMod->SetPan
-	
-	// in-window builtin vis stuff
-
-	void (*SAVSAInit)(int maxlatency_in_ms, int srate);		// call once in Play(). maxlatency_in_ms should be the value returned from outMod->Open()
-	// call after opening audio device with max latency in ms and samplerate
-	void (*SAVSADeInit)();	// call in Stop()
-
-
-	// simple vis supplying mode
-	void (*SAAddPCMData)(void *PCMData, int nch, int bps, int timestamp); 
-											// sets the spec data directly from PCM data
-											// quick and easy way to get vis working :)
-											// needs at least 576 samples :)
-
-	// advanced vis supplying mode, only use if you're cool. Use SAAddPCMData for most stuff.
-	int (*SAGetMode)();		// gets csa (the current type (4=ws,2=osc,1=spec))
-							// use when calling SAAdd()
-	void (*SAAdd)(void *data, int timestamp, int csa); // sets the spec data, filled in by winamp
-
-
-	// vis stuff (plug-in)
-	// simple vis supplying mode
-	void (*VSAAddPCMData)(void *PCMData, int nch, int bps, int timestamp); // sets the vis data directly from PCM data
-											// quick and easy way to get vis working :)
-											// needs at least 576 samples :)
-
-	// advanced vis supplying mode, only use if you're cool. Use VSAAddPCMData for most stuff.
-	int (*VSAGetMode)(int *specNch, int *waveNch); // use to figure out what to give to VSAAdd
-	void (*VSAAdd)(void *data, int timestamp); // filled in by winamp, called by plug-in
-
-
-	// call this in Play() to tell the vis plug-ins the current output params. 
-	void (*VSASetInfo)(int nch, int srate);
-
-
-	// dsp plug-in processing: 
-	// (filled in by winamp, called by input plug)
-
-	// returns 1 if active (which means that the number of samples returned by dsp_dosamples
-	// could be greater than went in.. Use it to estimate if you'll have enough room in the
-	// output buffer
-	int (*dsp_isactive)(); 
-
-	// returns number of samples to output. This can be as much as twice numsamples. 
-	// be sure to allocate enough buffer for samples, then.
-	int (*dsp_dosamples)(short int *samples, int numsamples, int bps, int nch, int srate);
-
-
-	// eq stuff
-	void (*EQSet)(int on, char data[10], int preamp); // 0-64 each, 31 is +0, 0 is +12, 63 is -12. Do nothing to ignore.
-
-	// info setting (filled in by winamp)
-	void (*SetInfo)(int bitrate, int srate, int stereo, int synched); // if -1, changes ignored? :)
-
-	Out_Module *outMod; // filled in by winamp, optionally used :)
-} In_Module;
-
-
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/in_asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/in_asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/in_asap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/in_asap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,499 +0,0 @@
-/*
- * in_asap.c - ASAP plugin for Winamp
- *
- * Copyright (C) 2005-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <windows.h>
-#include <commctrl.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "in2.h"
-#include "ipc_pe.h"
-#include "wa_ipc.h"
-
-#include "asap.h"
-#include "aatr.h"
-#include "info_dlg.h"
-#include "settings_dlg.h"
-
-LPCTSTR atrFilenameHash(LPCTSTR filename);
-
-// Winamp's equalizer works only with 16-bit samples
-#define SUPPORT_EQUALIZER  1
-
-#define BITS_PER_SAMPLE    16
-// 576 is a magic number for Winamp, better do not modify it
-#define BUFFERED_BLOCKS    576
-
-static In_Module mod;
-
-// configuration
-#define INI_SECTION  "in_asap"
-static const char *ini_file;
-
-// current file
-ASAP *asap;
-static char playing_filename_with_song[MAX_PATH + 3] = "";
-static BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-static int module_len;
-static int duration;
-
-static int playlistLength;
-
-static HANDLE thread_handle = NULL;
-static volatile int thread_run = FALSE;
-static int paused = 0;
-static int seek_needed;
-
-static ASAPInfo *title_info;
-static int title_song;
-
-static void writeIniInt(const char *name, int value)
-{
-	char str[16];
-	sprintf(str, "%d", value);
-	WritePrivateProfileString(INI_SECTION, name, str, ini_file);
-}
-
-void onUpdatePlayingInfo(void)
-{
-	writeIniInt("playing_info", playing_info);
-}
-
-static void config(HWND hwndParent)
-{
-	if (settingsDialog(mod.hDllInstance, hwndParent)) {
-		writeIniInt("song_length", song_length);
-		writeIniInt("silence_seconds", silence_seconds);
-		writeIniInt("play_loops", play_loops);
-		writeIniInt("mute_mask", mute_mask);
-	}
-}
-
-static void about(HWND hwndParent)
-{
-	MessageBox(hwndParent, ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT,
-		"About ASAP Winamp plugin " ASAPInfo_VERSION, MB_OK);
-}
-
-static int extractSongNumber(const char *s, char *filename)
-{
-	int i = strlen(s);
-	int song = -1;
-	if (i > 6 && s[i - 1] >= '0' && s[i - 1] <= '9') {
-		if (s[i - 2] == '#') {
-			song = s[i - 1] - '1';
-			i -= 2;
-		}
-		else if (s[i - 2] >= '0' && s[i - 2] <= '9' && s[i - 3] == '#') {
-			song = (s[i - 2] - '0') * 10 + s[i - 1] - '1';
-			i -= 3;
-		}
-	}
-	memcpy(filename, s, i);
-	filename[i] = '\0';
-	return song;
-}
-
-static BOOL isATR(const char *filename)
-{
-	size_t len = strlen(filename);
-	return len >= 4 && _stricmp(filename + len - 4, ".atr") == 0;
-}
-
-static void addFileSongs(HWND playlistWnd, fileinfo *fi, const ASAPInfo *info, int *index)
-{
-	char *p = fi->file + strlen(fi->file);
-	int song;
-	for (song = 0; song < ASAPInfo_GetSongs(info); song++) {
-		COPYDATASTRUCT cds;
-		sprintf(p, "#%d", song + 1);
-		fi->index = (*index)++;
-		cds.dwData = IPC_PE_INSERTFILENAME;
-		cds.lpData = fi;
-		cds.cbData = sizeof(fileinfo);
-		SendMessage(playlistWnd, WM_COPYDATA, 0, (LPARAM) &cds);
-	}
-}
-
-static void expandFileSongs(HWND playlistWnd, int index, ASAPInfo *info)
-{
-	const char *fn = (const char *) SendMessage(mod.hMainWindow, WM_WA_IPC, index, IPC_GETPLAYLISTFILE);
-	fileinfo fi;
-	int song = extractSongNumber(fn, fi.file);
-	if (song >= 0)
-		return;
-	if (ASAPInfo_IsOurFile(fi.file)) {
-		if (loadModule(fi.file, module, &module_len)
-		 && ASAPInfo_Load(info, fi.file, module, module_len)) {
-			SendMessage(playlistWnd, WM_WA_IPC, IPC_PE_DELETEINDEX, index);
-			addFileSongs(playlistWnd, &fi, info, &index);
-		}
-	}
-	else if (isATR(fi.file)) {
-		AATR *aatr = AATR_New();
-		if (aatr != NULL) {
-			if (AATR_Open(aatr, fi.file)) {
-				size_t atr_fn_len = strlen(fi.file);
-				BOOL found = FALSE;
-				fi.file[atr_fn_len++] = '#';
-				for (;;) {
-					const char *inside_fn = AATR_NextFile(aatr);
-					if (inside_fn == NULL)
-						break;
-					if (ASAPInfo_IsOurFile(inside_fn)) {
-						module_len = AATR_ReadCurrentFile(aatr, module, sizeof(module));
-						if (ASAPInfo_Load(info, inside_fn, module, module_len)) {
-							size_t inside_fn_len = strlen(inside_fn);
-							if (atr_fn_len + inside_fn_len + 4 <= sizeof(fi.file)) {
-								memcpy(fi.file + atr_fn_len, inside_fn, inside_fn_len + 1);
-								if (!found) {
-									found = TRUE;
-									SendMessage(playlistWnd, WM_WA_IPC, IPC_PE_DELETEINDEX, index);
-								}
-								addFileSongs(playlistWnd, &fi, info, &index);
-							}
-						}
-					}
-				}
-				/* Prevent Winamp crash:
-				   1. Play anything.
-				   2. Open an ATR with no songs.
-				   3. If the ATR deletes itself, Winamp crashes (tested with 5.581).
-				   Solution: leave the ATR on playlist. */
-				if (!found && SendMessage(mod.hMainWindow, WM_WA_IPC, 0, IPC_GETLISTLENGTH) > 1)
-					SendMessage(playlistWnd, WM_WA_IPC, IPC_PE_DELETEINDEX, index);
-			}
-			AATR_Delete(aatr);
-		}
-	}
-}
-
-static INT_PTR CALLBACK progressDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (uMsg == WM_INITDIALOG)
-		SendDlgItemMessage(hDlg, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, playlistLength));
-	return FALSE;
-}
-
-static void expandPlaylistSongs(void)
-{
-	static BOOL processing = FALSE;
-	HWND playlistWnd;
-	ASAPInfo *info;
-	HWND progressWnd;
-	int index;
-	if (processing)
-		return;
-	playlistWnd = (HWND) SendMessage(mod.hMainWindow, WM_WA_IPC, IPC_GETWND_PE, IPC_GETWND);
-	if (playlistWnd == NULL)
-		return;
-	processing = TRUE;
-	info = ASAPInfo_New();
-	playlistLength = SendMessage(mod.hMainWindow, WM_WA_IPC, 0, IPC_GETLISTLENGTH);
-	progressWnd = CreateDialog(mod.hDllInstance, MAKEINTRESOURCE(IDD_PROGRESS), mod.hMainWindow, progressDialogProc);
-	index = playlistLength;
-	while (--index >= 0) {
-		if ((index & 15) == 0)
-			SendDlgItemMessage(progressWnd, IDC_PROGRESS, PBM_SETPOS, playlistLength - index, 0);
-		expandFileSongs(playlistWnd, index, info);
-	}
-	DestroyWindow(progressWnd);
-	ASAPInfo_Delete(info);
-	processing = FALSE;
-}
-
-static void init(void)
-{
-	asap = ASAP_New();
-	title_info = ASAPInfo_New();
-	ini_file = (const char *) SendMessage(mod.hMainWindow, WM_WA_IPC, 0, IPC_GETINIFILE);
-	song_length = GetPrivateProfileInt(INI_SECTION, "song_length", song_length, ini_file);
-	silence_seconds = GetPrivateProfileInt(INI_SECTION, "silence_seconds", silence_seconds, ini_file);
-	play_loops = GetPrivateProfileInt(INI_SECTION, "play_loops", play_loops, ini_file);
-	mute_mask = GetPrivateProfileInt(INI_SECTION, "mute_mask", mute_mask, ini_file);
-	playing_info = GetPrivateProfileInt(INI_SECTION, "playing_info", playing_info, ini_file);
-}
-
-static void quit(void)
-{
-	ASAP_Delete(asap);
-}
-
-static void getTitle(char *title)
-{
-	if (ASAPInfo_GetSongs(title_info) > 1)
-		sprintf(title, "%s (song %d)", ASAPInfo_GetTitleOrFilename(title_info), title_song + 1);
-	else
-		strcpy(title, ASAPInfo_GetTitleOrFilename(title_info));
-}
-
-static char *tagFunc(char *tag, void *p)
-{
-	if (stricmp(tag, "artist") == 0) {
-		const char *author = ASAPInfo_GetAuthor(title_info);
-		return author[0] != '\0' ? strdup(author) : NULL;
-	}
-	if (stricmp(tag, "title") == 0) {
-		char *title = malloc(strlen(ASAPInfo_GetTitleOrFilename(title_info)) + 11);
-		if (title != NULL)
-			getTitle(title);
-		return title;
-	}
-	return NULL;
-}
-
-static void tagFreeFunc(char *tag, void *p)
-{
-	free(tag);
-}
-
-static void getFileInfo(char *file, char *title, int *length_in_ms)
-{
-	char filename[MAX_PATH];
-	const char *hash;
-	if (file == NULL || file[0] == '\0')
-		file = playing_filename_with_song;
-	title_song = extractSongNumber(file, filename);
-	if (title_song < 0)
-		expandPlaylistSongs();
-	if (!loadModule(filename, module, &module_len))
-		return;
-	hash = atrFilenameHash(filename);
-	if (!ASAPInfo_Load(title_info, hash != NULL ? hash + 1 : filename, module, module_len))
-		return;
-	if (title_song < 0)
-		title_song = ASAPInfo_GetDefaultSong(title_info);
-	if (title != NULL) {
-		waFormatTitle fmt_title = {
-			NULL, NULL, title, 512, tagFunc, tagFreeFunc
-		};
-		getTitle(title); // in case IPC_FORMAT_TITLE doesn't work...
-		SendMessage(mod.hMainWindow, WM_WA_IPC, (WPARAM) &fmt_title, IPC_FORMAT_TITLE);
-	}
-	if (length_in_ms != NULL)
-		*length_in_ms = getSongDuration(title_info, title_song);
-}
-
-static int infoBox(char *file, HWND hwndParent)
-{
-	char filename[MAX_PATH];
-	int song;
-	song = extractSongNumber(file, filename);
-	showInfoDialog(mod.hDllInstance, hwndParent, filename, song);
-	return 0;
-}
-
-static int isOurFile(char *fn)
-{
-	char filename[MAX_PATH];
-	extractSongNumber(fn, filename);
-	return ASAPInfo_IsOurFile(filename);
-}
-
-static DWORD WINAPI playThread(LPVOID dummy)
-{
-	int channels = ASAPInfo_GetChannels(ASAP_GetInfo(asap));
-	while (thread_run) {
-		static BYTE buffer[BUFFERED_BLOCKS * 2 * (BITS_PER_SAMPLE / 8)
-#if SUPPORT_EQUALIZER
-			* 2
-#endif
-			];
-		int buffered_bytes = BUFFERED_BLOCKS * channels * (BITS_PER_SAMPLE / 8);
-		if (seek_needed >= 0) {
-			mod.outMod->Flush(seek_needed);
-			ASAP_Seek(asap, seek_needed);
-			seek_needed = -1;
-		}
-		if (mod.outMod->CanWrite() >= buffered_bytes
-#if SUPPORT_EQUALIZER
-			<< mod.dsp_isactive()
-#endif
-		) {
-			int t;
-			buffered_bytes = ASAP_Generate(asap, buffer, buffered_bytes, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-			if (buffered_bytes <= 0) {
-				mod.outMod->CanWrite();
-				if (!mod.outMod->IsPlaying()) {
-					PostMessage(mod.hMainWindow, WM_WA_MPEG_EOF, 0, 0);
-					return 0;
-				}
-				Sleep(10);
-				continue;
-			}
-			t = mod.outMod->GetWrittenTime();
-			mod.SAAddPCMData(buffer, channels, BITS_PER_SAMPLE, t);
-			mod.VSAAddPCMData(buffer, channels, BITS_PER_SAMPLE, t);
-#if SUPPORT_EQUALIZER
-			t = buffered_bytes / (channels * (BITS_PER_SAMPLE / 8));
-			t = mod.dsp_dosamples((short *) buffer, t, BITS_PER_SAMPLE, channels, ASAP_SAMPLE_RATE);
-			t *= channels * (BITS_PER_SAMPLE / 8);
-			mod.outMod->Write((char *) buffer, t);
-#else
-			mod.outMod->Write((char *) buffer, buffered_bytes);
-#endif
-		}
-		else
-			Sleep(20);
-	}
-	return 0;
-}
-
-static int play(char *fn)
-{
-	char filename[MAX_PATH];
-	int song;
-	const ASAPInfo *info;
-	int channels;
-	int maxlatency;
-	DWORD threadId;
-	strcpy(playing_filename_with_song, fn);
-	song = extractSongNumber(fn, filename);
-	if (!loadModule(filename, module, &module_len))
-		return -1;
-	if (!ASAP_Load(asap, filename, module, module_len))
-		return 1;
-	info = ASAP_GetInfo(asap);
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(info);
-	duration = playSong(song);
-	channels = ASAPInfo_GetChannels(info);
-	maxlatency = mod.outMod->Open(ASAP_SAMPLE_RATE, channels, BITS_PER_SAMPLE, -1, -1);
-	if (maxlatency < 0)
-		return 1;
-	mod.SetInfo(BITS_PER_SAMPLE, ASAP_SAMPLE_RATE / 1000, channels, 1);
-	mod.SAVSAInit(maxlatency, ASAP_SAMPLE_RATE);
-	// the order of VSASetInfo's arguments in in2.h is wrong!
-	// http://forums.winamp.com/showthread.php?postid=1841035
-	mod.VSASetInfo(ASAP_SAMPLE_RATE, channels);
-	mod.outMod->SetVolume(-666);
-	seek_needed = -1;
-	thread_run = TRUE;
-	thread_handle = CreateThread(NULL, 0, playThread, NULL, 0, &threadId);
-	setPlayingSong(filename, song);
-	return thread_handle != NULL ? 0 : 1;
-}
-
-static void pause(void)
-{
-	paused = 1;
-	mod.outMod->Pause(1);
-}
-
-static void unPause(void)
-{
-	paused = 0;
-	mod.outMod->Pause(0);
-}
-
-static int isPaused(void)
-{
-	return paused;
-}
-
-static void stop(void)
-{
-	if (thread_handle != NULL) {
-		thread_run = FALSE;
-		// wait max 10 seconds
-		if (WaitForSingleObject(thread_handle, 10 * 1000) == WAIT_TIMEOUT)
-			TerminateThread(thread_handle, 0);
-		CloseHandle(thread_handle);
-		thread_handle = NULL;
-	}
-	mod.outMod->Close();
-	mod.SAVSADeInit();
-}
-
-static int getLength(void)
-{
-	return duration;
-}
-
-static int getOutputTime(void)
-{
-	return mod.outMod->GetOutputTime();
-}
-
-static void setOutputTime(int time_in_ms)
-{
-	seek_needed = time_in_ms;
-}
-
-static void setVolume(int volume)
-{
-	mod.outMod->SetVolume(volume);
-}
-
-static void setPan(int pan)
-{
-	mod.outMod->SetPan(pan);
-}
-
-static void eqSet(int on, char data[10], int preamp)
-{
-}
-
-static In_Module mod = {
-	IN_VER,
-	"ASAP " ASAPInfo_VERSION,
-	0, 0, // filled by Winamp
-	"SAP\0Slight Atari Player (*.SAP)\0"
-	"CMC;CM3;CMR;CMS;DMC\0Chaos Music Composer (*.CMC;*.CM3;*.CMR;*.CMS;*.DMC)\0"
-	"DLT\0Delta Music Composer (*.DLT)\0"
-	"MPT;MPD\0Music ProTracker (*.MPT;*.MPD)\0"
-	"RMT\0Raster Music Tracker (*.RMT)\0"
-	"TMC;TM8\0Theta Music Composer 1.x (*.TMC;*.TM8)\0"
-	"TM2\0Theta Music Composer 2.x (*.TM2)\0"
-	"FC\0FutureComposer (*.FC)\0"
-	"ATR\0Atari 8-bit disk image (*.ATR)\0"
-	,
-	1,    // is_seekable
-	1,    // UsesOutputPlug
-	config,
-	about,
-	init,
-	quit,
-	getFileInfo,
-	infoBox,
-	isOurFile,
-	play,
-	pause,
-	unPause,
-	isPaused,
-	stop,
-	getLength,
-	getOutputTime,
-	setOutputTime,
-	setVolume,
-	setPan,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // filled by Winamp
-	eqSet,
-	NULL, // SetInfo
-	NULL  // filled by Winamp
-};
-
-__declspec(dllexport) In_Module *winampGetInModule2(void)
-{
-	return &mod;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/ipc_pe.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/ipc_pe.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/ipc_pe.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/ipc_pe.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#ifndef __IPC_PE_H
-#define __IPC_PE_H
-
-#define IPC_PE_GETCURINDEX        100 // returns current idx
-#define IPC_PE_GETINDEXTOTAL      101 // returns number of items 
-#define IPC_PE_GETINDEXINFO       102 // (copydata) lpData is of type callbackinfo, callback is called with copydata/fileinfo structure and msg IPC_PE_GETINDEXINFORESULT
-#define IPC_PE_GETINDEXINFORESULT 103 // callback message for IPC_PE_GETINDEXINFO
-#define IPC_PE_DELETEINDEX        104 // lParam = index
-#define IPC_PE_SWAPINDEX          105 // (lParam & 0xFFFF0000) >> 16 = from, (lParam & 0xFFFF) = to
-#define IPC_PE_INSERTFILENAME     106 // (copydata) lpData is of type fileinfo
-#define IPC_PE_GETDIRTY           107 // returns 1 if the playlist changed since the last IPC_PE_SETCLEAN
-#define IPC_PE_SETCLEAN	          108 // resets the dirty flag until next modification
-#define IPC_PE_GETIDXFROMPOINT    109 // pass a point parm, return a playlist index
-#define IPC_PE_SAVEEND            110 // pass index to save from
-#define IPC_PE_RESTOREEND         111 // no parm
-
-typedef struct {
-	char file[MAX_PATH];
-	int index;
-	} fileinfo;
-
-typedef struct {
-	HWND callback;
-	int index;
-	} callbackinfo;
-
-// the following messages are in_process ONLY
-
-#define IPC_PE_GETINDEXTITLE      200 // lParam = pointer to fileinfo2 struct
-
-typedef struct {
-  int fileindex;
-  char filetitle[256];
-  char filelength[16];
-  } fileinfo2;
-
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/out.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/out.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/out.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/out.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#define OUT_VER 0x10
-
-typedef struct 
-{
-	int version;				// module version (OUT_VER)
-	char *description;			// description of module, with version string
-	int id;						// module id. each input module gets its own. non-nullsoft modules should
-								// be >= 65536. 
-
-	HWND hMainWindow;			// winamp's main window (filled in by winamp)
-	HINSTANCE hDllInstance;		// DLL instance handle (filled in by winamp)
-
-	void (*Config)(HWND hwndParent); // configuration dialog 
-	void (*About)(HWND hwndParent);  // about dialog
-
-	void (*Init)();				// called when loaded
-	void (*Quit)();				// called when unloaded
-
-	int (*Open)(int samplerate, int numchannels, int bitspersamp, int bufferlenms, int prebufferms); 
-					// returns >=0 on success, <0 on failure
-					// NOTENOTENOTE: bufferlenms and prebufferms are ignored in most if not all output plug-ins. 
-					//    ... so don't expect the max latency returned to be what you asked for.
-					// returns max latency in ms (0 for diskwriters, etc)
-					// bufferlenms and prebufferms must be in ms. 0 to use defaults. 
-					// prebufferms must be <= bufferlenms
-
-	void (*Close)();	// close the ol' output device.
-
-	int (*Write)(char *buf, int len);	
-					// 0 on success. Len == bytes to write (<= 8192 always). buf is straight audio data. 
-					// 1 returns not able to write (yet). Non-blocking, always.
-
-	int (*CanWrite)();	// returns number of bytes possible to write at a given time. 
-						// Never will decrease unless you call Write (or Close, heh)
-
-	int (*IsPlaying)(); // non0 if output is still going or if data in buffers waiting to be
-						// written (i.e. closing while IsPlaying() returns 1 would truncate the song
-
-	int (*Pause)(int pause); // returns previous pause state
-
-	void (*SetVolume)(int volume); // volume is 0-255
-	void (*SetPan)(int pan); // pan is -128 to 128
-
-	void (*Flush)(int t);	// flushes buffers and restarts output at time t (in ms) 
-							// (used for seeking)
-
-	int (*GetOutputTime)(); // returns played time in MS
-	int (*GetWrittenTime)(); // returns time written in MS (used for synching up vis stuff)
-
-} Out_Module;
-
-
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/wa_ipc.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/wa_ipc.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/winamp/wa_ipc.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/winamp/wa_ipc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1022 +0,0 @@
-/*
-** Copyright (C) 2003 Nullsoft, Inc.
-**
-** This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held 
-** liable for any damages arising from the use of this software. 
-**
-** Permission is granted to anyone to use this software for any purpose, including commercial applications, and to 
-** alter it and redistribute it freely, subject to the following restrictions:
-**
-**   1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. 
-**      If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-**
-**   2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-**
-**   3. This notice may not be removed or altered from any source distribution.
-**
-*/
-
-#ifndef _WA_IPC_H_
-#define _WA_IPC_H_
-
-/*
-** This is the modern replacement for the classic 'frontend.h'. Most of these 
-** updates are designed for in-process use, i.e. from a plugin.
-**
-*/
-
-/* message used to sent many messages to winamp's main window. 
-** most all of the IPC_* messages involve sending the message in the form of:
-**   result = SendMessage(hwnd_winamp,WM_WA_IPC,(parameter),IPC_*);
-*/
-#define WM_WA_IPC WM_USER
-/* but some of them use WM_COPYDATA. be afraid.
-*/
-
-#define IPC_GETVERSION 0
-/* int version = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETVERSION);
-**
-** Version will be 0x20yx for winamp 2.yx. versions previous to Winamp 2.0
-** typically (but not always) use 0x1zyx for 1.zx versions. Weird, I know.
-*/
-
-#define IPC_GETREGISTEREDVERSION 770
-
-
-typedef struct {
-  char *filename;
-  char *title;
-  int length;
-} enqueueFileWithMetaStruct; // send this to a IPC_PLAYFILE in a non WM_COPYDATA, 
-// and you get the nice desired result. if title is NULL, it is treated as a "thing",
-// otherwise it's assumed to be a file (for speed)
-
-#define IPC_PLAYFILE 100  // dont be fooled, this is really the same as enqueufile
-#define IPC_ENQUEUEFILE 100 
-/* sent as a WM_COPYDATA, with IPC_PLAYFILE as the dwData, and the string to play
-** as the lpData. Just enqueues, does not clear the playlist or change the playback
-** state.
-*/
-
-
-#define IPC_DELETE 101
-#define IPC_DELETE_INT 1101 // don't use this, it's used internally by winamp when 
-                            // dealing with some lame explorer issues.
-/* SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_DELETE);
-** Use IPC_DELETE to clear Winamp's internal playlist.
-*/
-
-
-#define IPC_STARTPLAY 102   // starts playback. almost like hitting play in Winamp.
-#define IPC_STARTPLAY_INT 1102 // used internally, don't bother using it (won't be any fun)
-
-
-#define IPC_CHDIR 103
-/* sent as a WM_COPYDATA, with IPC_CHDIR as the dwData, and the directory to change to
-** as the lpData. 
-*/
-
-
-#define IPC_ISPLAYING 104
-/* int res = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_ISPLAYING);
-** If it returns 1, it is playing. if it returns 3, it is paused, 
-** if it returns 0, it is not playing.
-*/
-
-
-#define IPC_GETOUTPUTTIME 105
-/* int res = SendMessage(hwnd_winamp,WM_WA_IPC,mode,IPC_GETOUTPUTTIME);
-** returns the position in milliseconds of the current track (mode = 0), 
-** or the track length, in seconds (mode = 1). Returns -1 if not playing or error.
-*/
-
-
-#define IPC_JUMPTOTIME 106
-/* (requires Winamp 1.60+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,ms,IPC_JUMPTOTIME);
-** IPC_JUMPTOTIME sets the position in milliseconds of the 
-** current song (approximately).
-** Returns -1 if not playing, 1 on eof, or 0 if successful
-*/
-
-#define IPC_GETMODULENAME 109
-#define IPC_EX_ISRIGHTEXE 666
-/* usually shouldnt bother using these, but here goes:
-** send a WM_COPYDATA with IPC_GETMODULENAME, and an internal
-** flag gets set, which if you send a normal WM_WA_IPC message with
-** IPC_EX_ISRIGHTEXE, it returns whether or not that filename
-** matches. lame, I know.
-*/
-
-#define IPC_WRITEPLAYLIST 120
-/* (requires Winamp 1.666+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_WRITEPLAYLIST);
-**
-** IPC_WRITEPLAYLIST writes the current playlist to <winampdir>\\Winamp.m3u,
-** and returns the current playlist position.
-** Kinda obsoleted by some of the 2.x new stuff, but still good for when
-** using a front-end (instead of a plug-in)
-*/
-
-
-#define IPC_SETPLAYLISTPOS 121
-/* (requires Winamp 2.0+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,position,IPC_SETPLAYLISTPOS)
-** IPC_SETPLAYLISTPOS sets the playlist position to 'position'. It
-** does not change playback or anything, it just sets position, and
-** updates the view if necessary
-*/
-
-
-#define IPC_SETVOLUME 122
-/* (requires Winamp 2.0+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,volume,IPC_SETVOLUME);
-** IPC_SETVOLUME sets the volume of Winamp (from 0-255).
-*/
-
-
-#define IPC_SETPANNING 123
-/* (requires Winamp 2.0+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,panning,IPC_SETPANNING);
-** IPC_SETPANNING sets the panning of Winamp (from 0 (left) to 255 (right)).
-*/
-
-
-#define IPC_GETLISTLENGTH 124
-/* (requires Winamp 2.0+)
-** int length = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETLISTLENGTH);
-** IPC_GETLISTLENGTH returns the length of the current playlist, in
-** tracks.
-*/
-
-
-#define IPC_GETLISTPOS 125
-/* (requires Winamp 2.05+)
-** int pos=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETLISTPOS);
-** IPC_GETLISTPOS returns the playlist position. A lot like IPC_WRITEPLAYLIST
-** only faster since it doesn't have to write out the list. Heh, silly me.
-*/
-
-
-#define IPC_GETINFO 126
-/* (requires Winamp 2.05+)
-** int inf=SendMessage(hwnd_winamp,WM_WA_IPC,mode,IPC_GETINFO);
-** IPC_GETINFO returns info about the current playing song. The value
-** it returns depends on the value of 'mode'.
-** Mode      Meaning
-** ------------------
-** 0         Samplerate (i.e. 44100)
-** 1         Bitrate  (i.e. 128)
-** 2         Channels (i.e. 2)
-** 3 (5+)    Video LOWORD=w HIWORD=h
-** 4 (5+)    > 65536, string (video description)
-*/
-
-
-#define IPC_GETEQDATA 127
-/* (requires Winamp 2.05+)
-** int data=SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA);
-** IPC_GETEQDATA queries the status of the EQ. 
-** The value returned depends on what 'pos' is set to:
-** Value      Meaning
-** ------------------
-** 0-9        The 10 bands of EQ data. 0-63 (+20db - -20db)
-** 10         The preamp value. 0-63 (+20db - -20db)
-** 11         Enabled. zero if disabled, nonzero if enabled.
-** 12         Autoload. zero if disabled, nonzero if enabled.
-*/
-
-
-#define IPC_SETEQDATA 128
-/* (requires Winamp 2.05+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA);
-** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SETEQDATA);
-** IPC_SETEQDATA sets the value of the last position retrieved
-** by IPC_GETEQDATA. This is pretty lame, and we should provide
-** an extended version that lets you do a MAKELPARAM(pos,value).
-** someday...
-
-  new (2.92+): 
-    if the high byte is set to 0xDB, then the third byte specifies
-    which band, and the bottom word specifies the value.
-*/
-
-#define IPC_ADDBOOKMARK 129
-/* (requires Winamp 2.4+)
-** Sent as a WM_COPYDATA, using IPC_ADDBOOKMARK, adds the specified
-** file/url to the Winamp bookmark list.
-*/
-/*
-In winamp 5+, we use this as a normal WM_WA_IPC and the string:
-
-  "filename\0title\0"
-
-  to notify the library/bookmark editor that a bookmark
-was added. Note that using this message in this context does not
-actually add the bookmark.
-do not use :)
-*/
-
-
-#define IPC_INSTALLPLUGIN 130
-/* not implemented, but if it was you could do a WM_COPYDATA with 
-** a path to a .wpz, and it would install it.
-*/
-
-
-#define IPC_RESTARTWINAMP 135
-/* (requires Winamp 2.2+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_RESTARTWINAMP);
-** IPC_RESTARTWINAMP will restart Winamp (isn't that obvious ? :)
-*/
-
-
-#define IPC_ISFULLSTOP 400
-/* (requires winamp 2.7+ I think)
-** ret=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_ISFULLSTOP);
-** useful for when you're an output plugin, and you want to see
-** if the stop/close is a full stop, or just between tracks.
-** returns nonzero if it's full, zero if it's just a new track.
-*/
-
-
-#define IPC_INETAVAILABLE 242
-/* (requires Winamp 2.05+)
-** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_INETAVAILABLE);
-** IPC_INETAVAILABLE will return 1 if the Internet connection is available for Winamp.
-*/
-
-
-#define IPC_UPDTITLE 243
-/* (requires Winamp 2.2+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_UPDTITLE);
-** IPC_UPDTITLE will ask Winamp to update the informations about the current title.
-*/
-
-
-#define IPC_REFRESHPLCACHE 247
-/* (requires Winamp 2.2+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_REFRESHPLCACHE);
-** IPC_REFRESHPLCACHE will flush the playlist cache buffer.
-** (send this if you want it to go refetch titles for tracks)
-*/
-
-
-#define IPC_GET_SHUFFLE 250
-/* (requires Winamp 2.4+)
-** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GET_SHUFFLE);
-**
-** IPC_GET_SHUFFLE returns the status of the Shuffle option (1 if set)
-*/
-
-
-#define IPC_GET_REPEAT 251
-/* (requires Winamp 2.4+)
-** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GET_REPEAT);
-**
-** IPC_GET_REPEAT returns the status of the Repeat option (1 if set)
-*/
-
-
-#define IPC_SET_SHUFFLE 252
-/* (requires Winamp 2.4+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SET_SHUFFLE);
-**
-** IPC_SET_SHUFFLE sets the status of the Shuffle option (1 to turn it on)
-*/
-
-
-#define IPC_SET_REPEAT 253
-/* (requires Winamp 2.4+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SET_REPEAT);
-**
-** IPC_SET_REPEAT sets the status of the Repeat option (1 to turn it on)
-*/
-
-
-#define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable
-/* (requires Winamp 2.9+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,enable?0:0xdeadbeef,IPC_MBOPENREAL);
-** sending with 0xdeadbeef as the param disables all winamp windows, 
-** any other values will enable all winamp windows.
-*/
-
-
-#define IPC_GETWND 260
-/* (requires Winamp 2.9+)
-** HWND h=SendMessage(hwnd_winamp,WM_WA_IPC,IPC_GETWND_xxx,IPC_GETWND);
-** returns the HWND of the window specified.
-*/
-  #define IPC_GETWND_EQ 0 // use one of these for the param
-  #define IPC_GETWND_PE 1
-  #define IPC_GETWND_MB 2
-  #define IPC_GETWND_VIDEO 3
-#define IPC_ISWNDVISIBLE 261 // same param as IPC_GETWND
-
-
-
-
-/************************************************************************
-***************** in-process only (WE LOVE PLUGINS)
-************************************************************************/
-
-
-#define IPC_SETSKIN 200
-/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)"skinname",IPC_SETSKIN);
-** IPC_SETSKIN sets the current skin to "skinname". Note that skinname 
-** can be the name of a skin, a skin .zip file, with or without path. 
-** If path isn't specified, the default search path is the winamp skins 
-** directory.
-*/
-
-
-#define IPC_GETSKIN 201
-/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)skinname_buffer,IPC_GETSKIN);
-** IPC_GETSKIN puts the directory where skin bitmaps can be found 
-** into  skinname_buffer.
-** skinname_buffer must be MAX_PATH characters in length.
-** When using a .zip'd skin file, it'll return a temporary directory
-** where the ZIP was decompressed.
-*/
-
-
-#define IPC_EXECPLUG 202
-/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)"vis_file.dll",IPC_EXECPLUG);
-** IPC_EXECPLUG executes a visualization plug-in pointed to by WPARAM.
-** the format of this string can be:
-** "vis_whatever.dll"
-** "vis_whatever.dll,0" // (first mod, file in winamp plug-in dir)
-** "C:\\dir\\vis_whatever.dll,1" 
-*/
-
-
-#define IPC_GETPLAYLISTFILE 211
-/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
-** char *name=SendMessage(hwnd_winamp,WM_WA_IPC,index,IPC_GETPLAYLISTFILE);
-** IPC_GETPLAYLISTFILE gets the filename of the playlist entry [index].
-** returns a pointer to it. returns NULL on error.
-*/
-
-
-#define IPC_GETPLAYLISTTITLE 212
-/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
-** char *name=SendMessage(hwnd_winamp,WM_WA_IPC,index,IPC_GETPLAYLISTTITLE);
-**
-** IPC_GETPLAYLISTTITLE gets the title of the playlist entry [index].
-** returns a pointer to it. returns NULL on error.
-*/
-
-
-#define IPC_GETHTTPGETTER 240
-/* retrieves a function pointer to a HTTP retrieval function.
-** if this is unsupported, returns 1 or 0.
-** the function should be:
-** int (*httpRetrieveFile)(HWND hwnd, char *url, char *file, char *dlgtitle);
-** if you call this function, with a parent window, a URL, an output file, and a dialog title,
-** it will return 0 on successful download, 1 on error.
-*/
-
-
-#define IPC_MBOPEN 241
-/* (requires Winamp 2.05+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_MBOPEN);
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)url,IPC_MBOPEN);
-** IPC_MBOPEN will open a new URL in the minibrowser. if url is NULL, it will open the Minibrowser window.
-*/
-
-
-
-#define IPC_CHANGECURRENTFILE 245
-/* (requires Winamp 2.05+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)file,IPC_CHANGECURRENTFILE);
-** IPC_CHANGECURRENTFILE will set the current playlist item.
-*/
-
-
-#define IPC_GETMBURL 246
-/* (requires Winamp 2.2+)
-** char buffer[4096]; // Urls can be VERY long
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)buffer,IPC_GETMBURL);
-** IPC_GETMBURL will retrieve the current Minibrowser URL into buffer.
-** buffer must be at least 4096 bytes long.
-*/
-
-
-#define IPC_MBBLOCK 248
-/* (requires Winamp 2.4+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_MBBLOCK);
-**
-** IPC_MBBLOCK will block the Minibrowser from updates if value is set to 1
-*/
-
-#define IPC_MBOPENREAL 249
-/* (requires Winamp 2.4+)
-** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)url,IPC_MBOPENREAL);
-**
-** IPC_MBOPENREAL works the same as IPC_MBOPEN except that it will works even if 
-** IPC_MBBLOCK has been set to 1
-*/
-
-#define IPC_ADJUST_OPTIONSMENUPOS 280
-/* (requires Winamp 2.9+)
-** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_OPTIONSMENUPOS);
-** moves where winamp expects the Options menu in the main menu. Useful if you wish to insert a
-** menu item above the options/skins/vis menus.
-*/
-
-#define IPC_GET_HMENU 281
-/* (requires Winamp 2.9+)
-** HMENU hMenu=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)0,IPC_GET_HMENU);
-** values for data:
-** 0 : main popup menu 
-** 1 : main menubar file menu
-** 2 : main menubar options menu
-** 3 : main menubar windows menu
-** 4 : main menubar help menu
-** other values will return NULL.
-*/
-
-#define IPC_GET_EXTENDED_FILE_INFO 290 //pass a pointer to the following struct in wParam
-#define IPC_GET_EXTENDED_FILE_INFO_HOOKABLE 296
-/* (requires Winamp 2.9+)
-** to use, create an extendedFileInfoStruct, point the values filename and metadata to the
-** filename and metadata field you wish to query, and ret to a buffer, with retlen to the
-** length of that buffer, and then SendMessage(hwnd_winamp,WM_WA_IPC,&struct,IPC_GET_EXTENDED_FILE_INFO);
-** the results should be in the buffer pointed to by ret.
-** returns 1 if the decoder supports a getExtendedFileInfo method
-*/
-typedef struct {
-  char *filename;
-  char *metadata;
-  char *ret;
-  int retlen;
-} extendedFileInfoStruct;
-
-#define IPC_GET_BASIC_FILE_INFO 291 //pass a pointer to the following struct in wParam
-typedef struct {
-  char *filename;
-
-  int quickCheck; // set to 0 to always get, 1 for quick, 2 for default (if 2, quickCheck will be set to 0 if quick wasnot used)
-
-  // filled in by winamp
-  int length;
-  char *title;
-  int titlelen;
-} basicFileInfoStruct;
-
-#define IPC_GET_EXTLIST 292 //returns doublenull delimited. GlobalFree() it when done. if data is 0, returns raw extlist, if 1, returns something suitable for getopenfilename
-
-#define IPC_INFOBOX 293
-typedef struct {
-  HWND parent;
-  char *filename;
-} infoBoxParam;
-
-#define IPC_SET_EXTENDED_FILE_INFO 294 //pass a pointer to the a extendedFileInfoStruct in wParam
-/* (requires Winamp 2.9+)
-** to use, create an extendedFileInfoStruct, point the values filename and metadata to the
-** filename and metadata field you wish to write in ret. (retlen is not used). and then 
-** SendMessage(hwnd_winamp,WM_WA_IPC,&struct,IPC_SET_EXTENDED_FILE_INFO);
-** returns 1 if the metadata is supported
-** Call IPC_WRITE_EXTENDED_FILE_INFO once you're done setting all the metadata you want to update
-*/
-
-#define IPC_WRITE_EXTENDED_FILE_INFO 295 
-/* (requires Winamp 2.9+)
-** writes all the metadata set thru IPC_SET_EXTENDED_FILE_INFO to the file
-** returns 1 if the file has been successfully updated, 0 if error
-*/
-
-#define IPC_FORMAT_TITLE 297
-typedef struct 
-{
-  char *spec; // NULL=default winamp spec
-  void *p;
-
-  char *out;
-  int out_len;
-
-  char * (*TAGFUNC)(char * tag, void * p); //return 0 if not found
-  void (*TAGFREEFUNC)(char * tag,void * p);
-} waFormatTitle;
-
-#define IPC_GETUNCOMPRESSINTERFACE 331
-/* returns a function pointer to uncompress().
-** int (*uncompress)(unsigned char *dest, unsigned long *destLen, const unsigned char *source, unsigned long sourceLen);
-** right out of zlib, useful for decompressing zlibbed data.
-** if you pass the parm of 0x10100000, it will return a wa_inflate_struct * to an inflate API.
-*/
-
-typedef struct {
-  int (*inflateReset)(void *strm);
-  int (*inflateInit_)(void *strm,const char *version, int stream_size);
-  int (*inflate)(void *strm, int flush);
-  int (*inflateEnd)(void *strm);
-  unsigned long (*crc32)(unsigned long crc, const unsigned  char *buf, unsigned int len);
-} wa_inflate_struct;
-
-
-#define IPC_ADD_PREFS_DLG 332
-#define IPC_REMOVE_PREFS_DLG 333
-/* (requires Winamp 2.9+)
-** to use, allocate a prefsDlgRec structure (either on the heap or some global
-** data, but NOT on the stack), initialze the members:
-** hInst to the DLL instance where the resource is located
-** dlgID to the ID of the dialog,
-** proc to the window procedure for the dialog
-** name to the name of the prefs page in the prefs.
-** where to 0 (eventually we may add more options)
-** then, SendMessage(hwnd_winamp,WM_WA_IPC,&prefsRec,IPC_ADD_PREFS_DLG);
-**
-** you can also IPC_REMOVE_PREFS_DLG with the address of the same prefsRec,
-** but you shouldn't really ever have to.
-**
-*/
-#define IPC_OPENPREFSTOPAGE 380 // pass an id of a builtin page, or a &prefsDlgRec of prefs page to open
-
-typedef struct _prefsDlgRec {
-  HINSTANCE hInst;
-  int dlgID;
-  void *proc;
-
-  char *name;
-  int where; // 0 for options, 1 for plugins, 2 for skins, 3 for bookmarks, 4 for prefs
-
-
-  int _id;
-  struct _prefsDlgRec *next;
-} prefsDlgRec;
-
-
-#define IPC_GETINIFILE 334 // returns a pointer to winamp.ini
-#define IPC_GETINIDIRECTORY 335 // returns a pointer to the directory to put config files in (if you dont want to use winamp.ini)
-
-#define IPC_SPAWNBUTTONPOPUP 361 // param =
-// 0 = eject
-// 1 = previous
-// 2 = next
-// 3 = pause
-// 4 = play
-// 5 = stop
-
-#define IPC_OPENURLBOX 360 // pass a HWND to a parent, returns a HGLOBAL that needs to be freed with GlobalFree(), if successful
-#define IPC_OPENFILEBOX 362 // pass a HWND to a parent
-#define IPC_OPENDIRBOX 363 // pass a HWND to a parent
-
-// pass an HWND to a parent. call this if you take over the whole UI so that the dialogs are not appearing on the
-// bottom right of the screen since the main winamp window is at 3000x3000, call again with NULL to reset
-#define IPC_SETDIALOGBOXPARENT 364 
-
-
-
-// pass 0 for a copy of the skin HBITMAP
-// pass 1 for name of font to use for playlist editor likeness
-// pass 2 for font charset
-// pass 3 for font size
-#define IPC_GET_GENSKINBITMAP 503
-
-
-#define IPC_GET_EMBEDIF 505 // pass an embedWindowState
-// returns an HWND embedWindow(embedWindowState *); if the data is NULL, otherwise returns the HWND directly
-typedef struct
-{
-  HWND me; //hwnd of the window
-
-  int flags;
-
-  RECT r;
-
-  void *user_ptr; // for application use
-
-  int extra_data[64]; // for internal winamp use
-} embedWindowState;
-
-#define EMBED_FLAGS_NORESIZE 1 // set this bit in embedWindowState.flags to keep window from being resizable
-#define EMBED_FLAGS_NOTRANSPARENCY 2 // set this bit in embedWindowState.flags to make gen_ff turn transparency off for this wnd
-
-
-#define IPC_EMBED_ENUM 532
-typedef struct embedEnumStruct
-{
-  int (*enumProc)(embedWindowState *ws, struct embedEnumStruct *param); // return 1 to abort
-  int user_data; // or more :)
-} embedEnumStruct;
-  // pass 
-
-#define IPC_EMBED_ISVALID 533
-
-#define IPC_CONVERTFILE 506
-/* (requires Winamp 2.92+)
-** Converts a given file to a different format (PCM, MP3, etc...)
-** To use, pass a pointer to a waFileConvertStruct struct
-** This struct can be either on the heap or some global
-** data, but NOT on the stack. At least, until the conversion is done.
-**
-** eg: SendMessage(hwnd_winamp,WM_WA_IPC,&myConvertStruct,IPC_CONVERTFILE);
-**
-** Return value:
-** 0: Can't start the conversion. Look at myConvertStruct->error for details.
-** 1: Conversion started. Status messages will be sent to the specified callbackhwnd.
-**    Be sure to call IPC_CONVERTFILE_END when your callback window receives the
-**    IPC_CB_CONVERT_DONE message.
-*/
-typedef struct 
-{
-  char *sourcefile;  // "c:\\source.mp3"
-  char *destfile;    // "c:\\dest.pcm"
-  int destformat[8]; // like 'PCM ',srate,nch,bps
-  HWND callbackhwnd; // window that will receive the IPC_CB_CONVERT notification messages
-  
-  //filled in by winamp.exe
-  char *error;        //if IPC_CONVERTFILE returns 0, the reason will be here
-
-  int bytes_done;     //you can look at both of these values for speed statistics
-  int bytes_total;
-  int bytes_out;
-
-  int killswitch;     // don't set it manually, use IPC_CONVERTFILE_END
-  int extra_data[64]; // for internal winamp use
-} convertFileStruct;
-
-#define IPC_CONVERTFILE_END 507
-/* (requires Winamp 2.92+)
-** Stop/ends a convert process started from IPC_CONVERTFILE
-** You need to call this when you receive the IPC_CB_CONVERTDONE message or when you
-** want to abort a conversion process
-**
-** eg: SendMessage(hwnd_winamp,WM_WA_IPC,&myConvertStruct,IPC_CONVERTFILE_END);
-**
-** No return value
-*/
-
-typedef struct {
-  HWND hwndParent;
-  int format;
-
-  //filled in by winamp.exe
-  HWND hwndConfig;
-  int extra_data[8];
-} convertConfigStruct;
-#define IPC_CONVERT_CONFIG 508
-#define IPC_CONVERT_CONFIG_END 509
-
-typedef struct
-{
-  void (*enumProc)(int user_data, const char *desc, int fourcc);
-  int user_data;
-} converterEnumFmtStruct;
-#define IPC_CONVERT_CONFIG_ENUMFMTS 510
-/* (requires Winamp 2.92+)
-*/
-
-
-typedef struct
-{
-  char cdletter;
-  char *playlist_file;
-  HWND callback_hwnd;
-
-  //filled in by winamp.exe
-  char *error;
-} burnCDStruct;
-#define IPC_BURN_CD 511
-/* (requires Winamp 5.0+)
-*/
-
-typedef struct
-{
-  convertFileStruct *cfs;
-  int priority;
-} convertSetPriority;
-#define IPC_CONVERT_SET_PRIORITY 512
-
-typedef struct
-{
-  char *filename;
-  char *title; // 2048 bytes
-  int length;
-  int force_useformatting; // can set this to 1 if you want to force a url to use title formatting shit
-} waHookTitleStruct;
-// return TRUE if you hook this
-#define IPC_HOOK_TITLES 850
-
-#define IPC_GETSADATAFUNC 800 
-// 0: returns a char *export_sa_get() that returns 150 bytes of data
-// 1: returns a export_sa_setreq(int want);
-
-#define IPC_ISMAINWNDVISIBLE 900
-
-
-#define IPC_SETPLEDITCOLORS 920
-typedef struct
-{
-  int numElems;
-  int *elems;
-  HBITMAP bm; // set if you want to override
-} waSetPlColorsStruct;
-
-
-// the following IPC use waSpawnMenuParms as parameter
-#define IPC_SPAWNEQPRESETMENU 933
-#define IPC_SPAWNFILEMENU 934 //menubar
-#define IPC_SPAWNOPTIONSMENU 935 //menubar
-#define IPC_SPAWNWINDOWSMENU 936 //menubar
-#define IPC_SPAWNHELPMENU 937 //menubar
-#define IPC_SPAWNPLAYMENU 938 //menubar
-#define IPC_SPAWNPEFILEMENU 939 //menubar
-#define IPC_SPAWNPEPLAYLISTMENU 940 //menubar
-#define IPC_SPAWNPESORTMENU 941 //menubar
-#define IPC_SPAWNPEHELPMENU 942 //menubar
-#define IPC_SPAWNMLFILEMENU 943 //menubar
-#define IPC_SPAWNMLVIEWMENU 944 //menubar
-#define IPC_SPAWNMLHELPMENU 945 //menubar
-#define IPC_SPAWNPELISTOFPLAYLISTS 946
-
-typedef struct
-{
-  HWND wnd;
-  int xpos; // in screen coordinates
-  int ypos;
-} waSpawnMenuParms;
-
-// waSpawnMenuParms2 is used by the menubar submenus
-typedef struct
-{
-  HWND wnd;
-  int xpos; // in screen coordinates
-  int ypos;
-  int width;
-  int height;
-} waSpawnMenuParms2;
-
-
-// system tray sends this (you might want to simulate it)
-#define WM_WA_SYSTRAY WM_USER+1
-
-// input plugins send this when they are done playing back
-#define WM_WA_MPEG_EOF WM_USER+2
-
-
-
-//// video stuff
-
-#define IPC_IS_PLAYING_VIDEO 501 // returns >1 if playing, 0 if not, 1 if old version (so who knows):)
-#define IPC_GET_IVIDEOOUTPUT 500 // see below for IVideoOutput interface
-#define VIDEO_MAKETYPE(A,B,C,D) ((A) | ((B)<<8) | ((C)<<16) | ((D)<<24))
-#define VIDUSER_SET_INFOSTRING 0x1000
-#define VIDUSER_GET_VIDEOHWND  0x1001
-#define VIDUSER_SET_VFLIP      0x1002
-
-#ifndef NO_IVIDEO_DECLARE
-#ifdef __cplusplus
-
-class VideoOutput;
-class SubsItem;
-
-typedef	struct {
-	unsigned char*	baseAddr;
-	long			rowBytes;
-} YV12_PLANE;
-
-typedef	struct {
-	YV12_PLANE	y;
-	YV12_PLANE	u;
-	YV12_PLANE	v;
-} YV12_PLANES;
-
-class IVideoOutput
-{
-  public:
-    virtual ~IVideoOutput() { }
-    virtual int open(int w, int h, int vflip, double aspectratio, unsigned int fmt)=0;
-    virtual void setcallback(LRESULT (*msgcallback)(void *token, HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam), void *token) { }
-    virtual void close()=0;
-    virtual void draw(void *frame)=0;
-    virtual void drawSubtitle(SubsItem *item) { }
-    virtual void showStatusMsg(const char *text) { }
-    virtual int get_latency() { return 0; }
-    virtual void notifyBufferState(int bufferstate) { } /* 0-255*/
-
-    virtual int extended(int param1, int param2, int param3) { return 0; } // Dispatchable, eat this!
-};
-#endif //cplusplus
-#endif//NO_IVIDEO_DECLARE
-
-// these messages are callbacks that you can grab by subclassing the winamp window
-
-// wParam = 
-#define IPC_CB_WND_EQ 0 // use one of these for the param
-#define IPC_CB_WND_PE 1
-#define IPC_CB_WND_MB 2
-#define IPC_CB_WND_VIDEO 3
-#define IPC_CB_WND_MAIN 4
-
-#define IPC_CB_ONSHOWWND 600 
-#define IPC_CB_ONHIDEWND 601 
-
-#define IPC_CB_GETTOOLTIP 602
-
-#define IPC_CB_MISC 603
-    #define IPC_CB_MISC_TITLE 0
-    #define IPC_CB_MISC_VOLUME 1 // volume/pan
-    #define IPC_CB_MISC_STATUS 2
-    #define IPC_CB_MISC_EQ 3
-    #define IPC_CB_MISC_INFO 4
-    #define IPC_CB_MISC_VIDEOINFO 5
-
-#define IPC_CB_CONVERT_STATUS 604 // param value goes from 0 to 100 (percent)
-#define IPC_CB_CONVERT_DONE   605
-
-#define IPC_ADJUST_FFWINDOWSMENUPOS 606
-/* (requires Winamp 2.9+)
-** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS);
-** moves where winamp expects the freeform windows in the menubar windows main menu. Useful if you wish to insert a
-** menu item above extra freeform windows.
-*/
-
-#define IPC_ISDOUBLESIZE 608
-
-#define IPC_ADJUST_FFOPTIONSMENUPOS 609
-/* (requires Winamp 2.9+)
-** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS);
-** moves where winamp expects the freeform preferences item in the menubar windows main menu. Useful if you wish to insert a
-** menu item above preferences item.
-*/
-
-#define IPC_GETTIMEDISPLAYMODE 610 // returns 0 if displaying elapsed time or 1 if displaying remaining time
-
-#define IPC_SETVISWND 611 // param is hwnd, setting this allows you to receive ID_VIS_NEXT/PREVOUS/RANDOM/FS wm_commands
-#define ID_VIS_NEXT                     40382
-#define ID_VIS_PREV                     40383
-#define ID_VIS_RANDOM                   40384
-#define ID_VIS_FS                       40389
-#define ID_VIS_CFG                      40390
-#define ID_VIS_MENU                     40391
-
-#define IPC_GETVISWND 612 // returns the vis cmd handler hwnd
-#define IPC_ISVISRUNNING 613
-#define IPC_CB_VISRANDOM 628 // param is status of random
-
-#define IPC_SETIDEALVIDEOSIZE 614 // sent by winamp to winamp, trap it if you need it. width=HIWORD(param), height=LOWORD(param)
-
-#define IPC_GETSTOPONVIDEOCLOSE 615
-#define IPC_SETSTOPONVIDEOCLOSE 616
-
-typedef struct {
-  HWND hwnd;
-  int uMsg;
-  int wParam;
-  int lParam;
-} transAccelStruct;
-
-#define IPC_TRANSLATEACCELERATOR 617
-
-typedef struct {
-  int cmd;
-  int x;
-  int y;
-  int align;
-} windowCommand; // send this as param to an IPC_PLCMD, IPC_MBCMD, IPC_VIDCMD
-
-#define IPC_CB_ONTOGGLEAOT 618 
-
-#define IPC_GETPREFSWND 619
-
-#define IPC_SET_PE_WIDTHHEIGHT 620 // data is a pointer to a POINT structure that holds width & height
-
-#define IPC_GETLANGUAGEPACKINSTANCE 621
-
-#define IPC_CB_PEINFOTEXT 622 // data is a string, ie: "04:21/45:02"
-
-#define IPC_CB_OUTPUTCHANGED 623 // output plugin was changed in config
-
-#define IPC_GETOUTPUTPLUGIN 625
-
-#define IPC_SETDRAWBORDERS 626
-#define IPC_DISABLESKINCURSORS 627
-#define IPC_CB_RESETFONT 629
-
-#define IPC_IS_FULLSCREEN 630 // returns 1 if video or vis is in fullscreen mode
-#define IPC_SET_VIS_FS_FLAG 631 // a vis should send this message with 1/as param to notify winamp that it has gone to or has come back from fullscreen mode
-
-#define IPC_SHOW_NOTIFICATION 632
-
-#define IPC_GETSKININFO 633
-
-// >>>>>>>>>>> Next is 634
-
-#define IPC_PLCMD  1000 
-
-#define PLCMD_ADD  0
-#define PLCMD_REM  1
-#define PLCMD_SEL  2
-#define PLCMD_MISC 3
-#define PLCMD_LIST 4
-
-#define IPC_MBCMD  1001 
-
-#define MBCMD_BACK    0
-#define MBCMD_FORWARD 1
-#define MBCMD_STOP    2
-#define MBCMD_RELOAD  3
-#define MBCMD_MISC  4
-
-#define IPC_VIDCMD 1002 
-
-#define VIDCMD_FULLSCREEN 0
-#define VIDCMD_1X         1
-#define VIDCMD_2X         2
-#define VIDCMD_LIB        3
-#define VIDPOPUP_MISC     4
-
-#define IPC_MBURL       1003 //sets the URL
-#define IPC_MBGETCURURL 1004 //copies the current URL into wParam (have a 4096 buffer ready)
-#define IPC_MBGETDESC   1005 //copies the current URL description into wParam (have a 4096 buffer ready)
-#define IPC_MBCHECKLOCFILE 1006 //checks that the link file is up to date (otherwise updates it). wParam=parent HWND
-#define IPC_MBREFRESH   1007 //refreshes the "now playing" view in the library
-#define IPC_MBGETDEFURL 1008 //copies the default URL into wParam (have a 4096 buffer ready)
-
-#define IPC_STATS_LIBRARY_ITEMCNT 1300 // updates library count status
-
-// IPC 2000-3000 reserved for freeform messages, see gen_ff/ff_ipc.h
-#define IPC_FF_FIRST 2000
-#define IPC_FF_LAST  3000
-
-#define IPC_GETDROPTARGET 3001
-
-#define IPC_PLAYLIST_MODIFIED 3002 // sent to main wnd whenever the playlist is modified
-
-#define IPC_PLAYING_FILE 3003 // sent to main wnd with the file as parm whenever a file is played
-#define IPC_FILE_TAG_MAY_HAVE_UPDATED 3004 // sent to main wnd with the file as parm whenever a file tag might be updated
-
-
-#define IPC_ALLOW_PLAYTRACKING 3007
-// send nonzero to allow, zero to disallow
-
-#define IPC_HOOK_OKTOQUIT 3010 // return 0 to abort a quit, nonzero if quit is OK
-
-#define IPC_WRITECONFIG 3011 // pass 2 to write all, 1 to write playlist + common, 0 to write common+less common
-
-// pass a string to be the name to register, and returns a value > 65536, which is a unique value you can use
-// for custom WM_WA_IPC messages. 
-#define IPC_REGISTER_WINAMP_IPCMESSAGE 65536 
-
-/**************************************************************************/
-
-/*
-** Finally there are some WM_COMMAND messages that you can use to send 
-** Winamp misc commands.
-** 
-** To send these, use:
-**
-** SendMessage(hwnd_winamp, WM_COMMAND,command_name,0);
-*/
-
-#define WINAMP_OPTIONS_EQ               40036 // toggles the EQ window
-#define WINAMP_OPTIONS_PLEDIT           40040 // toggles the playlist window
-#define WINAMP_VOLUMEUP                 40058 // turns the volume up a little
-#define WINAMP_VOLUMEDOWN               40059 // turns the volume down a little
-#define WINAMP_FFWD5S                   40060 // fast forwards 5 seconds
-#define WINAMP_REW5S                    40061 // rewinds 5 seconds
-
-// the following are the five main control buttons, with optionally shift 
-// or control pressed
-// (for the exact functions of each, just try it out)
-#define WINAMP_BUTTON1                  40044
-#define WINAMP_BUTTON2                  40045
-#define WINAMP_BUTTON3                  40046
-#define WINAMP_BUTTON4                  40047
-#define WINAMP_BUTTON5                  40048
-#define WINAMP_BUTTON1_SHIFT            40144
-#define WINAMP_BUTTON2_SHIFT            40145
-#define WINAMP_BUTTON3_SHIFT            40146
-#define WINAMP_BUTTON4_SHIFT            40147
-#define WINAMP_BUTTON5_SHIFT            40148
-#define WINAMP_BUTTON1_CTRL             40154
-#define WINAMP_BUTTON2_CTRL             40155
-#define WINAMP_BUTTON3_CTRL             40156
-#define WINAMP_BUTTON4_CTRL             40157
-#define WINAMP_BUTTON5_CTRL             40158
-
-#define WINAMP_FILE_PLAY                40029 // pops up the load file(s) box
-#define WINAMP_FILE_DIR                 40187 // pops up the load directory box
-#define WINAMP_OPTIONS_PREFS            40012 // pops up the preferences
-#define WINAMP_OPTIONS_AOT              40019 // toggles always on top
-#define WINAMP_HELP_ABOUT               40041 // pops up the about box :)
-
-#define ID_MAIN_PLAY_AUDIOCD1           40323 // starts playing the audio CD in the first CD reader
-#define ID_MAIN_PLAY_AUDIOCD2           40323 // plays the 2nd
-#define ID_MAIN_PLAY_AUDIOCD3           40323 // plays the 3nd
-#define ID_MAIN_PLAY_AUDIOCD4           40323 // plays the 4nd
-
-// IDs 42000 to 45000 are reserved for gen_ff
-// IDs from 45000 to 57000 are reserved for library 
-
-#endif//_WA_IPC_H_
-
-/*
-** EOF.. Enjoy.
-*/
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wince/asap.inf kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wince/asap.inf
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wince/asap.inf	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wince/asap.inf	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-[Version]
-Signature = "$Windows NT$"
-Provider = "Foxoft"
-CESignature = "$Windows CE$"
-
-[CEStrings]
-AppName = "ASAP"
-InstallDir = "%CE1%\ASAP"
-
-[CEDevice]
-VersionMin=3.0
-VersionMax=10.0
-BuildMax=0xE0000000
-
-[CEDevice.ARM]
-ProcessorType = %arm_cpu%
-
-[SourceDisksNames]
-1 = ,"WASAP"
-
-[SourceDisksFiles]
-"wasap.exe" = 1
-"gspasap.dll" = 1
-"asap_dsf.dll" = 1
-
-[DestinationDirs]
-Files.App = 0,%InstallDir%
-Files.GSPlayer = 0,"%CE1%\GreenSoftware"
-Files.DShow = 0,%InstallDir%
-Shortcuts = 0,%CE11%
-
-[Files.App]
-"wasap.exe",,,1
-
-[Files.GSPlayer]
-"gspasap.dll",,,
-
-[Files.DShow]
-"asap_dsf.dll",,,1
-
-[Shortcuts]
-WASAP,0,wasap.exe
-
-[Reg.DShow]
-HKCR,CLSID\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}\InprocServer32,,,"""%InstallDir%\asap_dsf.dll"""
-HKCR,CLSID\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}\InprocServer32,ThreadingModel,,"both"
-HKCR,CLSID\{083863F1-70DE-11D0-BD40-00A0C911CE86}\Instance\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93},FriendlyName,,"ASAP source filter"
-HKCR,CLSID\{083863F1-70DE-11D0-BD40-00A0C911CE86}\Instance\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93},CLSID,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,CLSID\{083863F1-70DE-11D0-BD40-00A0C911CE86}\Instance\{8E6205A0-19E2-4037-AF32-B29A9B9D0C93},FilterData,1,02,00,00,00,00,00,60,00,01,00,00,00,00,00,00,00,30,70,69,33,08,00,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,30,74,79,33,00,00,00,00,38,00,00,00,48,00,00,00,61,75,64,73,00,00,10,00,80,00,00,AA,00,38,9B,71,01,00,00,00,00,00,10,00,80,00,00,AA,00,38,9B,71
-HKCR,Media Type\Extensions\.sap,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.cmc,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.cm3,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.cmr,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.cms,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.dmc,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.dlt,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.mpt,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.mpd,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.rmt,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.tmc,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.tm8,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.tm2,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKCR,Media Type\Extensions\.fc,Source Filter,,"{8E6205A0-19E2-4037-AF32-B29A9B9D0C93}"
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.sap,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cmc,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cm3,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cmr,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cms,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.dmc,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.dlt,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.mpt,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.mpd,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.rmt,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.tmc,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.tm8,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.tm2,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.fc,Permissions,0x10001,15
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.sap,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cmc,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cm3,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cmr,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.cms,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.dmc,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.dlt,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.mpt,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.mpd,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.rmt,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.tmc,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.tm8,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.tm2,Runtime,0x10001,7
-HKLM,Software\Microsoft\Multimedia\WMPlayer\Extensions\.fc,Runtime,0x10001,7
-HKLM,Software\Microsoft\MediaPlayer\Player\Extensions\MUIDescriptions,ASAP,,"ASAP files (*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc)"
-HKLM,Software\Microsoft\MediaPlayer\Player\Extensions\Types,ASAP,,"*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc"
-
-[Reg.Ext]
-HKCR,asap.file\shell\open\command,,,"""%InstallDir%\wasap.exe"" ""%%1"""
-HKCR,.sap,,,"asap.file"
-HKCR,.cmc,,,"asap.file"
-HKCR,.cm3,,,"asap.file"
-HKCR,.cmr,,,"asap.file"
-HKCR,.cms,,,"asap.file"
-HKCR,.dmc,,,"asap.file"
-HKCR,.dlt,,,"asap.file"
-HKCR,.mpt,,,"asap.file"
-HKCR,.mpd,,,"asap.file"
-HKCR,.rmt,,,"asap.file"
-HKCR,.tmc,,,"asap.file"
-HKCR,.tm8,,,"asap.file"
-HKCR,.tm2,,,"asap.file"
-HKCR,.fc,,,"asap.file"
-
-[DefaultInstall]
-CopyFiles = Files.App, Files.GSPlayer, Files.DShow
-CEShortcuts = Shortcuts
-AddReg = Reg.DShow, Reg.Ext
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wince/USAGE kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wince/USAGE
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/wince/USAGE	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/wince/USAGE	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-How to install
---------------
-
-Put `gspasap.dll` in the directory which contains the GSPlayer executable.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/xmplay/xmp-asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/xmplay/xmp-asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/xmplay/xmp-asap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/xmplay/xmp-asap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-/*
- * xmp-asap.c - ASAP plugin for XMPlay
- *
- * Copyright (C) 2010-2012  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-
-#include "xmpin.h"
-
-#include "asap.h"
-#include "astil.h"
-#include "info_dlg.h"
-#include "settings_dlg.h"
-
-#define BITS_PER_SAMPLE  16
-
-static HINSTANCE hInst;
-static const XMPFUNC_MISC *xmpfmisc;
-static const XMPFUNC_REGISTRY *xmpfreg;
-static const XMPFUNC_FILE *xmpffile;
-static const XMPFUNC_IN *xmpfin;
-
-static BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-static int module_len;
-ASAP *asap;
-
-void onUpdatePlayingInfo(void)
-{
-	xmpfreg->SetInt("ASAP", "PlayingInfo", &playing_info);
-}
-
-static void WINAPI ASAP_ShowInfo()
-{
-	showInfoDialog(hInst, xmpfmisc->GetWindow(), NULL, -1);
-}
-
-static void WINAPI ASAP_About(HWND win)
-{
-	MessageBox(win, ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT,
-		"About ASAP XMPlay plugin " ASAPInfo_VERSION, MB_OK);
-}
-
-static void WINAPI ASAP_Config(HWND win)
-{
-	if (settingsDialog(hInst, win)) {
-		xmpfreg->SetInt("ASAP", "SongLength", &song_length);
-		xmpfreg->SetInt("ASAP", "SilenceSeconds", &silence_seconds);
-		xmpfreg->SetInt("ASAP", "PlayLoops", &play_loops);
-		xmpfreg->SetInt("ASAP", "MuteMask", &mute_mask);
-	}
-}
-
-static BOOL WINAPI ASAP_CheckFile(const char *filename, XMPFILE file)
-{
-	return ASAPInfo_IsOurFile(filename);
-}
-
-static void GetTag(const char *src, char **dest)
-{
-	int len;
-	if (src[0] == '\0')
-		return;
-	len = strlen(src) + 1;
-	*dest = xmpfmisc->Alloc(len);
-	memcpy(*dest, src, len);
-}
-
-static void GetTags(const ASAPInfo *info, char *tags[8])
-{
-	GetTag(ASAPInfo_GetTitle(info), tags);
-	GetTag(ASAPInfo_GetAuthor(info), tags + 1);
-	GetTag(ASAPInfo_GetDate(info), tags + 3);
-	GetTag("ASAP", tags + 7);
-}
-
-static void GetTotalLength(const ASAPInfo *info, float *length)
-{
-	int total_duration = 0;
-	int song;
-	for (song = 0; song < ASAPInfo_GetSongs(info); song++) {
-		int duration = getSongDuration(info, song);
-		if (duration < 0) {
-			*length = 0;
-			return;
-		}
-		total_duration += duration;
-	}
-	*length = total_duration / 1000.0;
-}
-
-static void PlaySong(int song)
-{
-	int duration = playSong(song);
-	if (duration >= 0)
-		xmpfin->SetLength(duration / 1000.0, TRUE);
-	setPlayingSong(NULL, song);
-}
-
-static BOOL WINAPI ASAP_GetFileInfo(const char *filename, XMPFILE file, float *length, char *tags[8])
-{
-	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len = xmpffile->Read(file, module, sizeof(module));
-	ASAPInfo *info = ASAPInfo_New();
-	if (info == NULL)
-		return FALSE;
-	if (!ASAPInfo_Load(info, filename, module, module_len)) {
-		ASAPInfo_Delete(info);
-		return FALSE;
-	}
-	if (length != NULL)
-		GetTotalLength(info, length);
-	GetTags(info, tags);
-	ASAPInfo_Delete(info);
-	return TRUE;
-}
-
-static DWORD WINAPI ASAP_Open(const char *filename, XMPFILE file)
-{
-	module_len = xmpffile->Read(file, module, sizeof(module));
-	if (!ASAP_Load(asap, filename, module, module_len))
-		return 0;
-	setPlayingSong(filename, 0);
-	PlaySong(0);
-	return 2; /* close file */
-}
-
-static void WINAPI ASAP_Close()
-{
-}
-
-static void WINAPI ASAP_SetFormat(XMPFORMAT *form)
-{
-	form->rate = ASAP_SAMPLE_RATE;
-	form->chan = ASAPInfo_GetChannels(ASAP_GetInfo(asap));
-	form->res = BITS_PER_SAMPLE / 8;
-}
-
-static BOOL WINAPI ASAP_GetTags(char *tags[8])
-{
-	GetTags(ASAP_GetInfo(asap), tags);
-	return TRUE;
-}
-
-static void WINAPI ASAP_GetInfoText(char *format, char *length)
-{
-	if (format != NULL)
-		strcpy(format, "ASAP");
-}
-
-static void WINAPI ASAP_GetGeneralInfo(char *buf)
-{
-	const ASAPInfo *info = ASAP_GetInfo(asap);
-	const char *s = ASAPInfo_GetDate(info);
-	if (s[0] != '\0')
-		buf += sprintf(buf, "Date\t%s\r", s);
-	s = ASAPInfo_GetOriginalModuleExt(info, module, module_len);
-	if (s != NULL)
-		buf += sprintf(buf, "Composed in\t%s\r", ASAPInfo_GetExtDescription(s));
-	*buf = '\0';
-}
-
-static char *appendStilString(char *p, const char *s)
-{
-	for (;;) {
-		char c = *s++;
-		switch (c) {
-		case '\0':
-			return p;
-		case '\n':
-			*p++ = '\r';
-			*p++ = '\n';
-			*p++ = '\t';
-			break;
-		default:
-			*p++ = c;
-			break;
-		}
-	}
-}
-
-static char *appendStil(char *p, const char *prefix, const char *value)
-{
-	if (value[0] != '\0') {
-		p = appendStilString(p, prefix);
-		*p++ = '\t';
-		p = appendStilString(p, value);
-		*p++ = '\r';
-		*p++ = '\n';
-	}
-	return p;
-}
-
-static void WINAPI ASAP_GetMessage(char *buf)
-{
-	const ASTIL *astil = getPlayingASTIL();
-	char *p = buf;
-	int i;
-	p = appendStil(p, "STIL file", ASTIL_GetStilFilename(astil));
-	p = appendStil(p, "Title", ASTIL_GetTitle(astil));
-	p = appendStil(p, "Author", ASTIL_GetAuthor(astil));
-	p = appendStil(p, "Directory comment", ASTIL_GetDirectoryComment(astil));
-	p = appendStil(p, "File comment", ASTIL_GetFileComment(astil));
-	p = appendStil(p, "Song comment", ASTIL_GetSongComment(astil));
-	for (i = 0; ; i++) {
-		const ASTILCover *cover = ASTIL_GetCover(astil, i);
-		int startSeconds;
-		const char *s;
-		if (cover == NULL)
-			break;
-		startSeconds = ASTILCover_GetStartSeconds(cover);
-		if (startSeconds >= 0) {
-			int endSeconds = ASTILCover_GetEndSeconds(cover);
-			if (endSeconds >= 0)
-				p += sprintf(p, "At %d:%02d-%d:%02d c", startSeconds / 60, startSeconds % 60, endSeconds / 60, endSeconds % 60);
-			else
-				p += sprintf(p, "At %d:%02d c", startSeconds / 60, startSeconds % 60);
-		}
-		else
-			*p++ = 'C';
-		s = ASTILCover_GetTitleAndSource(cover);
-		p = appendStil(p, "overs", s[0] != '\0' ? s : "<?>");
-		p = appendStil(p, "by", ASTILCover_GetArtist(cover));
-		p = appendStil(p, "Comment", ASTILCover_GetComment(cover));
-	}
-	if (p > buf)
-		p[-2] = '\0'; /* chomp trailing \r\n */
-}
-
-static double WINAPI ASAP_SetPosition(DWORD pos)
-{
-	int song = pos - XMPIN_POS_SUBSONG;
-	if (song >= 0 && song < ASAPInfo_GetSongs(ASAP_GetInfo(asap))) {
-		PlaySong(song);
-		return 0;
-	}
-	// TODO: XMPIN_POS
-	ASAP_Seek(asap, pos);
-	return pos / 1000.0;
-}
-
-static double WINAPI ASAP_GetGranularity()
-{
-	return 0.001;
-}
-
-static DWORD WINAPI ASAP_Process(float *buf, DWORD count)
-{
-	/* Quick and dirty hack... Need to support floats directly... */
-	short *buf2 = (short *) buf;
-	DWORD n = ASAP_Generate(asap, (unsigned char *) buf2, count * sizeof(short), ASAPSampleFormat_S16_L_E) >> 1;
-	int i;
-	for (i = n; --i >= 0; )
-		buf[i] = buf2[i] / 32767.0;
-	return n;
-}
-
-static void WINAPI ASAP_GetSamples(char *buf)
-{
-	const ASAPInfo *info = ASAP_GetInfo(asap);
-	const char *s = ASAPInfo_GetInstrumentName(info, module, module_len, 0);
-	if (s != NULL) {
-		int i = 0;
-		buf += sprintf(buf, "instrument list:\r\n");
-		do {
-			buf += sprintf(buf, "%03d\t%s\r\n", i, s);
-			s = ASAPInfo_GetInstrumentName(info, module, module_len, ++i);
-		} while (s != NULL);
-		buf[-2] = '\0'; /* chomp trailing \r\n */
-	}
-}
-
-static DWORD WINAPI ASAP_GetSubSongs(float *length)
-{
-	const ASAPInfo *info = ASAP_GetInfo(asap);
-	GetTotalLength(info, length);
-	return ASAPInfo_GetSongs(info);
-}
-
-__declspec(dllexport) XMPIN *WINAPI XMPIN_GetInterface(DWORD face, InterfaceProc faceproc)
-{
-	static XMPIN xmpin = {
-		0,
-		"ASAP",
-		"ASAP\0sap/cmc/cm3/cmr/cms/dmc/dlt/mpt/mpd/rmt/tmc/tm8/tm2/fc",
-		ASAP_About,
-		ASAP_Config,
-		ASAP_CheckFile,
-		ASAP_GetFileInfo,
-		ASAP_Open,
-		ASAP_Close,
-		NULL,
-		ASAP_SetFormat,
-		ASAP_GetTags,
-		ASAP_GetInfoText,
-		ASAP_GetGeneralInfo,
-		ASAP_GetMessage,
-		ASAP_SetPosition,
-		ASAP_GetGranularity,
-		NULL,
-		ASAP_Process,
-		NULL,
-		ASAP_GetSamples,
-		ASAP_GetSubSongs,
-		NULL,
-		NULL,
-		NULL, NULL, NULL, NULL, NULL, NULL, NULL
-	};
-	static const XMPSHORTCUT info_shortcut = {
-		0x10000, "ASAP - File information", ASAP_ShowInfo
-	};
-
-	if (face != XMPIN_FACE)
-		return NULL;
-
-	xmpfmisc = (const XMPFUNC_MISC *) faceproc(XMPFUNC_MISC_FACE);
-	xmpfreg = (const XMPFUNC_REGISTRY *) faceproc(XMPFUNC_REGISTRY_FACE);
-	xmpffile = (const XMPFUNC_FILE *) faceproc(XMPFUNC_FILE_FACE);
-	xmpfin = (const XMPFUNC_IN *) faceproc(XMPFUNC_IN_FACE);
-
-	asap = ASAP_New();
-
-	xmpfmisc->RegisterShortcut(&info_shortcut);
-	xmpfreg->GetInt("ASAP", "SongLength", &song_length);
-	xmpfreg->GetInt("ASAP", "SilenceSeconds", &silence_seconds);
-	xmpfreg->GetInt("ASAP", "PlayLoops", &play_loops);
-	xmpfreg->GetInt("ASAP", "MuteMask", &mute_mask);
-	xmpfreg->GetInt("ASAP", "PlayingInfo", &playing_info);
-	return &xmpin;
-}
-
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
-	if (dwReason == DLL_PROCESS_ATTACH)
-		hInst = hInstance;
-	return TRUE;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/xmplay/xmpfunc.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/xmplay/xmpfunc.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/xmplay/xmpfunc.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/xmplay/xmpfunc.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-// XMPlay plugin functions header (c) 2004-2007 Ian Luck
-
-#pragma once
-
-#include <wtypes.h>
-
-typedef unsigned __int64 QWORD;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Note all texts are UTF-8 on WinNT based systems, and ANSI on Win9x
-#define Utf2Uni(src,slen,dst,dlen) MultiByteToWideChar(CP_UTF8,0,src,slen,dst,dlen) // convert UTF-8 to Unicode
-
-typedef void *(WINAPI *InterfaceProc)(DWORD face); // XMPlay interface retrieval function received by plugin
-
-#define XMPFUNC_MISC_FACE		0 // miscellaneous functions (XMPFUNC_MISC)
-#define XMPFUNC_REGISTRY_FACE	1 // registry functions (XMPFUNC_REGISTRY)
-#define XMPFUNC_FILE_FACE		2 // file functions (XMPFUNC_FILE)
-#define XMPFUNC_TEXT_FACE		3 // text functions (XMPFUNC_TEXT)
-#define XMPFUNC_STATUS_FACE		4 // playback status functions (XMPFUNC_STATUS)
-
-#define XMPCONFIG_NET_BUFFER	0
-#define XMPCONFIG_NET_RESTRICT	1
-#define XMPCONFIG_NET_RECONNECT	2
-#define XMPCONFIG_NET_PROXY		3
-#define XMPCONFIG_NET_PROXYCONF	4
-#define XMPCONFIG_NET_TIMEOUT	5
-#define XMPCONFIG_NET_PREBUF	6
-
-#define XMPINFO_TEXT_GENERAL	0 // General info text
-#define XMPINFO_TEXT_MESSAGE	1 // Message info text
-#define XMPINFO_TEXT_SAMPLES	2 // Samples info text
-
-#define XMPINFO_REFRESH_MAIN	1 // main window info area
-#define XMPINFO_REFRESH_GENERAL	2 // General info window
-#define XMPINFO_REFRESH_MESSAGE	4 // Message info window
-#define XMPINFO_REFRESH_SAMPLES	8 // Samples info window
-
-typedef void *XMPFILE;
-
-#define XMPFILE_TYPE_MEMORY		0 // file in memory
-#define XMPFILE_TYPE_FILE		1 // local file
-#define XMPFILE_TYPE_NETFILE	2 // file on the 'net
-#define XMPFILE_TYPE_NETSTREAM	3 // 'net stream (unknown length)
-
-typedef struct {
-	DWORD id;				// must be unique and >=0x10000
-	const char *text;		// description
-	void (WINAPI *proc)();	// handler
-} XMPSHORTCUT;
-
-typedef struct {
-	DWORD rate;		// sample rate
-	DWORD chan;		// channels
-	DWORD res;		// bytes per sample (1=8-bit,2=16-bit,3=24-bit,4=float,0=undefined)
-} XMPFORMAT;
-
-typedef struct {
-	float time;		// cue position
-	const char *title;
-	const char *performer;
-} XMPCUE;
-
-typedef struct { // miscellaneous functions
-	DWORD (WINAPI *GetVersion)(); // get XMPlay version (eg. 0x03040001 = 3.4.0.1)
-	HWND (WINAPI *GetWindow)(); // get XMPlay window handle
-	void *(WINAPI *Alloc)(DWORD len); // allocate memory
-	void *(WINAPI *ReAlloc)(void *mem, DWORD len); // re-allocate memory
-	void (WINAPI *Free)(void *mem); // free allocated memory/text
-	BOOL (WINAPI *CheckCancel)(); // user wants to cancel?
-	DWORD (WINAPI *GetConfig)(DWORD option); // get a config (XMPCONFIG_xxx) value
-	const char *(WINAPI *GetSkinConfig)(const char *name); // get a skinconfig value
-	void (WINAPI *ShowBubble)(const char *text, DWORD time); // show a help bubble (time in ms, 0=default)
-	void (WINAPI *RefreshInfo)(DWORD mode); // refresh info displays (XMPINFO_REFRESH_xxx flags)
-	char *(WINAPI *GetInfoText)(DWORD mode); // get info window text (XMPINFO_TEXT_xxx)
-	char *(WINAPI *FormatInfoText)(char *buf, const char *name, const char *value); // format text for info window (tabs & new-lines)
-	char *(WINAPI *GetTag)(int tag); // get a current track's tag
-		//tags: 0=title,1=artist,2=album,3=year,4=track,5=genre,6=comment,7=filetype, -1=formatted title,-2=filename,-3=track/cue title
-	BOOL (WINAPI *RegisterShortcut)(const XMPSHORTCUT *cut); // add a shortcut
-	BOOL (WINAPI *PerformShortcut)(DWORD id); // perform a shortcut action
-// version 3.4.0.14
-	const XMPCUE *(WINAPI *GetCue)(DWORD cue); // get a cue entry (0=image, 1=1st track)
-} XMPFUNC_MISC;
-
-typedef struct { // "registry" functions
-	DWORD (WINAPI *Get)(const char *section, const char *key, void *data, DWORD size); // if data=NULL, required size is returned
-	DWORD (WINAPI *GetString)(const char *section, const char *key, char *data, DWORD size); // if data=NULL, required size is returned
-	BOOL (WINAPI *GetInt)(const char *section, const char *key, int *data);
-	BOOL (WINAPI *Set)(const char *section, const char *key, const void *data, DWORD size); // data=NULL = delete key
-	BOOL (WINAPI *SetString)(const char *section, const char *key, const char *data);
-	BOOL (WINAPI *SetInt)(const char *section, const char *key, const int *data);
-} XMPFUNC_REGISTRY;
-
-typedef struct { // file functions
-	XMPFILE (WINAPI *Open)(const char *filename); // open a file
-	XMPFILE (WINAPI *OpenMemory)(const void *buf, DWORD len); // open a file from memory
-	void (WINAPI *Close)(XMPFILE file); // close an opened file
-	DWORD (WINAPI *GetType)(XMPFILE file); // return XMPFILE_TYPE_xxx
-	DWORD (WINAPI *GetSize)(XMPFILE file); // file size
-	const char *(WINAPI *GetFilename)(XMPFILE file); // filename
-	const void *(WINAPI *GetMemory)(XMPFILE file); // memory location (XMPFILE_TYPE_MEMORY)
-	DWORD (WINAPI *Read)(XMPFILE file, void *buf, DWORD len); // read from file
-	BOOL (WINAPI *Seek)(XMPFILE file, DWORD pos); // seek in file
-	DWORD (WINAPI *Tell)(XMPFILE file); // get current file pos
-	// net-only stuff
-	void (WINAPI *NetSetRate)(XMPFILE file, DWORD rate); // set bitrate in bytes/sec (decides buffer size)
-	BOOL (WINAPI *NetIsActive)(XMPFILE file); // connection is still up?
-	BOOL (WINAPI *NetPreBuf)(XMPFILE file); // pre-buffer data
-	DWORD (WINAPI *NetAvailable)(XMPFILE file); // get amount of data ready to go
-
-	char *(WINAPI *ArchiveList)(XMPFILE file); // get archive contents (series of NULL-terminated entries)
-	XMPFILE (WINAPI *ArchiveExtract)(XMPFILE file, const char *entry, DWORD len); // decompress file from archive
-} XMPFUNC_FILE;
-
-typedef struct { // text functions - return new string in native form (UTF-8/ANSI)
-	char *(WINAPI *Ansi)(const char *text, int len); // ANSI string (len=-1=null terminated)
-	char *(WINAPI *Unicode)(const WCHAR *text, int len); // Unicode string
-	char *(WINAPI *Utf8)(const char *text, int len); // UTF-8 string
-} XMPFUNC_TEXT;
-
-typedef struct { // playback status functions
-	BOOL (WINAPI *IsPlaying)(); // playing?
-	double (WINAPI *GetTime)(); // track position in seconds
-	QWORD (WINAPI *GetWritten)(); // samples written to output
-	DWORD (WINAPI *GetLatency)(); // samples in output buffer
-	const XMPFORMAT *(WINAPI *GetFormat)(BOOL in); // get input/output sample format
-} XMPFUNC_STATUS;
-
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/xmplay/xmpin.h kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/xmplay/xmpin.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/win32/xmplay/xmpin.h	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/win32/xmplay/xmpin.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-// XMPlay input plugin header (c) 2004-2007 Ian Luck
-// new plugins can be submitted to plugins@xmplay.com
-
-#pragma once
-
-#include "xmpfunc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef XMPIN_FACE
-#define XMPIN_FACE 3 // "face"
-#endif
-
-#define XMPIN_FLAG_CANSTREAM	1 // can stream files (play while downloading from the 'net)
-#define XMPIN_FLAG_OWNFILE		2 // can process files without "XMPFILE" routines
-#define XMPIN_FLAG_NOXMPFILE	4 // never use "XMPFILE" routines (implies XMPIN_FLAG_OWNFILE)
-#define XMPIN_FLAG_LOOP			8 // custom looping
-#define XMPIN_FLAG_TAIL			16 // output tail (decay/fadeout)
-
-// SetPosition special positions
-#define XMPIN_POS_LOOP			-1 // loop
-#define XMPIN_POS_AUTOLOOP		-2 // auto-loop
-#define XMPIN_POS_TAIL			-3 // output tail (decay/fadeout)
-#define XMPIN_POS_SUBSONG		0x80000000 // subsong (LOWORD=subsong)
-
-// VisRender/DC flags
-#define XMPIN_VIS_INIT			1 // DC/buffer is uninitialized
-#define XMPIN_VIS_FULL			2 // fullscreen
-
-typedef struct {
-	DWORD flags; // XMPIN_FLAG_xxx
-	const char *name; // plugin name
-	const char *exts; // supported file extensions (description\0ext1/ext2/etc...)
-
-	void (WINAPI *About)(HWND win); // (OPTIONAL)
-	void (WINAPI *Config)(HWND win); // present config options to user (OPTIONAL)
-	BOOL (WINAPI *CheckFile)(const char *filename, XMPFILE file); // verify file
-	BOOL (WINAPI *GetFileInfo)(const char *filename, XMPFILE file, float *length, char *tags[8]); // get track info
-		//tags: 0=title,1=artist,2=album,3=year,4=track,5=genre,6=comment,7=filetype
-
-	// playback stuff
-	DWORD (WINAPI *Open)(const char *filename, XMPFILE file); // open a file
-	void (WINAPI *Close)(); // close file
-	void *reserved;
-	void (WINAPI *SetFormat)(XMPFORMAT *form); // set sample format
-
-	BOOL (WINAPI *GetTags)(char *tags[8]); // get title elements, return TRUE to delay (OPTIONAL)
-	void (WINAPI *GetInfoText)(char *format, char *length); // get main panel info text
-	void (WINAPI *GetGeneralInfo)(char *buf); // get General info window text (buf is ~40K)
-	void (WINAPI *GetMessage)(char *buf); // get Message info text (OPTIONAL)
-	double (WINAPI *SetPosition)(DWORD pos); // seek
-	double (WINAPI *GetGranularity)(); // seeking granularity
-	DWORD (WINAPI *GetBuffering)(); // get buffering progress (OPTIONAL)
-	DWORD (WINAPI *Process)(float *buf, DWORD count); // decode some sample data
-	BOOL (WINAPI *WriteFile)(const char *filename); // write file to disk (OPTIONAL)
-
-	void (WINAPI *GetSamples)(char *buf); // get Samples info text (OPTIONAL)
-	DWORD (WINAPI *GetSubSongs)(float *length); // get number (and total length) of sub-songs (OPTIONAL)
-	char *(WINAPI *GetCues)(); // get CUE sheet (OPTIONAL)
-
-	float (WINAPI *GetDownloaded)(); // get download progress (OPTIONAL)
-
-	// vis stuff (all OPTIONAL)
-	const char *visname; // visualisation name
-	BOOL (WINAPI *VisOpen)(DWORD colors[3]); // initialize vis
-	void (WINAPI *VisClose)(); // close vis
-	void (WINAPI *VisSize)(HDC dc, SIZE *size); // get ideal vis dimensions
-	BOOL (WINAPI *VisRender)(DWORD *buf, SIZE size, DWORD flags); // render vis
-	BOOL (WINAPI *VisRenderDC)(HDC dc, SIZE size, DWORD flags); // render vis
-	void (WINAPI *VisButton)(DWORD x, DWORD y); // mouse click in vis
-} XMPIN;
-
-#define XMPFUNC_IN_FACE		11
-
-typedef struct {
-	void (WINAPI *SetLength)(float length, BOOL seekable); // set track length (-1=unchanged) and if it's seekable
-	void (WINAPI *SetGain)(DWORD mode, float gain); // set replaygain (mode 0=track, 1=album)
-	BOOL (WINAPI *UpdateTitle)(const char *track); // set track title (NULL=refresh tags/title)
-} XMPFUNC_IN;
-
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/applet.txt kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/applet.txt
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/applet.txt	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/applet.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-ASAP - Another Slight Atari Player
-==================================
-
-link:/[Home]
-image:http://sflogo.sourceforge.net/sflogo.php?group_id=154391&amp;type=13["Get ASAP - Another Slight Atari Player at SourceForge.net. Fast, secure and Free Open Source software downloads",width=120,height=30,link="http://sourceforge.net/projects/asap/"]
-
-Java applet demo
-----------------
-
-This page contains a pure-Java applet which plays Atari music.
-
-++++
-<object id="asap" width="40" height="45" type="application/x-java-applet">
-	<param name="archive" value="asap_applet.jar" />
-	<param name="code" value="ASAPApplet" />
-	<param name="background" value="f8f8f8" />
-	<param name="foreground" value="c02020" />
-	<param name="file" value="X_Ray_2.sap" />
-	<p>
-		Your browser has no <a href="http://java.com/">Java</a> installed.
-	</p>
-</object>
-<input type="button" value="Play" onclick="document.getElementById('asap').play('X_Ray_2.sap', -1)" />
-<input type="button" value="Pause" onclick="document.getElementById('asap').togglePause()" />
-<input type="button" value="Stop" onclick="document.getElementById('asap').stop()" />
-++++
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/flash.txt kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/flash.txt
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/flash.txt	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/flash.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-ASAP - Another Slight Atari Player
-==================================
-
-link:/[Home]
-image:http://sflogo.sourceforge.net/sflogo.php?group_id=154391&amp;type=13["Get ASAP - Another Slight Atari Player at SourceForge.net. Fast, secure and Free Open Source software downloads",width=120,height=30,link="http://sourceforge.net/projects/asap/"]
-
-Flash Player demo
------------------
-
-This page contains a pure-ActionScript player of Atari music.
-
-++++
-<object id="asap" width="0" height="0" type="application/x-shockwave-flash" data="asap.swf">
-	<param name="movie" value="asap.swf" />
-	<param name="FlashVars" value="file=X_Ray_2.sap" />
-	<p>
-		Your browser has no <a href="http://get.adobe.com/flashplayer/">Adobe Flash Player</a> installed.
-	</p>
-</object>
-<input type="button" value="Play" onclick="document.getElementById('asap').asapPlay('X_Ray_2.sap')" />
-<input type="button" value="Pause" onclick="document.getElementById('asap').asapPause()" />
-<input type="button" value="Stop" onclick="document.getElementById('asap').asapStop()" />
-++++
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/javascript.txt kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/javascript.txt
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/javascript.txt	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/javascript.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-ASAP - Another Slight Atari Player
-==================================
-
-link:/[Home]
-image:http://sflogo.sourceforge.net/sflogo.php?group_id=154391&amp;type=13["Get ASAP - Another Slight Atari Player at SourceForge.net. Fast, secure and Free Open Source software downloads",width=120,height=30,link="http://sourceforge.net/projects/asap/"]
-
-JavaScript demo
----------------
-
-This page contains a pure-JavaScript player of Atari music.
-
-++++
-<script type="text/javascript" src="XAudioJS/resampler.js"> </script>
-<script type="text/javascript" src="XAudioJS/swfobject.js"> </script>
-<script type="text/javascript" src="XAudioJS/XAudioServer.js"> </script>
-<script type="text/javascript" src="asap.js"> </script>
-<script type="text/javascript" src="asapweb.js"> </script>
-<script type="text/javascript" src="binaryHttpRequest.js"> </script>
-<script type="text/javascript">
-function playFile(file)
-{
-	var reader = new FileReader();
-	reader.onload = function (e) {
-		asap.play(file.name, new Uint8Array(e.target.result));
-	};
-	reader.readAsArrayBuffer(file);
-}
-
-function dragHelper(e)
-{
-	e.stopPropagation();
-	e.preventDefault();
-}
-
-function onDrop(e)
-{
-	dragHelper(e);
-	playFile(e.dataTransfer.files[0]);
-}
-</script>
-
-<input type="button" value="Download and play" onclick="binaryHttpRequest('X_Ray_2.sap', asap.play)" />
-<input type="button" value="Stop" onclick="asap.stop()" /><br />
-... or select file: <input type="file" onchange="playFile(this.files[0])" />
-<div style="border: solid #c02020 1px; padding-top: 2em; padding-bottom: 2em;" ondragenter="dragHelper(event)" ondragover="dragHelper(event)" ondrop="onDrop(event)">... or drag&amp;drop a file here!</div>
-++++
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/silverlight.txt kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/silverlight.txt
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/silverlight.txt	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/silverlight.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-ASAP - Another Slight Atari Player
-==================================
-
-link:/[Home]
-image:http://sflogo.sourceforge.net/sflogo.php?group_id=154391&amp;type=13["Get ASAP - Another Slight Atari Player at SourceForge.net. Fast, secure and Free Open Source software downloads",width=120,height=30,link="http://sourceforge.net/projects/asap/"]
-
-Silverlight demo
-----------------
-
-This page contains a Silverlight player of Atari music.
-
-++++
-<object id="asap" width="0" height="0" type="application/x-silverlight-2" data="data:application/x-silverlight-2,">
-	<param name="source" value="SilverASAP.xap" />
-	<param name="initParams" value="file=X_Ray_2.sap" />
-	<a href="http://go.microsoft.com/fwlink/?LinkID=124807" style="text-decoration: none;">
-		<img src="http://go.microsoft.com/fwlink/?LinkId=108181" alt="Get Microsoft Silverlight" style="border-style: none" />
-	</a>
-</object>
-<input type="button" value="Play" onclick="document.getElementById('asap').Content.ASAP.Play('X_Ray_2.sap')" />
-<input type="button" value="Pause" onclick="document.getElementById('asap').Content.ASAP.Pause()" />
-<input type="button" value="Stop" onclick="document.getElementById('asap').Content.ASAP.Stop()" />
-++++
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/www.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/www.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/www/www.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/www/www.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-ifndef DO
-$(error Use "Makefile" instead of "www.mk")
-endif
-
-www: www/index.html www/NEWS.html www/applet.html www/flash.html www/javascript.html www/silverlight.html www/apokeysnd.dll \
-	www/asap.swf www/asap_applet.jar www/asap.js www/asapweb.js www/binaryHttpRequest.js www/SilverASAP.xap \
-	www/favicon.ico www/PORTS.xml www/PORTS.xsl
-.PHONY: www
-
-www/index.html: $(call src,README CREDITS)
-	$(call ASCIIDOC,-a asapwww -a asapports)
-
-www/NEWS.html: $(srcdir)NEWS
-	$(call ASCIIDOC,)
-
-www/applet.html: $(srcdir)www/applet.txt
-	$(call ASCIIDOC,)
-
-www/flash.html: $(srcdir)www/flash.txt
-	$(call ASCIIDOC,)
-
-www/javascript.html: $(srcdir)www/javascript.txt
-	$(DO)asciidoc -o - $< | sed -e "s/527bbd;/c02020;/" | xmllint --dropdtd --nonet -o $@ -
-
-www/silverlight.html: $(srcdir)www/silverlight.txt
-	$(call ASCIIDOC,)
-
-www/apokeysnd.dll: win32/apokeysnd.dll
-	$(COPY)
-
-www/asap.swf: flash/asap.swf
-	$(COPY)
-
-www/asap_applet.jar: java/asap_applet.jar
-	$(COPY)
-
-www/asap.js: javascript/asap.js
-	$(COPY)
-
-www/asapweb.js: $(srcdir)javascript/asapweb.js
-	$(COPY)
-
-www/binaryHttpRequest.js: $(srcdir)javascript/binaryHttpRequest.js
-	$(COPY)
-
-www/SilverASAP.xap: csharp/SilverASAP.xap
-	$(COPY)
-
-www/favicon.ico: $(srcdir)win32/wasap/wasap.ico
-	$(COPY)
-
-www/PORTS.xml: $(srcdir)PORTS.xml
-	$(COPY)
-
-www/PORTS.xsl: $(srcdir)PORTS.xsl
-	$(COPY)
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xbmc/build_vctk.bat kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xbmc/build_vctk.bat
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xbmc/build_vctk.bat	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xbmc/build_vctk.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-set Path=C:\Program Files\Microsoft Visual C++ Toolkit 2003\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322
-set INCLUDE=C:\Program Files\Microsoft Visual C++ Toolkit 2003\include
-set LIB=C:\Program Files\Microsoft Visual C++ Toolkit 2003\lib;C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib
-cl -GR- -DNDEBUG -nologo -O2 -GL -W3 -Fe../win32/xbmc_asap.dll -LD -I.. xbmc_asap.c ../asap.c ../win32/xbmc/xbmc_asap.res -Fo../win32/xbmc/ -MD -link -release
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xbmc/xbmc_asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xbmc/xbmc_asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xbmc/xbmc_asap.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xbmc/xbmc_asap.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-/*
- * xbmc_asap.c - ASAP plugin for XBMC
- *
- * Copyright (C) 2008-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#ifdef __linux__
-#define __declspec(x)
-#endif
-
-#include "asap.h"
-
-typedef struct {
-	char author[ASAPInfo_MAX_TEXT_LENGTH + 1];
-	char name[ASAPInfo_MAX_TEXT_LENGTH + 1];
-	int year;
-	int month;
-	int day;
-	int channels;
-	int duration;
-} ASAP_SongInfo;
-
-static ASAP *asap = NULL;
-
-static cibool loadModule(const char *filename, unsigned char *module, int *module_len)
-{
-	FILE *fp = fopen(filename, "rb");
-	if (fp == NULL)
-		return FALSE;
-	*module_len = (int) fread(module, 1, ASAPInfo_MAX_MODULE_LENGTH, fp);
-	fclose(fp);
-	return TRUE;
-}
-
-static ASAPInfo *getModuleInfo(const char *filename)
-{
-	unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	ASAPInfo *info;
-	if (!loadModule(filename, module, &module_len))
-		return NULL;
-	info = ASAPInfo_New();
-	if (info == NULL)
-		return NULL;
-	if (!ASAPInfo_Load(info, filename, module, module_len)) {
-		ASAPInfo_Delete(info);
-		return NULL;
-	}
-	return info;
-}
-
-__declspec(dllexport) int asapGetSongs(const char *filename)
-{
-	ASAPInfo *info = getModuleInfo(filename);
-	int songs;
-	if (info == NULL)
-		return 0;
-	songs = ASAPInfo_GetSongs(info);
-	ASAPInfo_Delete(info);
-	return songs;
-}
-
-static int zeroIfNegative(int x)
-{
-	return x >= 0 ? x : 0;
-}
-
-__declspec(dllexport) cibool asapGetInfo(const char *filename, int song, ASAP_SongInfo *song_info)
-{
-	ASAPInfo *info = getModuleInfo(filename);
-	if (info == NULL)
-		return FALSE;
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(info);
-	strcpy(song_info->author, ASAPInfo_GetAuthor(info));
-	strcpy(song_info->name, ASAPInfo_GetTitleOrFilename(info));
-	song_info->year = zeroIfNegative(ASAPInfo_GetYear(info));
-	song_info->month = zeroIfNegative(ASAPInfo_GetMonth(info));
-	song_info->day = zeroIfNegative(ASAPInfo_GetDayOfMonth(info));
-	song_info->channels = ASAPInfo_GetChannels(info);
-	song_info->duration = ASAPInfo_GetDuration(info, song);
-	ASAPInfo_Delete(info);
-	return TRUE;
-}
-
-__declspec(dllexport) cibool asapLoad(const char *filename, int song, int *channels, int *duration)
-{
-	unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-	int module_len;
-	const ASAPInfo *info;
-	if (!loadModule(filename, module, &module_len))
-		return FALSE;
-	if (asap == NULL) {
-		asap = ASAP_New();
-		if (asap == NULL)
-			return FALSE;
-	}
-	if (!ASAP_Load(asap, filename, module, module_len))
-		return FALSE;
-	info = ASAP_GetInfo(asap);
-	*channels = ASAPInfo_GetChannels(info);
-	if (song < 0)
-		song = ASAPInfo_GetDefaultSong(info);
-	*duration = ASAPInfo_GetDuration(info, song);
-	return ASAP_PlaySong(asap, song, *duration);
-}
-
-__declspec(dllexport) void asapSeek(int position)
-{
-	ASAP_Seek(asap, position);
-}
-
-__declspec(dllexport) int asapGenerate(void *buffer, int buffer_len)
-{
-	return ASAP_Generate(asap, buffer, buffer_len, ASAPSampleFormat_S16_L_E);
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xbmc/xbmc.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xbmc/xbmc.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xbmc/xbmc.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xbmc/xbmc.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-XBMC_DLL_LOADER_EXPORTS = ../XBMC/xbmc/cores/DllLoader/exports
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "xbmc.mk")
-endif
-
-asap-xbmc: xbmc_asap-i486-linux.so
-.PHONY: asap-xbmc
-
-xbmc_asap-i486-linux.so: $(call src,xbmc/xbmc_asap.c asap.[ch])
-	$(CC) `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o
-CLEAN += xbmc_asap-i486-linux.so
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xmms/libasap-xmms.c kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xmms/libasap-xmms.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xmms/libasap-xmms.c	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xmms/libasap-xmms.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,307 +0,0 @@
-/*
- * libasap-xmms.c - ASAP plugin for XMMS
- *
- * Copyright (C) 2006-2011  Piotr Fusik
- *
- * This file is part of ASAP (Another Slight Atari Player),
- * see http://asap.sourceforge.net
- *
- * ASAP is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * ASAP is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ASAP; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <pthread.h>
-#include <string.h>
-#ifdef USE_STDIO
-#include <stdio.h>
-#else
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-
-#include <xmms/plugin.h>
-#include <xmms/titlestring.h>
-#include <xmms/util.h>
-
-#include "asap.h"
-
-#define BITS_PER_SAMPLE  16
-#define BUFFERED_BLOCKS  512
-
-static int channels;
-
-static InputPlugin mod;
-
-static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
-static int module_len;
-static ASAP *asap;
-
-static volatile int seek_to;
-static pthread_t thread_handle;
-static volatile cibool thread_run = FALSE;
-static volatile cibool generated_eof = FALSE;
-
-static char *asap_stpcpy(char *dest, const char *src)
-{
-	size_t len = strlen(src);
-	memcpy(dest, src, len);
-	return dest + len;
-}
-
-static void asap_show_message(gchar *title, gchar *text)
-{
-	xmms_show_message(title, text, "Ok", FALSE, NULL, NULL);
-}
-
-static void asap_init(void)
-{
-	asap = ASAP_New();
-}
-
-static void asap_about(void)
-{
-	asap_show_message("About ASAP XMMS plugin " ASAPInfo_VERSION,
-		ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT);
-}
-
-static int asap_is_our_file(char *filename)
-{
-	return ASAPInfo_IsOurFile(filename);
-}
-
-static cibool asap_load_file(const char *filename)
-{
-#ifdef USE_STDIO
-	FILE *fp;
-	fp = fopen(filename, "rb");
-	if (fp == NULL)
-		return FALSE;
-	module_len = (int) fread(module, 1, sizeof(module), fp);
-	fclose(fp);
-#else
-	int fd;
-	fd = open(filename, O_RDONLY);
-	if (fd == -1)
-		return FALSE;
-	module_len = read(fd, module, sizeof(module));
-	close(fd);
-	if (module_len < 0)
-		return FALSE;
-#endif
-	return TRUE;
-}
-
-static ASAPInfo *asap_get_info(const char *filename)
-{
-	ASAPInfo *info;
-	if (!asap_load_file(filename))
-		return NULL;
-	info = ASAPInfo_New();
-	if (info == NULL)
-		return NULL;
-	if (!ASAPInfo_Load(info, filename, module, module_len)) {
-		ASAPInfo_Delete(info);
-		return NULL;
-	}
-	return info;
-}
-
-static char *asap_get_title(const char *filename, const ASAPInfo *info)
-{
-	char *path;
-	char *filepart;
-	char *ext;
-	TitleInput *title_input;
-	const char *p;
-	int year;
-	char *title;
-
-	path = g_strdup(filename);
-	filepart = strrchr(path, '/');
-	if (filepart != NULL) {
-		filepart[1] = '\0';
-		filepart += 2;
-	}
-	else
-		filepart = path;
-	ext = strrchr(filepart, '.');
-	if (ext != NULL)
-		ext++;
-
-	XMMS_NEW_TITLEINPUT(title_input);
-	p = ASAPInfo_GetAuthor(info);
-	if (p[0] != '\0')
-		title_input->performer = (gchar *) p;
-	title_input->track_name = (gchar *) ASAPInfo_GetTitleOrFilename(info);
-	year = ASAPInfo_GetYear(info);
-	if (year > 0)
-		title_input->year = year;
-	p = ASAPInfo_GetDate(info);
-	if (p[0] != '\0')
-		title_input->date = (gchar *) p;
-	title_input->file_name = g_basename(filename);
-	title_input->file_ext = ext;
-	title_input->file_path = path;
-	title = xmms_get_titlestring(xmms_get_gentitle_format(), title_input);
-	if (title == NULL)
-		title = g_strdup(ASAPInfo_GetTitleOrFilename(info));
-
-	g_free(path);
-	return title;
-}
-
-static void *asap_play_thread(void *arg)
-{
-	while (thread_run) {
-		static unsigned char buffer[BUFFERED_BLOCKS * (BITS_PER_SAMPLE / 8) * 2];
-		int buffered_bytes;
-		if (generated_eof) {
-			xmms_usleep(10000);
-			continue;
-		}
-		if (seek_to >= 0) {
-			mod.output->flush(seek_to);
-			ASAP_Seek(asap, seek_to);
-			seek_to = -1;
-		}
-		buffered_bytes = BUFFERED_BLOCKS * channels * (BITS_PER_SAMPLE / 8);
-		buffered_bytes = ASAP_Generate(asap, buffer, buffered_bytes,
-			BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
-		if (buffered_bytes == 0) {
-			generated_eof = TRUE;
-			mod.output->buffer_free();
-			mod.output->buffer_free();
-			continue;
-		}
-		mod.add_vis_pcm(mod.output->written_time(),
-			BITS_PER_SAMPLE == 8 ? FMT_U8 : FMT_S16_LE,
-			channels, buffered_bytes, buffer);
-		while (thread_run && mod.output->buffer_free() < buffered_bytes)
-			xmms_usleep(20000);
-		if (thread_run)
-			mod.output->write_audio(buffer, buffered_bytes);
-	}
-	pthread_exit(NULL);
-}
-
-static void asap_play_file(char *filename)
-{
-	const ASAPInfo *info;
-	int song;
-	int duration;
-	char *title;
-	if (asap == NULL)
-		return;
-	if (!asap_load_file(filename))
-		return;
-	if (!ASAP_Load(asap, filename, module, module_len))
-		return;
-	info = ASAP_GetInfo(asap);
-	song = ASAPInfo_GetDefaultSong(info);
-	duration = ASAPInfo_GetDuration(info, song);
-	if (!ASAP_PlaySong(asap, song, duration))
-		return;
-	channels = ASAPInfo_GetChannels(info);
-	if (!mod.output->open_audio(BITS_PER_SAMPLE == 8 ? FMT_U8 : FMT_S16_LE, ASAP_SAMPLE_RATE, channels))
-		return;
-	title = asap_get_title(filename, info);
-	mod.set_info(title, duration, BITS_PER_SAMPLE * 1000, ASAP_SAMPLE_RATE, channels);
-	g_free(title);
-	seek_to = -1;
-	thread_run = TRUE;
-	generated_eof = FALSE;
-	pthread_create(&thread_handle, NULL, asap_play_thread, NULL);
-}
-
-static void asap_seek(int time)
-{
-	seek_to = time * 1000;
-	generated_eof = FALSE;
-	while (thread_run && seek_to >= 0)
-		xmms_usleep(10000);
-}
-
-static void asap_pause(short paused)
-{
-	mod.output->pause(paused);
-}
-
-static void asap_stop(void)
-{
-	if (thread_run) {
-		thread_run = FALSE;
-		pthread_join(thread_handle, NULL);
-		mod.output->close_audio();
-	}
-}
-
-static int asap_get_time(void)
-{
-	if (!thread_run || (generated_eof && !mod.output->buffer_playing()))
-		return -1;
-	return mod.output->output_time();
-}
-
-static void asap_get_song_info(char *filename, char **title, int *length)
-{
-	ASAPInfo *info = asap_get_info(filename);
-	if (info == NULL)
-		return;
-	*title = asap_get_title(filename, info);
-	*length = ASAPInfo_GetDuration(info, ASAPInfo_GetDefaultSong(info));
-	ASAPInfo_Delete(info);
-}
-
-static void asap_file_info_box(char *filename)
-{
-	ASAPInfo *info = asap_get_info(filename);
-	char s[3 * ASAPInfo_MAX_TEXT_LENGTH + 100];
-	char *p;
-	if (info == NULL)
-		return;
-	p = asap_stpcpy(s, "Author: ");
-	p = asap_stpcpy(p, ASAPInfo_GetAuthor(info));
-	p = asap_stpcpy(p, "\nName: ");
-	p = asap_stpcpy(p, ASAPInfo_GetTitle(info));
-	p = asap_stpcpy(p, "\nDate: ");
-	p = asap_stpcpy(p, ASAPInfo_GetDate(info));
-	*p = '\0';
-	ASAPInfo_Delete(info);
-	asap_show_message("File information", s);
-}
-
-static InputPlugin mod = {
-	NULL, NULL,
-	"ASAP " ASAPInfo_VERSION,
-	asap_init,
-	asap_about,
-	NULL,
-	asap_is_our_file,
-	NULL,
-	asap_play_file,
-	asap_stop,
-	asap_pause,
-	asap_seek,
-	NULL,
-	asap_get_time,
-	NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-	asap_get_song_info,
-	asap_file_info_box,
-	NULL
-};
-
-InputPlugin *get_iplugin_info(void)
-{
-	return &mod;
-}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xmms/libasap-xmms.map kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xmms/libasap-xmms.map
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xmms/libasap-xmms.map	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xmms/libasap-xmms.map	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-# This linker script defines symbols that should be exported
-# from the shared library.
-# Without this script, all global symbols are exported, which:
-# - makes the library about 4K bigger
-# - makes the symbols accessible from the outside
-# - can lead to symbol collisions with different libraries
-#   (I am not sure whether this problem actually exists)
-# It should be noted that the shared library can be generated
-# without this script, so you can omit it if your linker does not
-# understand it.
-{
-	global: get_iplugin_info;
-	local: *;
-};
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xmms/xmms.mk kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xmms/xmms.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-3.1.5/xmms/xmms.mk	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-3.1.5/xmms/xmms.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-XMMS_CFLAGS = `xmms-config --cflags`
-XMMS_LIBS = `xmms-config --libs`
-XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir`
-XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins
-
-# no user-configurable paths below this line
-
-ifndef DO
-$(error Use "Makefile" instead of "xmms.mk")
-endif
-
-asap-xmms: libasap-xmms.so
-.PHONY: asap-xmms
-
-libasap-xmms.so: $(call src,xmms/libasap-xmms.c asap.[ch])
-	$(CC) $(XMMS_CFLAGS) -Wl,--version-script=$(srcdir)xmms/libasap-xmms.map $(XMMS_LIBS)
-CLEAN += libasap-xmms.so
-
-install-xmms: libasap-xmms.so
-	$(call INSTALL_PROGRAM,libasap-xmms.so,$(XMMS_INPUT_PLUGIN_DIR))
-.PHONY: install-xmms
-
-uninstall-xmms:
-	$(RM) $(DESTDIR)$(XMMS_INPUT_PLUGIN_DIR)/libasap-xmms.so
-.PHONY: uninstall-xmms
-
-install-xmms-user: libasap-xmms.so
-	$(call INSTALL_PROGRAM,libasap-xmms.so,$(XMMS_USER_PLUGIN_DIR))
-.PHONY: install-xmms-user
-
-uninstall-xmms-user:
-	$(RM) $(DESTDIR)$(XMMS_USER_PLUGIN_DIR)/libasap-xmms.so
-.PHONY: uninstall-xmms-user
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/6502.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/6502.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/6502.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/6502.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,43 @@
+MADS = $(DO)mads -s -o:$@ $<
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "6502.mk")
+endif
+
+ASM6502_PLAYERS = cmc cm3 cmr cms dlt mpt rmt4 rmt8 tmc tm2 fc
+ASM6502_PLAYERS_OBX = $(ASM6502_PLAYERS:%=6502/%.obx)
+ASM6502_OBX = $(ASM6502_PLAYERS_OBX) 6502/xexb.obx 6502/xexd.obx 6502/xexinfo.obx
+
+6502/cmc.obx: $(srcdir)6502/cmc.asx
+	$(XASM) -d CM3=0 -d CMR=0
+
+6502/cm3.obx: $(srcdir)6502/cmc.asx
+	$(XASM) -d CM3=1 -d CMR=0
+
+6502/cmr.obx: $(srcdir)6502/cmc.asx
+	$(XASM) -d CM3=0 -d CMR=1
+
+6502/dlt.obx: $(srcdir)6502/dlt.as8
+	$(MADS) -c
+
+6502/rmt4.obx: $(srcdir)6502/rmt.asx
+	$(XASM) -d STEREOMODE=0
+
+6502/rmt8.obx: $(srcdir)6502/rmt.asx
+	$(XASM) -d STEREOMODE=1
+
+6502/fc.obx: $(srcdir)6502/fc.as8
+	$(MADS)
+
+6502/xexinfo.obx: $(srcdir)6502/xexinfo.asx
+	$(XASM) -d TEST=0 -l
+
+6502/xexinfo.xex: $(srcdir)6502/xexinfo.asx
+	$(XASM) -d TEST=1
+
+6502/%.obx: $(srcdir)6502/%.asx
+	$(XASM) -l
+
+CLEAN += $(ASM6502_OBX) 6502/fp3depk.obx 6502/xexinfo.xex 6502/*.lst
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cm3.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cm3.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cmc.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cmc.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cmc.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cmc.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,965 @@
+*---------------------------*
+*     cmc player v 2.1      *
+*   by Marcin Lewandowski   *
+* based on cmc player v 2.0 *
+*      by Janusz Pelc       *
+*---------------------------*
+
+ org $0500
+
+*--- strona 0
+
+addr equ $fc
+word equ $fe
+
+*--- skoki
+
+ jmp basic
+ jmp init
+ jmp play
+
+*--- dane
+
+volume dta d'   '
+czest  dta d'   '
+numins dta d'   '
+
+ dta c' cmc player v 2.1 '*
+
+frq    dta d'    '
+znieks dta d'    '
+audc   dta b(0)
+
+czest1 dta d'   '
+czest2 dta d'   '
+czest3 dta d'   '
+zniek  dta d'   '
+count1 dta b($ff),b($ff),b($ff)
+count2 dta d'   '
+lopad  dta d'   '
+numptr dta d'   '
+poswpt dta d'   '
+ilewol dta d'   '
+czygrx dta b($80),b($80),b($80)
+czygrc dta b($80)
+
+dana0  dta d'   '
+dana1  dta d'   '
+dana2  dta d'   '
+dana3  dta d'   '
+dana4  dta d'   '
+dana5  dta d'   '
+ladr   dta d'   '
+hadr   dta d'   '
+
+posptr dta b(0)
+possng dta b(0)
+pocrep dta b(0)
+konrep dta b(0)
+ilrep  dta b(0)
+tmpo   dta b(0)
+ltemp  dta b(0)
+b1     dta b(0)
+b2     dta b(0)
+b3     dta b(0)
+czygr  dta b(0)
+
+adrmus dta a(0)
+adradr dta a(0)
+adrsng dta a(0)
+
+*--- init
+
+init sta b1
+ stx b2
+ sty b3
+ and #$70
+ lsr @
+ lsr @
+ lsr @
+ tax
+ lda tab1,x
+ sta zm1+1
+ lda tab1+1,x
+ sta zm1+2
+ lda #3
+ sta $d20f
+ cld
+ lda word
+ pha
+ lda word+1
+ pha
+ ldy b3
+ ldx b2
+ lda b1
+zm1 jsr graj
+ pla
+ sta word+1
+ pla
+ sta word
+ rts
+
+graj lda adrsng
+ sta word
+ lda adrsng+1
+ sta word+1
+ ldy #0
+ txa
+ beq grajx
+l1 lda (word),y
+ cmp #$8f
+ beq l2
+ cmp #$ef
+ bne l3
+l2 dex
+ bne l3
+ iny
+ cpy #$54
+ bcs l4
+ tya
+ tax
+ bpl grajx
+l3 iny
+ cpy #$54
+ bcc l1
+l4 rts
+
+grajx stx possng
+ jsr skoncz
+ lda #0
+ ldx #9
+l5 sta poswpt,x
+ dex
+ bpl l5
+ sta posptr
+ lda #1
+ sta czygr
+ lda #$ff
+ sta konrep
+ lda adrmus
+ sta word
+ lda adrmus+1
+ sta word+1
+ ldy #$13
+ lda (word),y
+ tax
+ lda adrsng
+ sta word
+ lda adrsng+1
+ sta word+1
+ ldy possng
+l6 lda (word),y
+ cmp #$cf
+ bne l7
+ tya
+ clc
+ adc #$55
+ tay
+ lda (word),y
+ bmi l8
+ tax
+ jmp l8
+l7 cmp #$8f
+ beq l8
+ cmp #$ef
+ beq l8
+ dey
+ bpl l6
+l8 stx tmpo
+ stx ltemp
+ rts
+
+tempo and #$f
+ beq l8
+ stx d0+1
+ stx d1+1
+ stx d2+1
+ sty d0+2
+ sty d1+2
+ sty d2+2
+ rts
+
+inic stx adrmus
+ stx word
+ sty adrmus+1
+ sty word+1
+ clc
+ txa
+ adc #$14
+ sta adradr
+ tya
+ adc #0
+ sta adradr+1
+ stx adrsng
+ iny
+ iny
+ sty adrsng+1
+ ldy #$13
+ lda (word),y
+ sta tmpo
+ sta ltemp
+
+skoncz ldx #8
+l9 lda #0
+ sta czygr
+ sta $d200,x
+ cpx #3
+ bcs l10
+ sta volume,x
+ lda #$ff
+ sta count1,x
+l10 dex
+ bpl l9
+
+przer lda #$80
+l11 ldx #3
+l12 sta czygrx,x
+ dex
+ bpl l12
+l13 rts
+
+kont lda #1
+ sta czygr
+ lda #0
+ beq l11
+
+instr and #3
+ cmp #3
+ beq l13
+ cpx #$40
+ bcs l13
+ cpy #26
+ bcs l13
+ tax
+ lda #$80
+ sta czygrx,x
+
+inst lda #0
+ sta count1,x
+ sta count2,x
+ sta lopad,x
+ lda b2
+ sta czest,x
+
+ lda b3
+ asl @
+ asl @
+ asl @
+ sta word
+ clc
+ lda adrmus
+ adc #$30
+ pha
+ lda adrmus+1
+ adc #1
+ tay
+ pla
+ clc
+ adc word
+ sta ladr,x
+ tya
+ adc #0
+ sta hadr,x
+
+ clc
+ lda adrmus
+ adc #$94
+ sta word
+ lda adrmus+1
+ adc #0
+ sta word+1
+ lda b3
+ asl @
+ adc b3
+ asl @
+ tay
+ lda (word),y
+ sta dana0,x
+ iny
+ lda (word),y
+ sta dana1,x
+ and #7
+ sta b1
+ iny
+ lda (word),y
+ sta dana2,x
+ iny
+ lda (word),y
+ sta dana3,x
+ iny
+ lda (word),y
+ sta dana4,x
+ iny
+ lda (word),y
+ sta dana5,x
+
+ ldy #0
+ lda b1
+ cmp #3
+ bne l14
+ ldy #2
+l14 cmp #7
+ bne l15
+ ldy #4
+l15 lda tab3,y
+ sta word
+ lda tab3+1,y
+ sta word+1
+ lda dana2,x
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ clc
+ adc b2
+ sta b2
+ sta zm2+1
+ tay
+ lda b1
+ cmp #7
+ bne l16
+ tya
+ asl @
+ tay
+ lda (word),y
+ sta czest1,x
+ iny
+ sty b2
+ jmp l17
+l16 lda (word),y
+ sta czest1,x
+ lda dana2,x
+ and #$f
+ clc
+ adc b2
+ sta b2
+l17 ldy b2
+ lda b1
+ cmp #5
+ php
+ lda (word),y
+ plp
+ beq l18
+ cmp czest1,x
+ bne l18
+ sec
+ sbc #1
+l18 sta czest2,x
+ lda dana0,x
+ pha
+ and #3
+ tay
+ lda tab4,y
+ sta zniek,x
+ pla
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ ldy #$3e
+ cmp #$f
+ beq l19
+ ldy #$37
+ cmp #$e
+ beq l19
+ ldy #$30
+ cmp #$d
+ beq l19
+ clc
+zm2 adc #0
+ tay
+l19 lda tab5,y
+ sta czest3,x
+ rts
+
+*--- play
+
+play cld
+ lda addr
+ pha
+ lda addr+1
+ pha
+ lda word
+ pha
+ lda word+1
+ pha
+ lda czygr
+ bne g1
+ jmp end
+g1 lda czygrc
+ beq g2
+ jmp dal3
+g2 lda tmpo
+ cmp ltemp
+ beq g3
+ jmp dal2
+g3 lda posptr
+ beq g4
+ jmp dal1
+g4 ldx #2
+g5 ldy czygrx,x
+ bmi g6
+ sta czygrx,x
+g6 sta poswpt,x
+ dex
+ bpl g5
+
+ lda adrsng
+ sta addr
+ lda adrsng+1
+ sta addr+1
+ ldy possng
+ sty word
+g7 cpy konrep
+ bne g8
+ lda ilrep
+ beq g8
+ lda possng
+ ldy pocrep
+ sty possng
+ dec ilrep
+ bne g7
+ sta possng
+ tay
+ bpl g7
+g8 ldx #0
+g9 lda (addr),y
+ cmp #$fe
+ bne g10
+ ldy possng
+ iny
+ cpy word
+ beq g11
+ sty possng
+ jmp g7
+g10 sta numptr,x
+ clc
+ tya
+ adc #$55
+ tay
+ inx
+ cpx #3
+ bcc g9
+ ldy possng
+ lda (addr),y
+ bpl dal1
+ cmp #$ff
+ beq dal1
+ lsr @
+ lsr @
+ lsr @
+ and #$e
+ tax
+ lda tab2,x
+ sta zm3+1
+ lda tab2+1,x
+ sta zm3+2
+ lda numptr+1
+ sta word+1
+zm3 jsr stop
+ sty possng
+ cpy #$55
+ bcs g11
+ cpy word
+ bne g7
+g11 ldy word
+ sty possng
+ jmp end
+
+stop jsr przer
+g12 ldy #$ff
+ rts
+jump bmi g12
+ tay
+ rts
+up bmi g12
+ sec
+ tya
+ sbc word+1
+ tay
+ rts
+down bmi g12
+ clc
+ tya
+ adc word+1
+ tay
+ rts
+temp bmi g12
+ sta tmpo
+ sta ltemp
+ iny
+ rts
+rep bmi g12
+ lda numptr+2
+ bmi g12
+ sta ilrep
+ iny
+ sty pocrep
+ clc
+ tya
+ adc word+1
+ sta konrep
+ rts
+break dey
+ bmi g13
+ lda (addr),y
+ cmp #$8f
+ beq g13
+ cmp #$ef
+ bne break
+g13 iny
+ rts
+
+dal1 ldx #2
+v1 lda ilewol,x
+ beq v2
+ dec ilewol,x
+ bpl v7
+v2 lda czygrx,x
+ bne v7
+ ldy numptr,x
+ cpy #$40
+ bcs v7
+ lda adradr
+ sta addr
+ lda adradr+1
+ sta addr+1
+ lda (addr),y
+ sta word
+ clc
+ tya
+ adc #$40
+ tay
+ lda (addr),y
+ sta word+1
+ and word
+ cmp #$ff
+ beq v7
+v3 ldy poswpt,x
+ lda (word),y
+ and #$c0
+ bne v4
+ lda (word),y
+ and #$3f
+ sta numins,x
+ inc poswpt,x
+ bpl v3
+v4 cmp #$40
+ bne v5
+ lda (word),y
+ and #$3f
+ sta b2
+ lda numins,x
+ sta b3
+ jsr inst
+ jmp v6
+v5 cmp #$80
+ bne v7
+ lda (word),y
+ and #$3f
+ sta ilewol,x
+v6 inc poswpt,x
+v7 dex
+ bpl v1
+
+ ldx posptr
+ inx
+ ift CM3
+ cpx #$30
+ scc:ldx #0
+ stx posptr
+ els
+ txa
+ and #$3f
+ sta posptr
+ eif
+
+dal2 dec ltemp
+ bne dal3
+ lda tmpo
+ sta ltemp
+ lda posptr
+ bne dal3
+ inc possng
+
+dal3 ldy czest2
+ lda dana1
+ and #7
+ cmp #5
+ beq a1
+ cmp #6
+ bne a2
+a1 dey
+a2 sty frq+3
+ ldy #0
+ cmp #5
+ beq a3
+ cmp #6
+ bne a4
+a3 ldy #2
+a4 cmp #7
+ bne a5
+ ldy #$28
+a5 sty audc
+
+ ldx #2
+loop lda dana1,x
+ and #$e0
+ sta znieks,x
+ lda ladr,x
+ sta addr
+ lda hadr,x
+ sta addr+1
+ lda count1,x
+ cmp #$ff
+ beq y4
+ cmp #$f
+ bne y2
+ lda lopad,x
+ beq y4
+ dec lopad,x
+ lda lopad,x
+ bne y4
+ ldy volume,x
+ beq y1
+ dey
+y1 tya
+ sta volume,x
+ lda dana3,x
+ sta lopad,x
+ jmp y4
+y2 lda count1,x
+ lsr @
+ tay
+ lda (addr),y
+ bcc y3
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+y3 and #$f
+ sta volume,x
+y4 ldy czest1,x
+ lda dana1,x
+ and #7
+ cmp #1
+ bne y6
+ dey
+ tya
+ iny
+ cmp czest2,x
+ php
+ lda #1
+ plp
+ bne y5
+ asl @
+ asl @
+y5 and count2,x
+ beq y6
+ ldy czest2,x
+ cpy #$ff
+ bne y6
+ lda #0
+ sta volume,x
+y6 tya
+ sta frq,x
+ lda #1
+ sta b1
+ lda count1,x
+ cmp #$f
+ beq y9
+ and #7
+ tay
+ lda tab9,y
+ sta word
+ lda count1,x
+ and #8
+ php
+ txa
+ plp
+ clc
+ beq y7
+ adc #3
+y7 tay
+ lda dana4,y
+ and word
+ beq y9
+ lda czest3,x
+ sta frq,x
+ stx b1
+ dex
+ bpl y8
+ sta frq+3
+ lda #0
+ sta audc
+y8 inx
+ lda zniek,x
+ sta znieks,x
+y9 lda count1,x
+ and #$f
+ cmp #$f
+ beq y10
+ inc count1,x
+ lda count1,x
+ cmp #$f
+ bne y10
+ lda dana3,x
+ sta lopad,x
+y10 lda czygrx,x
+ bpl y11
+ lda volume,x
+ bne y11
+ lda #$40
+ sta czygrx,x
+y11 inc count2,x
+ ldy #0
+ lda dana1,x
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ bcc y12
+ dey
+y12 lsr @
+ bcc y13
+ iny
+y13 clc
+ tya
+ adc czest1,x
+ sta czest1,x
+ lda czest2,x
+ cmp #$ff
+ bne y14
+ ldy #0
+y14 clc
+ tya
+ adc czest2,x
+ sta czest2,x
+ dex
+ bmi x1
+ jmp loop
+
+x1 lda znieks
+ sta znieks+3
+ lda dana1
+ and #7
+ tax
+ ldy #3
+ lda b1
+ beq x2
+ ldy tab10,x
+x2 tya
+ pha
+ lda tab8,y
+ php
+ and #$7f
+ tax
+ tya
+ and #3
+ asl @
+ tay
+ lda frq,x
+d0 sta $d200,y
+ iny
+ lda volume,x
+ cpx #3
+ bne x3
+ lda volume
+x3 ora znieks,x
+ plp
+ bpl d1
+ lda #0
+d1 sta $d200,y
+ pla
+ tay
+ dey
+ and #3
+ bne x2
+ ldy #8
+ lda audc
+d2 sta $d200,y
+
+ clc
+end pla
+ sta word+1
+ pla
+ sta word
+ pla
+ sta addr+1
+ pla
+ sta addr
+ rts
+
+*--- basic
+
+basic pla
+ tax
+ beq p6
+ cmp #2
+ beq p2
+p1 pla
+ pla
+ dex
+ bne p1
+ rts
+p2 lda $14
+ cmp $14
+ beq *-2
+ lda $224
+ cmp <p8
+ bne p3
+ lda $225
+ cmp >p8
+ beq p1
+p3 lda $224
+ sta p9+1
+ lda $225
+ sta p9+2
+ lda <p8
+ sta $224
+ lda >p8
+ sta $225
+ pla
+ pla
+ beq p4
+ sec
+ sbc #1
+p4 sta p5+1
+ pla
+ tay
+ pla
+ tax
+ lda #$70
+ jsr init
+ lda #0
+p5 ldx #0
+ jmp init
+p6 lda $14
+ cmp $14
+ beq *-2
+ lda $224
+ cmp <p8
+ bne p2-1
+ lda $225
+ cmp >p8
+ bne p2-1
+p7 lda p9+1
+ sta $224
+ lda p9+2
+ sta $225
+ lda #$40
+ jmp init
+p8 jsr play
+ bcc p9
+ jsr p7
+p9 jmp $ffff
+
+*--- tablice
+
+tab1 dta a(graj)
+ dta a(grajx)
+ dta a(instr)
+ dta a(tempo)
+ dta a(skoncz)
+ dta a(przer)
+ dta a(kont)
+ dta a(inic)
+
+tab2 dta a(stop)
+ dta a(jump)
+ dta a(up)
+ dta a(down)
+ dta a(temp)
+ dta a(rep)
+ dta a(break)
+
+tab3 dta a(tab5)
+ dta a(tab6)
+ dta a(tab7)
+
+tab4 dta b($80),b($a0)
+ dta b($20),b($40)
+
+tab5 dta b($ff),b($f1),b($e4),b($d7)
+ dta b($cb),b($c0),b($b5),b($aa)
+ dta b($a1),b($98),b($8f),b($87)
+ dta b($7f),b($78),b($72),b($6b)
+ dta b($65),b($5f),b($5a),b($55)
+ dta b($50),b($4b),b($47),b($43)
+ dta b($3f),b($3c),b($38),b($35)
+ dta b($32),b($2f),b($2c),b($2a)
+ dta b($27),b($25),b($23),b($21)
+ dta b($1f),b($1d),b($1c),b($1a)
+ dta b($18),b($17),b($16),b($14)
+ dta b($13),b($12),b($11),b($10)
+ dta b($0f),b($0e),b($0d),b($0c)
+ dta b($0b),b($0a),b($09),b($08)
+ dta b($07),b($06),b($05),b($04)
+ dta b($03),b($02),b($01),b($00)
+ dta b($00)
+
+tab6 dta b($00),b($00),b($00),b($00)
+ dta b($f2),b($e9),b($da),b($ce)
+ dta b($bf),b($b6),b($aa),b($a1)
+ dta b($98),b($8f),b($89),b($80)
+ dta b($7a),b($71),b($6b),b($65)
+ dta b($5f)
+ ift CMR
+ dta b($5c),b($56),b($50)
+ dta b($4d),b($47),b($44),b($41)
+ dta b($3e),b($38),b($35),b($88)
+ dta b($7f),b($79),b($73),b($6c)
+ dta b($67),b($60),b($5a),b($55)
+ dta b($51),b($4c),b($48),b($43)
+ dta b($3f),b($3d),b($39),b($34)
+ dta b($33),b($30),b($2d),b($2a)
+ dta b($28),b($25),b($24),b($21)
+ dta b($1f),b($1e)
+ els
+ dta b($00),b($56),b($50)
+ dta b($67),b($60),b($5a),b($55)
+ dta b($51),b($4c),b($48),b($43)
+ dta b($3f),b($3d),b($39),b($34)
+ dta b($33),b($39),b($2d),b($2a)
+ dta b($28),b($25),b($24),b($21)
+ dta b($1f),b($1e),b($00),b($00)
+ dta b($0f),b($0e),b($0d),b($0c)
+ dta b($0b),b($0a),b($09),b($08)
+ dta b($07),b($06)
+ eif
+ dta b($05),b($04)
+ dta b($03),b($02),b($01),b($00)
+ dta b($00)
+
+tab7 dta a($b38),a($a8c),a($a00),a($96a)
+ dta a($8e8),a($86a),a($7ef),a($780)
+ dta a($708),a($6ae),a($646),a($5e6)
+ dta a($595),a($541),a($4f6),a($4b0)
+ dta a($46e),a($430),a($3f6),a($3bb)
+ dta a($384),a($352),a($322),a($2f4)
+ dta a($2c8),a($2a0),a($27a),a($255)
+ dta a($234),a($214),a($1f5),a($1d8)
+ dta a($1bd),a($1a4),a($18d),a($177)
+ dta a($160),a($14e),a($138),a($127)
+ dta a($115),a($106),a($0f7),a($0e8)
+ dta a($0db),a($0cf),a($0c3),a($0b8)
+ dta a($0ac),a($0a2),a($09a),a($090)
+ dta a($088),a($07f),a($078),a($070)
+ dta a($06a),a($064),a($05e),a($057)
+ dta a($052),a($032),a($00a)
+
+tab8 dta b($00),b($01),b($02),b($83)
+ dta b($00),b($01),b($02),b($03)
+ dta b($01),b($00),b($02),b($83)
+ dta b($01),b($00),b($02),b($03)
+ dta b($01),b($02),b($80),b($03)
+
+tab9 dta b($80),b($40),b($20),b($10)
+ dta b($08),b($04),b($02),b($01)
+
+tab10 dta b(3),b(3),b(3),b(3)
+ dta b(7),b($b),b($f),b($13)
+
+*--- koniec
+
+ end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cmc.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cmc.obx differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cmr.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cmr.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cms.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cms.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cms.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cms.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,1067 @@
+ZP_C8	equ $C8
+ZP_FC	equ $FC
+ZP_FD	equ $FD
+ZP_FE	equ $FE
+ZP_FF	equ $FF
+L_0224	equ $0224
+L_0225	equ $0225
+
+	org $0500
+
+L_0500	:3 nop
+L_0503	jmp L_0815
+L_0506	jmp L_0F5C
+L_0509	dta $23,$05,$A9,$05,$AD,$05,$B8,$05
+L_0511	dta $00,$00,$00,$00,$00,$00
+L_0517	dta $00,$00,$00,$00,$00,$00
+L_051D	dta $80,$80,$80,$80,$80,$80
+L_0523	dta $00,$00,$00
+L_0526	dta $00,$00,$00
+L_0529	dta $FF,$FF,$FF,$FF,$FF,$FF
+L_052F	dta $00,$00,$00,$00,$00,$00
+L_0535	dta $00
+L_0536	dta $00
+L_0537	dta $00
+L_0538	dta $00,$00,$00
+L_053B	dta $00,$00,$00
+L_053E	dta $00,$00,$00
+L_0541	dta $00,$00,$00
+L_0544	dta $00,$00,$00
+L_0547	dta $00,$00,$00,$00,$00,$00
+L_054D	dta $00,$00,$00,$00,$00,$00
+L_0553	dta $00,$00,$00,$00,$00,$00
+L_0559	dta $00,$00,$00
+L_055C	dta $00,$00,$00
+L_055F	dta $00,$00,$00
+L_0562	dta $00,$00,$00
+L_0565	dta $00,$00,$00,$00,$00,$00
+L_056B	dta $00,$00,$00,$00,$00,$00
+L_0571	dta $00,$00,$00,$00,$00,$00
+L_0577	dta $00,$00,$00,$00,$00,$00
+L_057D	dta $00,$00,$00,$00,$00,$00
+L_0583	dta $00,$00,$00,$00,$00,$00
+L_0589	dta $00,$00,$00
+L_058C	dta $00,$00,$00
+L_058F	dta $00
+L_0590	dta $00
+L_0591	dta $00
+L_0592	dta $00
+L_0593	dta $00
+L_0594	dta $82
+L_0595	dta $00
+L_0596	dta $00
+L_0597	dta $06
+L_0598	dta $06
+L_0599	dta $00
+L_059A	dta $80
+L_059B	dta $14
+L_059C	dta $80
+L_059D	dta $80
+L_059E	dta $00
+L_059F	dta $00
+L_05A0	dta $00
+L_05A1	dta $00
+L_05A2	dta $00
+L_05A3	dta $00
+L_05A4	dta $00
+L_05A5	dta $00
+L_97A5	equ L_05A5 ; relocation bugfix by 0xF
+L_05A6	dta $00
+L_05A7	dta $00
+L_97A7	equ L_05A7 ; relocation bugfix by 0xF
+L_05A8	dta $00
+L_05A9	dta $0F
+L_05AA	dta $0F
+L_05AB	dta $00
+L_05AC	dta $00
+L_05AD	dta $00,$00,$00
+L_05B0	dta $00,$00,$00
+L_05B3	dta $FF
+L_05B4	dta $00,$00,$00
+L_05B7	dta $00
+L_05B8	dta $00
+L_05B9	dta $00,$01,$02,$83,$00,$01,$02,$03,$01,$00,$02,$83,$01,$00,$02,$03
+	dta $01,$02,$80,$03
+L_05CD	dta $80,$40,$20,$10,$08,$04,$02,$01
+L_05D5	dta a(L_084B,L_0876,L_0985,L_0913,L_0950,L_096E,L_097C,L_091A)
+L_05E5	dta $80,$A0,$20,$40
+L_05E9	dta $FF,$F1,$E4,$D7,$CB,$C0,$B5,$AA,$A1,$98,$8F,$87,$7F,$78,$72,$6B
+	dta $65,$5F,$5A,$55,$50,$4B,$47,$43,$3F,$3C,$38,$35,$32,$2F,$2C,$2A
+	dta $27,$25,$23,$21,$1F,$1D,$1C,$1A,$18,$17,$16,$14,$13,$12,$11,$10
+	dta $0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00
+	dta $00
+L_062A	dta $00,$00,$00,$00,$F2,$E9,$DA,$CE,$BF,$B6,$AA,$A1,$98,$8F,$89
+	dta $80,$7A,$71,$6B,$65,$5F,$00,$56,$50,$67,$60,$5A,$55,$51,$4C,$48
+	dta $43,$3F,$3D,$39,$34,$33,$39,$2D,$2A,$28,$25,$24,$21,$1F,$1E,$00
+	dta $00,$0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01
+	dta $00,$00
+L_066B	dta $38,$0B,$8C,$0A,$00,$0A,$6A,$09,$E8,$08,$6A,$08,$EF,$07
+	dta $80,$07,$08,$07,$AE,$06,$46,$06,$E6,$05,$95,$05,$41,$05,$F6,$04
+	dta $B0,$04,$6E,$04,$30,$04,$F6,$03,$BB,$03,$84,$03,$52,$03,$22,$03
+	dta $F4,$02,$C8,$02,$A0,$02,$7A,$02,$55,$02,$34,$02,$14,$02,$F5,$01
+	dta $D8,$01,$BD,$01,$A4,$01,$8D,$01,$77,$01,$60,$01,$4E,$01,$38,$01
+	dta $27,$01,$15,$01,$06,$01,$F7,$00,$E8,$00,$DB,$00,$CF,$00,$C3,$00
+	dta $B8,$00,$AC,$00,$A2,$00,$9A,$00,$90,$00,$88,$00,$7F,$00,$78,$00
+	dta $70,$00,$6A,$00,$64,$00,$5E,$00,$57,$00,$52,$00,$32,$00,$0A,$00
+L_06E9	dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	dta $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01
+	dta $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$02,$02,$02,$02
+	dta $00,$00,$00,$00,$01,$01,$01,$01,$02,$02,$02,$02,$02,$03,$03,$03
+	dta $00,$00,$01,$01,$01,$02,$02,$02,$02,$02,$03,$03,$03,$03,$04,$04
+	dta $00,$00,$01,$01,$01,$02,$02,$02,$03,$03,$03,$04,$04,$04,$05,$05
+	dta $00,$00,$01,$01,$02,$02,$02,$03,$03,$04,$04,$04,$05,$05,$06,$06
+	dta $00,$00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07
+	dta $00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07,$08
+	dta $00,$01,$01,$02,$02,$03,$04,$04,$05,$05,$06,$07,$07,$08,$08,$09
+	dta $00,$01,$01,$02,$03,$03,$04,$05,$05,$06,$07,$07,$08,$09,$09,$0A
+	dta $00,$01,$01,$02,$03,$04,$04,$05,$06,$07,$07,$08,$09,$0A,$0A,$0B
+	dta $00,$01,$02,$02,$03,$04,$05,$06,$07,$08,$09,$09,$0A,$0B,$0B,$0C
+	dta $00,$01,$02,$03,$04,$05,$05,$06,$07,$08,$09,$0A,$0A,$0B,$0C,$0D
+	dta $00,$01,$02,$03,$04,$05,$06,$07,$07,$08,$09,$0A,$0B,$0C,$0D,$0E
+	dta $00,$01,$02,$03,$04,$05,$06,$07,$08,$09,$0A,$0B,$0C,$0D,$0E,$0F
+L_07E9	dta a(L_0C06,L_0C0C,L_0C12,L_0C1C,L_0C26,L_0C32,L_0C4F)
+L_07F7	dta a(L_05E9,L_062A,L_066B)
+L_07FD	dta a(L_0BA1,L_0BC4,L_0BB9,0,0,0,0,0) ; bugfix by 0xF
+L_080D	dta $03,$03,$03,$03,$07,$0B,$0F,$13 ; bugfix by 0xF
+L_0815	sta L_058F
+	stx L_0590
+	sty L_0591
+	and #$70
+	lsr @
+	lsr @
+	lsr @
+	tax
+	lda #$03
+	sta $D20F
+	lda L_05D5,X
+	sta L_0849
+	lda L_05D5+1,X
+	sta L_084A
+	lda #$03
+	sta $D21F
+	lda #$01
+	sta L_0592
+	ldy L_0591
+	ldx L_0590
+	lda L_058F
+	jmp *
+L_0849	equ *-2
+L_084A	equ *-1
+L_084B	lda L_0593
+	sta ZP_FC
+	lda L_0594
+	sta ZP_FD
+	ldy #$00
+	txa
+	beq L_0876
+L_085A	lda (ZP_FC),Y
+	cmp #$8F
+	beq L_0864
+	cmp #$EF
+	bne L_0870
+L_0864	dex
+	bne L_0870
+	iny
+	cpy #$54
+	bcs L_0875
+	tya
+	tax
+	bpl L_0876
+L_0870	iny
+	cpy #$54
+	bcc L_085A
+L_0875	rts
+L_0876	stx L_0595
+	lda #$00
+	ldx #$05
+L_087D	sta L_0511,X
+	sta L_0517,X
+	sta L_051D,X
+	dex
+	bpl L_087D
+	sta L_0596
+	sta L_059D
+	ldy #$FF
+	sty L_059F
+	lda L_0599
+	sta ZP_FC
+	lda L_059A
+	sta ZP_FD
+	ldy #$13
+	lda (ZP_FC),Y
+	tax
+	lda L_0593
+	sta ZP_FC
+	lda L_0594
+	sta ZP_FD
+	ldy L_0595
+	tya
+	pha
+	lda #$0F
+	sta L_05A9
+	sta L_05AA
+L_08BA	lda (ZP_FC),Y
+	cmp #$87
+	bne L_08E3
+	tya
+	pha
+	clc
+	adc #$55
+	tay
+	lda (ZP_FC),Y
+	bpl L_08CC
+	lda #$0F
+L_08CC	and #$0F
+	sta L_05A9
+	tya
+	clc
+	adc #$55
+	tay
+	lda (ZP_FC),Y
+	bpl L_08DD
+	lda L_05A9
+L_08DD	and #$0F
+	sta L_05AA
+	pla
+L_08E3	jmp L_08F3
+L_08E6	lda (ZP_FC),Y
+	cmp #$8F
+	beq L_08F3
+	cmp #$EF
+	beq L_08F3
+	dey
+	bpl L_08BA
+L_08F3	pla
+	tay
+L_08F5	lda (ZP_FC),Y
+	cmp #$CF
+	bne L_0908
+	tya
+	clc
+	adc #$55
+	tay
+	lda (ZP_FC),Y
+	bmi L_0913
+	tax
+	jmp L_0913
+L_0908	cmp #$8F
+	beq L_0913
+	cmp #$EF
+	beq L_0913
+	dey
+	bpl L_08F5
+L_0913	stx L_0597
+	stx L_0598
+	rts
+L_091A	stx L_0599
+	stx ZP_FC
+	sty L_059A
+	sty ZP_FD
+	clc
+	txa
+	adc #$14
+	sta L_059B
+	tya
+	adc #$00
+	sta L_059C
+	clc
+	txa
+	adc #$00
+	sta L_0593
+	tya
+	adc #$02
+	sta L_0594
+	ldy #$13
+	lda (ZP_FC),Y
+	sta L_0597
+	sta L_0598
+	ldx #$03
+	stx $D21F
+	stx $D20F
+L_0950	lda #$00
+	sta L_0592
+	ldy #$08
+L_0957	lda #$00
+	sta $D200,Y
+	sta $D210,Y
+	cpy #$06
+	bcs L_096B
+	sta L_0523,Y
+	lda #$FF
+	sta L_0529,Y
+L_096B	dey
+	bpl L_0957
+L_096E	lda #$80
+L_0970	ldx #$05
+L_0972	sta L_051D,X
+	dex
+	bpl L_0972
+	sta L_059D
+	rts
+L_097C	lda #$00
+	beq L_0970
+	sta L_059D
+	beq L_0990
+L_0985	lda L_058F
+	and #$07
+	tax
+	lda #$80
+	sta L_051D,X
+L_0990	ldy L_0591
+	lda L_0590
+L_0996	sta L_058F
+	sty L_0591
+	lda #$00
+	sta L_0553,X
+	sta L_0529,X
+	sta L_054D,X
+	tya
+	asl @
+	asl @
+	asl @
+	sta ZP_FE
+	clc
+	lda L_0599
+	adc #$30
+	pha
+	lda L_059A
+	adc #$01
+	tay
+	pla
+	clc
+	adc ZP_FE
+	sta L_0565,X
+	tya
+	adc #$00
+	sta L_0547,X
+	clc
+	lda L_0599
+	adc #$94
+	sta ZP_FC
+	lda L_059A
+	adc #$00
+	sta ZP_FD
+	lda L_0591
+	asl @
+	adc L_0591
+	asl @
+	tay
+	sty L_0591
+	iny
+	iny
+	iny
+	iny
+	iny
+	lda (ZP_FC),Y
+	sta L_0571,X
+	dey
+	lda (ZP_FC),Y
+	sta L_056B,X
+	dey
+	lda (ZP_FC),Y
+	sta L_0577,X
+	dey
+	dey
+	lda (ZP_FC),Y
+	sta L_053B,X
+	ldy #$00
+	and #$07
+	cmp #$03
+	bne L_0A09
+	ldy #$02
+L_0A09	cmp #$07
+	bne L_0A0F
+	ldy #$04
+L_0A0F	lda L_07F7,Y
+	sta ZP_FE
+	lda L_07F7+1,Y
+	sta ZP_FF
+	ldy L_0591
+	iny
+	iny
+	lda (ZP_FC),Y
+	lsr @
+	lsr @
+	lsr @
+	lsr @
+	clc
+	adc L_058F
+	sta L_058F
+	sta L_0A9F
+	tay
+	lda L_053B,X
+	and #$07
+	cmp #$07
+	bne L_0A47
+	tya
+	asl @
+	tay
+	lda (ZP_FE),Y
+	sta L_057D,X
+	iny
+	sty L_058F
+	jmp L_0A5C
+L_0A47	lda (ZP_FE),Y
+	sta L_057D,X
+	ldy L_0591
+	iny
+	iny
+	lda (ZP_FC),Y
+	and #$0F
+	clc
+	adc L_058F
+	sta L_058F
+L_0A5C	ldy L_058F
+	lda L_053B,X
+	and #$07
+	cmp #$05
+	php
+	lda (ZP_FE),Y
+	plp
+	beq L_0A74
+	cmp L_057D,X
+	bne L_0A74
+	sec
+	sbc #$01
+L_0A74	sta L_0559,X
+	ldy L_0591
+	lda (ZP_FC),Y
+	pha
+	and #$03
+	tay
+	lda L_05E5,Y
+	sta L_0583,X
+	pla
+	lsr @
+	lsr @
+	lsr @
+	lsr @
+	ldy #$3E
+	cmp #$0F
+	beq L_0AA1
+	ldy #$37
+	cmp #$0E
+	beq L_0AA1
+	ldy #$30
+	cmp #$0D
+	beq L_0AA1
+	clc
+	adc #$32
+L_0A9F	equ *-1
+	tay
+L_0AA1	lda L_05E9,Y
+	sta L_0589,X
+	rts
+L_0AA8	cld
+	lda ZP_FC
+	pha
+	lda ZP_FD
+	pha
+	lda ZP_FE
+	pha
+	lda ZP_FF
+	pha
+	lda L_0592
+	bne L_0ABD
+	jmp L_0F2F
+L_0ABD	lda L_059D
+	beq L_0AC5
+	jmp L_0CE1
+L_0AC5	lda L_0598
+	cmp L_0597
+	bcs L_0AD0
+	jmp L_0CCE
+L_0AD0	lda L_0596
+	beq L_0AD8
+	jmp L_0B9E
+L_0AD8	ldx #$05
+	lda #$00
+L_0ADC	ldy L_051D,X
+	bmi L_0AE4
+	sta L_051D,X
+L_0AE4	sta L_0511,X
+	dex
+	bpl L_0ADC
+	lda L_0593
+	sta ZP_FC
+	lda L_0594
+	sta ZP_FD
+	ldy L_0595
+	sty L_05A1
+L_0AFA	cpy L_059F
+	bne L_0B18
+	lda L_05A0
+	beq L_0B18
+	lda L_0595
+	ldy L_059E
+	sty L_0595
+	dec L_05A0
+	bne L_0AFA
+	sta L_0595
+	tay
+	bpl L_0AFA
+L_0B18	ldx #$00
+L_0B1A	lda (ZP_FC),Y
+	cmp #$FE
+	beq L_0B3C
+	sta L_0535,X
+	inc ZP_FD
+	lda (ZP_FC),Y
+	dec ZP_FD
+	cmp #$FE
+	beq L_0B3C
+	sta L_0538,X
+	clc
+	tya
+	adc #$55
+	tay
+	inx
+	cpx #$03
+	bcc L_0B1A
+	bcs L_0B5E
+L_0B3C	ldy L_0595
+	iny
+	cpy L_05A1
+	beq L_0B95
+	sty L_0595
+L_0B48	jmp L_0AFA
+L_0B4B	pla
+	and #$0E
+	tax
+	lda L_07FD,X
+	sta L_0B87
+	lda L_07FD+1,X
+	sta L_0B88
+	jmp L_0B81
+L_0B5E	ldy L_0595
+	lda (ZP_FC),Y
+	bpl L_0B9E
+	cmp #$FF
+	beq L_0B9E
+	lsr @
+	lsr @
+	lsr @
+	pha
+	and #$01
+	beq L_0B4B
+	pla
+	and #$0E
+	tax
+	lda L_07E9,X
+	sta L_0B87
+	lda L_07E9+1,X
+	sta L_0B88
+L_0B81	lda L_0536
+	sta ZP_FE
+	jsr *
+L_0B87	equ *-2
+L_0B88	equ *-1
+	sty L_0595
+	cpy #$55
+	bcs L_0B95
+	cpy L_05A1
+	bne L_0B48
+L_0B95	ldy L_05A1
+	sty L_0595
+	jmp L_0F2F
+L_0B9E	jmp L_0C5E
+L_0BA1	lda ZP_FE
+	bmi L_0BB7
+	and #$0F
+	sta L_05A9
+	lda L_0537
+	bpl L_0BB2
+	lda L_05A9
+L_0BB2	and #$0F
+	sta L_05AA
+L_0BB7	iny
+	rts
+L_0BB9	lda ZP_FE
+	bmi L_0BB7
+	and #$01
+	sta L_05B8
+	iny
+	rts
+L_0BC4	lda L_05B3
+	bmi L_0BDD
+	dec L_05B4
+	bne L_0C01
+	lda #$32
+	sta L_05B4
+	dec L_05B3
+	bne L_0C01
+	dec L_05B3
+	iny
+	rts
+L_0BDD	lda ZP_FE
+	bmi L_0BB7
+	sta L_05B4
+	inc L_05B4
+	lda ZP_FE
+	bmi L_0BB7
+	sta L_05B4
+	inc L_05B4
+	lda L_0537
+	sta L_05B3
+	bpl L_0BFE
+	lda #$00
+	sta L_05B3
+L_0BFE	inc L_05B3
+L_0C01	pla
+	pla
+	jmp L_0CE1
+L_0C06	jsr L_096E
+L_0C09	ldy #$FF
+	rts
+L_0C0C	lda ZP_FE
+	bmi L_0C09
+	tay
+	rts
+L_0C12	lda ZP_FE
+	bmi L_0C09
+	sec
+	tya
+	sbc ZP_FE
+	tay
+	rts
+L_0C1C	lda ZP_FE
+	bmi L_0C09
+	clc
+	tya
+	adc ZP_FE
+	tay
+	rts
+L_0C26	lda ZP_FE
+	bmi L_0C09
+	sta L_0597
+	sta L_0598
+	iny
+	rts
+L_0C32	lda ZP_FE
+	bmi L_0C09
+	lda L_0537
+	bmi L_0C09
+	iny
+	sty L_059E
+	clc
+	tya
+	adc ZP_FE
+	sta L_059F
+	lda L_0537
+	sta L_05A0
+	cpy #$54
+	rts
+L_0C4F	dey
+	bmi L_0C5C
+	lda (ZP_FC),Y
+	cmp #$8F
+	beq L_0C5C
+	cmp #$EF
+	bne L_0C4F
+L_0C5C	iny
+	rts
+L_0C5E	ldx #$05
+L_0C60	lda L_0517,X
+	beq L_0C6A
+	dec L_0517,X
+	bpl L_0CC1
+L_0C6A	lda L_051D,X
+	bne L_0CC1
+	ldy L_0535,X
+	cpy #$40
+	bcs L_0CC1
+	lda L_059B
+	sta ZP_FC
+	lda L_059C
+	sta ZP_FD
+	lda (ZP_FC),Y
+	sta ZP_FE
+	clc
+	tya
+	adc #$40
+	tay
+	lda (ZP_FC),Y
+	sta ZP_FF
+	cmp #$FF
+	bcs L_0CC1
+L_0C8D	ldy L_0511,X
+	lda (ZP_FE),Y
+	and #$C0
+	bne L_0CA2
+	lda (ZP_FE),Y
+	and #$3F
+	sta L_052F,X
+	inc L_0511,X
+	bpl L_0C8D
+L_0CA2	cmp #$40
+	bne L_0CB3
+	lda (ZP_FE),Y
+	and #$3F
+	ldy L_052F,X
+	jsr L_0996
+	jmp L_0CBE
+L_0CB3	cmp #$80
+	bne L_0CC1
+	lda (ZP_FE),Y
+	and #$3F
+	sta L_0517,X
+L_0CBE	inc L_0511,X
+L_0CC1	dex
+	bpl L_0C60
+	ldx L_0596
+	inx
+	txa
+	and #$3F
+	sta L_0596
+L_0CCE	dec L_0598
+	bne L_0CE1
+	lda L_0597
+	sta L_0598
+	lda L_0596
+	bne L_0CE1
+	inc L_0595
+L_0CE1	ldy L_0559
+	lda L_053B
+	and #$07
+	cmp #$05
+	beq L_0CF1
+	cmp #$06
+	bne L_0CF2
+L_0CF1	dey
+L_0CF2	sty L_05A2
+	ldy #$00
+	cmp #$05
+	beq L_0CFF
+	cmp #$06
+	bne L_0D01
+L_0CFF	ldy #$02
+L_0D01	cmp #$07
+	bne L_0D07
+	ldy #$28
+L_0D07	sty L_05A4
+	ldy L_055C
+	lda L_053E
+	and #$07
+	cmp #$05
+	beq L_0D1A
+	cmp #$06
+	bne L_0D1B
+L_0D1A	dey
+L_0D1B	sty L_05A3
+	ldy #$00
+	cmp #$05
+	beq L_0D28
+	cmp #$06
+	bne L_0D2A
+L_0D28	ldy #$02
+L_0D2A	cmp #$07
+	bne L_0D30
+	ldy #$28
+L_0D30	sty L_05A5
+	ldx #$05
+L_0D35	lda L_053B,X
+	and #$E0
+	sta L_0541,X
+	lda L_0565,X
+	sta ZP_FC
+	lda L_0547,X
+	sta ZP_FD
+	lda L_0529,X
+	cmp #$FF
+	beq L_0D85
+	cmp #$0F
+	bne L_0D73
+	lda L_054D,X
+	beq L_0D85
+	dec L_054D,X
+	lda L_054D,X
+	bne L_0D85
+	ldy L_0523,X
+	beq L_0D65
+	dey
+L_0D65	tya
+	sta L_0523,X
+	lda L_0577,X
+	sta L_054D,X
+	dey
+	jmp L_0D85
+L_0D73	lda L_0529,X
+	lsr @
+	tay
+	lda (ZP_FC),Y
+	bcc L_0D80
+	lsr @
+	lsr @
+	lsr @
+	lsr @
+L_0D80	and #$0F
+	sta L_0523,X
+L_0D85	ldy L_057D,X
+	lda L_053B,X
+	and #$07
+	cmp #$01
+	bne L_0DB0
+	dey
+	tya
+	iny
+	cmp L_0559,X
+	php
+	lda #$01
+	plp
+	bne L_0D9F
+	asl @
+	asl @
+L_0D9F	and L_0553,X
+	beq L_0DB0
+	ldy L_0559,X
+	cpy #$FF
+	bne L_0DB0
+	lda #$00
+	sta L_0523,X
+L_0DB0	tya
+	sta L_055F,X
+	lda #$01
+	sta L_05A8
+	lda L_0529,X
+	cmp #$0F
+	beq L_0E0C
+	and #$07
+	tay
+	lda L_05CD,Y
+	sta ZP_FE
+	lda L_0529,X
+	and #$08
+	php
+	txa
+	plp
+	clc
+	beq L_0DD5
+	adc #$06
+L_0DD5	tay
+	lda L_056B,Y
+	and ZP_FE
+	beq L_0E0C
+	lda L_0589,X
+	sta L_055F,X
+	stx L_05A8
+	dex
+	cpx #$02
+	beq L_0DFA
+	cpx #$FF
+	bne L_0E05
+	sta L_05A2
+	lda #$00
+	sta L_05A4
+	jmp L_0E05
+L_0DFA	lda L_058C
+	sta L_05A3
+	lda #$00
+	sta L_05A5
+L_0E05	inx
+	lda L_0583,X
+	sta L_0541,X
+L_0E0C	lda L_0529,X
+	and #$0F
+	cmp #$0F
+	beq L_0E27
+	inc L_0529,X
+	lda L_0529,X
+	and #$0F
+	cmp #$0F
+	bne L_0E27
+	lda L_0577,X
+	sta L_054D,X
+L_0E27	lda L_051D,X
+	bpl L_0E36
+	lda L_0523,X
+	bne L_0E36
+	lda #$40
+	sta L_051D,X
+L_0E36	inc L_0553,X
+	ldy #$00
+	lda L_053B,X
+	lsr @
+	lsr @
+	lsr @
+	lsr @
+	bcc L_0E45
+	dey
+L_0E45	lsr @
+	bcc L_0E49
+	iny
+L_0E49	clc
+	tya
+	adc L_057D,X
+	sta L_057D,X
+	lda L_0559,X
+	cmp #$FF
+	bne L_0E5A
+	ldy #$00
+L_0E5A	clc
+	tya
+	adc L_0559,X
+	sta L_0559,X
+	dex
+	bmi L_0E68
+	jmp L_0D35
+L_0E68	jsr L_0F7B
+	lda L_0541
+	sta L_05A6
+	lda L_0544
+	sta L_05A7
+	lda L_053B
+	and #$07
+	jsr L_0FB5
+L_0E7F	tya
+	pha
+	lda L_05B9,Y
+	php
+	and #$7F
+	tax
+	tya
+	and #$03
+	asl @
+	tay
+	cpx #$03
+	bne L_0E94
+	jmp L_0EC4
+L_0E94	lda L_05AD,X
+	bne L_0EC0
+	lda L_055F,X
+	sta $D200,Y
+	lda L_0523,X
+	ora L_0541,X
+	plp
+	bpl L_0EAA
+	lda #$00
+L_0EAA	sta $D201,Y
+L_0EAD	pla
+	tay
+	dey
+	and #$03
+	beq L_0EB7
+	jmp L_0E7F
+L_0EB7	lda L_05A4
+	sta $D208
+	jmp L_0EE4
+L_0EC0	plp
+	jmp L_0EAD
+L_0EC4	lda L_05AD
+	bne L_0EE0
+	lda L_05A2
+	sta $D200,Y
+	lda L_0523
+	ora L_05A6
+	plp
+	bpl L_0EDA
+	lda #$00
+L_0EDA	sta $D201,Y
+	jmp L_0EAD
+L_0EE0	plp
+	jmp L_0EAD
+L_0EE4	lda L_053E
+	and #$07
+	jsr L_0FB5
+L_0EEC	tya
+	pha
+	lda L_05B9,Y
+	php
+	and #$7F
+	tax
+	tya
+	and #$03
+	asl @
+	tay
+	cpx #$03
+	bne L_0F01
+	jmp L_0F3C
+L_0F01	lda L_05B0,X
+	bne L_0F24
+	lda L_0562,X
+	sta $D210,Y
+	lda L_0526,X
+	ora L_0544,X
+	plp
+	bpl L_0F17
+	lda #$00
+L_0F17	sta $D211,Y
+L_0F1A	pla
+	tay
+	dey
+	and #$03
+	beq L_0F28
+	jmp L_0EEC
+L_0F24	plp
+	jmp L_0F1A
+L_0F28	lda L_97A5
+	sta $D218
+	clc
+L_0F2F	pla
+	sta ZP_FF
+	pla
+	sta ZP_FE
+	pla
+	sta ZP_FD
+	pla
+	sta ZP_FC
+	rts
+L_0F3C	lda L_05B0
+	bne L_0F58
+	lda L_05A3
+	sta $D210,Y
+	lda L_0526
+	ora L_97A7
+	plp
+	bpl L_0F52
+	lda #$00
+L_0F52	sta $D211,Y
+	jmp L_0F1A
+L_0F58	plp
+	jmp L_0F1A
+L_0F5C	jsr L_0AA8
+	bcs L_0F7A
+	lda L_05B8
+	beq L_0F7A
+	lda L_059D
+	sta L_05B7
+	lda #$01
+	sta L_059D
+	jsr L_0AA8
+	lda L_05B7
+	sta L_059D
+L_0F7A	rts
+L_0F7B	lda L_05A9
+	asl @
+	asl @
+	asl @
+	asl @
+	sta L_05AB
+	lda L_05AA
+	asl @
+	asl @
+	asl @
+	asl @
+	sta L_05AC
+	ldx #$02
+L_0F91	stx ZP_C8
+	lda L_05AB
+	ora L_0523,X
+	tax
+	lda L_06E9,X
+	ldx ZP_C8
+	sta L_0523,X
+	lda L_05AC
+	ora L_0526,X
+	tax
+	lda L_06E9,X
+	ldx ZP_C8
+	sta L_0526,X
+	dex
+	bpl L_0F91
+	rts
+L_0FB5	tay
+	lda L_080D,Y
+	tay
+	rts
+
+	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/cms.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/cms.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/dlt.as8 kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/dlt.as8
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/dlt.as8	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/dlt.as8	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,922 @@
+//******************************************************************************************************************************************************
+//	Header
+//******************************************************************************************************************************************************
+
+/**	Delta Music Composer 1.7 Reference Player
+	@author	Marek Konopka
+	@date 03.09.2009
+*/
+
+.local	NRefDlt17Player
+
+//******************************************************************************************************************************************************
+//	Constants
+//******************************************************************************************************************************************************
+
+	PLAYER_BASE_PTR	= $0200
+	PLAYER_ZPG_VARS	= $e0
+
+	DEFAULT_TEMPO	= 6
+
+	MAX_NUM_PATTERNS	= 64
+	MAX_NUM_INSTRUMENTS	= 32
+
+	SONG_LENGTH		= 128
+	PATTERN_SIZE	= 128
+	INSTRUMENT_SIZE	= 64
+	FRQ_TABLE_SIZE	= 64
+	ENVELOPE_SIZE	= 16
+
+	TRACK_CMD_STOP	= $40
+	TRACK_CMD_JUMP	= $41
+	TRACK_CMD_TEMPO	= $42
+	TRACK_CMD_LAST	= TRACK_CMD_TEMPO
+
+	ACC_OFFSET_FILTER_TRANSP		= 0
+	INSTR_OFFSET_AUDCTLS			= 48+0
+	INSTR_OFFSET_VOL_DECAY_DELAY	= 48+1
+	INSTR_OFFSET_FRQ_SLIDE			= 48+2
+	INSTR_OFFSET_TRANSP_DELAY		= 48+3
+	INSTR_OFFSET_TRANSP_TBL			= 48+4
+
+	ACCENT_NONE			= 0
+	ACCENT_FRQ_STORE	= 1
+	ACCENT_FRQ_TRANSP	= 2
+	ACCENT_NOTE_TRANSP	= 3
+
+	TRANSP_TBL_SIZE		= 4	// must be a power of two
+
+	CHANNEL0_FILTER_MASK	= 4
+	CHANNEL1_FILTER_MASK	= 2
+
+	AUDCTL_CHANNEL0_MASK	= %11010101
+	AUDCTL_CHANNEL1_MASK	= %10000011
+	AUDCTL_CHANNEL2_MASK	= %10101001
+	AUDCTL_CHANNEL3_MASK	= %10000001
+
+	OFFSET_PATTERN_PTRS	= $0000
+	OFFSET_INSTR_PTRS	= $0080
+	OFFSET_VARIABLES	= $0100
+	OFFSET_FRQ			= $0200
+	OFFSET_PLAYER_CODE	= $0300
+
+//******************************************************************************************************************************************************
+//	Zero page variable
+//******************************************************************************************************************************************************
+
+	patt0_ptr	= PLAYER_ZPG_VARS+$00	// track #0 pattern pointer
+	patt1_ptr	= PLAYER_ZPG_VARS+$02	// track #1 pattern pointer
+	patt2_ptr	= PLAYER_ZPG_VARS+$04	// track #2 pattern pointer
+	patt3_ptr	= PLAYER_ZPG_VARS+$06	// track #3 pattern pointer
+
+	instr0_ptr	= PLAYER_ZPG_VARS+$08	// track #0 combined volume-distortion pointer
+	instr1_ptr	= PLAYER_ZPG_VARS+$0a	// track #1 combined volume-distortion pointer
+	instr2_ptr	= PLAYER_ZPG_VARS+$0c	// track #2 combined volume-distortion pointer
+	instr3_ptr	= PLAYER_ZPG_VARS+$0e	// track #3 combined volume-distortion pointer
+
+	acc0_ptr	= PLAYER_ZPG_VARS+$10	// track #0 accents ptr
+	acc1_ptr	= PLAYER_ZPG_VARS+$12	// track #1 accents ptr
+	acc2_ptr	= PLAYER_ZPG_VARS+$14	// track #2 accents ptr
+	acc3_ptr	= PLAYER_ZPG_VARS+$16	// track #3 accents ptr
+
+	acc_param0_ptr	= PLAYER_ZPG_VARS+$18	// track #0 accent params ptr
+	acc_param1_ptr	= PLAYER_ZPG_VARS+$1a	// track #1 accent params ptr
+	acc_param2_ptr	= PLAYER_ZPG_VARS+$1c	// track #2 accent params ptr
+	acc_param3_ptr	= PLAYER_ZPG_VARS+$1e	// track #2 accent params ptr
+
+//******************************************************************************************************************************************************
+//	Pointers
+//******************************************************************************************************************************************************
+
+	ModulePtr		= $2000
+	TracksPtr		= ModulePtr+$2000
+	InstrumentsPtr	= ModulePtr+$2400
+	ParametersPtr	= ModulePtr+$2c00
+	BassFrqType		= ParametersPtr+$0000
+
+//******************************************************************************************************************************************************
+//	Hardware
+//******************************************************************************************************************************************************
+
+	POKEY	= $d200
+	AUDCTL	= $d208
+	SKCTL	= $d20f
+
+//******************************************************************************************************************************************************
+//	Variables
+//******************************************************************************************************************************************************
+
+	org	PLAYER_BASE_PTR + OFFSET_VARIABLES
+
+	env_ind:	.ds 4	// envelope indices (ENVELOPE_SIZE-1 ... 0)
+	tr_stat:	.ds 4	// track statuses (0 -> off, !=0 -> on)
+	notes:		.ds 4	// notes = pattern note + track transposition
+	vd_cnt:		.ds 4	// volume decay counters
+	trns_del:	.ds 4	// instrument transposition delays
+	trns_ind:	.ds 4	// instrument transposition indices
+	ptransp:	.ds 4	// pattern transpositions
+	freq_add:	.ds 4	// frequency additions
+	audc:		.ds 4	// audc
+	audf:		.ds 4	// audf
+	audctls:	.ds 4	// audctl
+	vol_stat:	.ds 4	// volume statuses
+
+	tmp_ptr:	.ds 2	// temporary pointer
+	play_stat:	.ds 1	// playing status
+	tempo:		.ds 1	// tempo
+	tempo_cnt:	.ds 1	// tempo counter
+	patt_pos:	.ds 1	// pattern position
+	track_pos:	.ds 1	// track position
+	//tmp_note:	.ds 1	// temporary note
+	tmp_freq:	.ds 1	// temporary frequency
+
+//******************************************************************************************************************************************************
+//	Data
+//******************************************************************************************************************************************************
+
+	//.align	256
+	FrqTbl	= PLAYER_BASE_PTR + OFFSET_FRQ
+
+	org	FrqTbl
+;	ins	'frq_tbl_normal.dat'
+	dta	$ff,$f1,$e4,$d7,$cb,$c0,$b5,$aa,$a1,$98,$8f,$87,$7f,$79,$72,$6b
+	dta	$65,$5f,$5a,$55,$50,$4b,$47,$43,$3f,$3c,$38,$35,$32,$2f,$2c,$2a
+	dta	$27,$25,$23,$21,$1f,$1d,$1c,$1a,$18,$17,$16,$14,$13,$12,$11,$10
+	dta	$0f,$0e,$0d,$0c,$0b,$0a,$09,$08,$07,$06,$05,$04,$ff,$f1,$e4,$d7
+
+;	ins	'frq_tbl_bass_cmc.dat'
+	dta	$f2,$e9,$da,$ce,$bf,$b6,$aa,$a1,$98,$8f,$89,$80,$7a,$71,$6b,$65
+	dta	$5f,$5c,$56,$50,$67,$60,$5a,$55,$51,$4c,$48,$43,$3f,$3d,$39,$34
+	dta	$33,$30,$2d,$2a,$28,$25,$24,$21,$1f,$1e,$1c,$1b,$19,$00,$16,$15
+	dta	$00,$0a,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00,$f2,$e9,$da,$ce
+
+;	ins	'frq_tbl_bass_cmc.dat'
+	dta	$f2,$e9,$da,$ce,$bf,$b6,$aa,$a1,$98,$8f,$89,$80,$7a,$71,$6b,$65
+	dta	$5f,$5c,$56,$50,$67,$60,$5a,$55,$51,$4c,$48,$43,$3f,$3d,$39,$34
+	dta	$33,$30,$2d,$2a,$28,$25,$24,$21,$1f,$1e,$1c,$1b,$19,$00,$16,$15
+	dta	$00,$0a,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00,$f2,$e9,$da,$ce
+
+;	ins	'frq_tbl_bass_mpt.dat'
+	dta	$ff,$f1,$e4,$d8,$ca,$c0,$b5,$ab,$a2,$99,$8e,$87,$7f,$78,$73,$6c
+	dta	$66,$61,$5a,$55,$51,$4b,$48,$43,$3f,$3c,$39,$34,$33,$30,$2d,$2a
+	dta	$28,$25,$24,$21,$1f,$1e,$1c,$1b,$19,$17,$16,$15,$13,$12,$11,$10
+	dta	$0f,$0e,$0d,$0c,$0b,$0a,$09,$08,$07,$06,$05,$04,$03,$02,$01,$ff
+
+	PatternPtrsTbl		= PLAYER_BASE_PTR + OFFSET_PATTERN_PTRS
+	InstrumentPtrsTbl	= PLAYER_BASE_PTR + OFFSET_INSTR_PTRS
+	PlayerCodePtr		= PLAYER_BASE_PTR + OFFSET_PLAYER_CODE
+
+//******************************************************************************************************************************************************
+//	Code
+//******************************************************************************************************************************************************
+
+	org	PlayerCodePtr
+
+//******************************************************************************************************************************************************
+
+	jmp	init
+	jmp	player.entry_point
+	jmp	stop
+
+//******************************************************************************************************************************************************
+
+///	Initialize.
+/**	@param .byte Y	- Initial track position.
+*/
+.proc	init
+	dey
+	sty	track_pos
+
+	lda #(PATTERN_SIZE-2)
+	sta patt_pos
+
+	ldx #DEFAULT_TEMPO
+	stx tempo
+	ldx	#1
+	stx tempo_cnt
+
+	jsr init_patterns_table
+	jsr init_instruments_tbl
+	jsr	init_variables
+	jsr	init_frq_tbl
+
+	lda #1
+	sta play_stat
+
+	lda	#3
+	sta	SKCTL
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	init_patterns_table
+	ldx #<ModulePtr
+	ldy	#>ModulePtr
+	stx tmp_ptr
+	sty tmp_ptr+1
+
+	ldy #0
+loop
+	lda tmp_ptr
+	sta PatternPtrsTbl,y
+	lda tmp_ptr+1
+	sta PatternPtrsTbl+MAX_NUM_PATTERNS,y
+
+	lda tmp_ptr
+	clc
+	adc #PATTERN_SIZE
+	sta tmp_ptr
+	bcc skip
+		inc tmp_ptr+1
+skip
+
+	iny
+	cpy #MAX_NUM_PATTERNS
+	bne loop
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	init_instruments_tbl
+	ldx #<InstrumentsPtr
+	ldy #>InstrumentsPtr
+	stx tmp_ptr
+	sty tmp_ptr+1
+
+	ldy #0
+loop
+	lda tmp_ptr
+	sta InstrumentPtrsTbl,y
+	lda tmp_ptr+1
+	sta InstrumentPtrsTbl+MAX_NUM_INSTRUMENTS,y
+
+	lda tmp_ptr
+	clc
+	adc #INSTRUMENT_SIZE
+	sta tmp_ptr
+	bcc skip
+		inc tmp_ptr+1
+skip
+
+	iny
+	cpy	#MAX_NUM_INSTRUMENTS
+	bne loop
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	init_frq_tbl
+	lda	BassFrqType
+	and	#1
+	lsr	@
+	ror	@
+	ror	@
+	tay
+
+	ldx	#0
+loop
+	lda	FrqTbl+FRQ_TABLE_SIZE*2,y
+	sta	FrqTbl+FRQ_TABLE_SIZE,x
+
+	iny
+	inx
+	cpx	#FRQ_TABLE_SIZE
+	bne	loop
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	init_variables
+	ldy #3
+	lda #0
+loop
+	sta	audctls,y
+	sta	audc,y
+	sta	audf,y
+	sta	vol_stat,y
+
+	dey
+	bpl loop
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	stop
+	lda	#0
+	sta play_stat
+
+	ldy #7
+	lda #0
+loop
+	sta POKEY,y
+	dey
+	bpl loop
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.nowarn	.proc	player
+play_done
+	rts
+
+entry_point
+	lda play_stat
+	beq play_done
+
+	lda audctls+0
+	ora audctls+1
+	ora audctls+2
+	ora audctls+3
+	sta AUDCTL
+
+	ldx	audf+0
+	ldy	audc+0
+	stx	POKEY+0
+	sty POKEY+1
+
+	ldx	audf+1
+	ldy	audc+1
+	stx	POKEY+2
+	sty POKEY+3
+
+	ldx	audf+2
+	ldy	audc+2
+	stx	POKEY+4
+	sty POKEY+5
+
+	ldx	audf+3
+	ldy	audc+3
+	stx	POKEY+6
+	sty POKEY+7
+
+	dec	tempo_cnt
+	bne play_instruments
+		lda tempo
+		sta tempo_cnt
+
+		inc patt_pos
+		inc patt_pos
+		bpl take_notes
+
+		new_track_pos:
+			inc track_pos
+			lda #0
+			sta patt_pos
+
+			jsr	tktrx.entry_point
+
+			lda tr_stat+0
+			ora	tr_stat+1
+			ora	tr_stat+2
+			ora	tr_stat+3
+			bne take_notes
+				jmp stop
+
+	take_notes:
+		lda tr_stat+0
+		beq skip1
+			jsr tkpt1
+
+	skip1:
+		lda tr_stat+1
+		beq skip2
+			jsr tkpt2
+
+	skip2:
+		lda tr_stat+2
+		beq skip3
+			jsr tkpt3
+
+	skip3:
+		lda tr_stat+3
+		beq skip4
+			jsr tkpt4
+
+	skip4:
+
+play_instruments
+	lda tr_stat+0
+	beq skip10
+		lda	vol_stat+0
+		beq	skip10
+		jsr play_instr0
+
+skip10:
+	lda tr_stat+1
+	beq skip11
+		lda	vol_stat+1
+		beq	skip11
+		jsr play_instr1
+
+skip11:
+	lda tr_stat+2
+	beq skip12
+		lda	vol_stat+2
+		beq	skip12
+		jsr play_instr2
+
+skip12:
+	lda tr_stat+3
+	beq skip13
+		lda	vol_stat+3
+		beq	skip13
+		jsr play_instr3
+skip13:
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+.nowarn	.proc	tktrx
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+tr1_non_pattern
+	cpy #(TRACK_CMD_LAST+1)
+	bcc continue
+		lda #0
+		sta tr_stat+0
+		sta	audc+0
+		sta	audctls+0
+		jmp	track2
+
+continue
+	cpy #TRACK_CMD_TEMPO
+	bne non_tempo
+
+cmd_tempo
+	lda TracksPtr+SONG_LENGTH,x
+	sta tempo
+	sta	tempo_cnt
+	inc track_pos
+	jmp	tktrx.entry_point
+
+non_tempo:
+	cpy #TRACK_CMD_JUMP
+	bne cmd_stop
+
+cmd_jmp
+	lda TracksPtr+SONG_LENGTH,x
+	sta track_pos
+	jmp	tktrx.entry_point
+
+cmd_stop
+	//	no need to continue processing
+	pla
+	pla
+	jmp	stop
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+entry_point
+	ldx track_pos
+track1
+	ldy TracksPtr,x
+	cpy #MAX_NUM_PATTERNS
+	bcs tr1_non_pattern
+
+	lda TracksPtr+SONG_LENGTH,x
+	sta ptransp+0
+	lda PatternPtrsTbl,y
+	sta patt0_ptr
+	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
+	sta patt0_ptr+1
+	lda #1
+	sta tr_stat+0
+
+track2
+	ldy TracksPtr+SONG_LENGTH*2,x
+	cpy #MAX_NUM_PATTERNS
+	bcs non_pattern_2
+
+	lda TracksPtr+SONG_LENGTH*3,x
+	sta ptransp+1
+	lda PatternPtrsTbl,y
+	sta patt1_ptr
+	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
+	sta patt1_ptr+1
+	lda #1
+	sta tr_stat+1
+
+track3
+	ldy TracksPtr+SONG_LENGTH*4,x
+	cpy #MAX_NUM_PATTERNS
+	bcs non_pattern_3
+
+	lda TracksPtr+SONG_LENGTH*5,x
+	sta ptransp+2
+	lda PatternPtrsTbl,y
+	sta patt2_ptr
+	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
+	sta patt2_ptr+1
+	lda #1
+	sta tr_stat+2
+
+track4
+	ldy TracksPtr+SONG_LENGTH*6,x
+	cpy #MAX_NUM_PATTERNS
+	bcs non_pattern_4
+
+	lda TracksPtr+SONG_LENGTH*7,x
+	sta ptransp+3
+	lda PatternPtrsTbl,y
+	sta patt3_ptr
+	lda PatternPtrsTbl+MAX_NUM_PATTERNS,y
+	sta patt3_ptr+1
+	lda #1
+	sta tr_stat+3
+	rts
+
+non_pattern_2
+	lda	#0
+	sta	tr_stat+1
+	sta	audc+1
+	sta	audctls+1
+	beq	track3
+
+non_pattern_3
+	lda	#0
+	sta tr_stat+2
+	sta	audc+2
+	sta	audctls+2
+	beq track4
+
+non_pattern_4
+	lda	#0
+	sta tr_stat+3
+	sta	audc+3
+	sta	audctls+3
+	rts
+.endp
+
+//******************************************************************************************************************************************************
+
+///	Take pattern position.
+/**	@param %%1 .byte channel_num	- Channel number.
+	@param %%2 .word patt_ptr	- Pattern pointer.
+	@param %%3 .word instr_ptr	- Instrument pointer.
+	@param %%4 .word acc_ptr	- Accents pointer.
+	@param %%5 .word acc_param_ptr	- Accent params pointer.
+	@param %%6 .byte audctl_channel_mask	- AUDCTL mask.
+*/
+.macro	tkpt_macro
+	ldy patt_pos
+	lda (%%2),y
+	bmi note
+		iny
+		lda (%%2),y
+		bmi end_of_pattern
+			//	empty
+			rts
+		end_of_pattern:
+			pla
+			pla
+			jmp	player.new_track_pos
+
+note
+	//	note = (patt_note + ptransp) & 0x7f;
+	clc
+	adc	ptransp+%%1
+	and	#127
+	sta notes+%%1
+
+	//	env_ind = vol_stat = (ENVELOPE_SIZE-1);
+	lda #(ENVELOPE_SIZE-1)
+	sta env_ind+%%1
+	sta	vol_stat+%%1
+
+	iny
+	lda (%%2),y
+	tax
+
+	lda InstrumentPtrsTbl+MAX_NUM_INSTRUMENTS,x
+	sta %%3+1
+	sta %%4+1
+	sta %%5+1
+
+	lda InstrumentPtrsTbl,x
+	sta %%3
+	//clc
+	eor #$10
+	sta %%4
+	eor #$30
+	sta %%5
+
+	//	vd_cnt = instr_ptr[INSTR_OFFSET_VOL_DECAY_DELAY];
+	ldy #INSTR_OFFSET_VOL_DECAY_DELAY
+	lda (%%3),y
+	sta vd_cnt+%%1
+
+	//	trns_del = instr_ptr[INSTR_OFFSET_VOL_DECAY_DELAY] & 0x7f;
+	ldy #INSTR_OFFSET_TRANSP_DELAY
+	lda (%%3),y
+	and #127
+	sta trns_del+%%1
+
+	//	trns_ind = freq_add = 0;
+	lda #0
+	sta trns_ind+%%1
+	sta freq_add+%%1
+
+	//	audctls = instr_ptr[INSTR_OFFSET_AUDCTLS] & audctl_channel_mask
+	ldy	#INSTR_OFFSET_AUDCTLS
+	lda (%%3),y
+	and %%6
+	sta audctls+%%1
+	rts
+.endm
+
+//******************************************************************************************************************************************************
+
+.proc	tkpt1
+	tkpt_macro	0, patt0_ptr, instr0_ptr, acc0_ptr, acc_param0_ptr, #AUDCTL_CHANNEL0_MASK
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	tkpt2
+	tkpt_macro	1, patt1_ptr, instr1_ptr, acc1_ptr, acc_param1_ptr, #AUDCTL_CHANNEL1_MASK
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	tkpt3
+	tkpt_macro	2, patt2_ptr, instr2_ptr, acc2_ptr, acc_param2_ptr, #AUDCTL_CHANNEL2_MASK
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	tkpt4
+	tkpt_macro	3, patt3_ptr, instr3_ptr, acc3_ptr, acc_param3_ptr, #AUDCTL_CHANNEL3_MASK
+.endp
+
+//******************************************************************************************************************************************************
+
+///	Play instrument.
+/**	@param %%1 .byte channel_num	- Channel number.
+	@param %%2 .word instr_ptr	- Instrument pointer.
+	@param %%3 .word acc_ptr	- Accents pointer.
+	@param %%4 .word acc_param_ptr	- Accent params pointer.
+*/
+.macro	play_instr
+	ldy env_ind+%%1
+	bmi outside_envelope
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+	envelope:
+		//	audc = envelope[env_ind]
+		lda (%%2),y
+		sta audc+%%1
+
+		//	if	(accents[env_ind] == 0)
+		lda	(%%3),y
+		bne	acc
+			jsr	determine_table_transpositions
+			dec	env_ind+%%1
+			jmp	update_variables
+	acc:
+		cmp	#ACCENT_FRQ_STORE
+		beq	acc_1
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+		determine_accent_transpositions:
+			//	if	(accents[env_ind] == 3)
+			//lda	(acc_ptr),y
+			cmp	#ACCENT_NOTE_TRANSP
+			bne	acc_2
+
+			acc_3:
+				//	tmp_note = notes + acc_params[env_ind];
+				lda	notes+%%1
+				clc
+				adc	(%%4),y
+				//sta	tmp_note
+				tax
+
+				//	tmp_freq = freq_add;
+				lda	freq_add+%%1
+				sta	tmp_freq
+				//rts
+				jmp	determine_acc_audf
+
+		acc_2:
+			//	tmp_freq = freq_add + acc_params[env_ind];
+			lda	freq_add+%%1
+			clc
+			adc	(%%4),y
+			sta	tmp_freq
+
+			//	tmp_note = notes;
+			//lda	notes+0
+			//sta	tmp_note
+			ldx	notes+%%1
+			//rts
+			//jmp	determine_audf
+
+		determine_acc_audf:
+			jsr	determine_audf
+			dec	env_ind+%%1
+			rts
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+	acc_1:
+			//	audf = acc_params[env_ind];
+			lda	(%%4),y
+			sta	audf+%%1
+			dec	env_ind+%%1
+			rts
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+outside_envelope
+	jsr	determine_table_transpositions
+	//jsr	volume_decay
+	//jmp	update_variables
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+volume_decay
+	ldy #INSTR_OFFSET_VOL_DECAY_DELAY
+	lda (%%2),y
+	beq exit_volume_decay
+		dec vd_cnt+%%1
+		beq	volume_test
+		//rts
+		jmp	update_variables
+	volume_test:
+		lda audc+%%1
+		and #15
+		beq disable_instr
+			dec	audc+%%1
+			lda	(%%2),y
+			sta vd_cnt+%%1
+			//rts
+			jmp	update_variables
+	disable_instr:
+			sta	vol_stat+%%1
+			rts
+exit_volume_decay
+	//rts
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+update_variables
+
+frequency_slide
+	lda freq_add+%%1
+	clc
+	ldy #INSTR_OFFSET_FRQ_SLIDE
+	adc	(%%2),y
+	sta freq_add+%%1
+
+table_transposition
+	dec trns_del+%%1
+	bne done_table_transposition
+		inc trns_ind+%%1
+		ldy #INSTR_OFFSET_TRANSP_DELAY
+		lda (%%2),y
+		and #127
+		sta trns_del+%%1
+done_table_transposition
+	rts
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+determine_table_transpositions
+	//	no acc
+
+	//	uint8_t	transp = instr[(trns_ind & 3) + 4 + 48];
+	lda	trns_ind+%%1
+	and	#(TRANSP_TBL_SIZE-1)
+	clc
+	adc	#INSTR_OFFSET_TRANSP_TBL
+	tay
+	lda	(%%2),y
+	tax
+
+	//	if	(instr[INSTR_OFFSET_TRANSP_DELAY] > 0) // transp_delay
+	ldy	#INSTR_OFFSET_TRANSP_DELAY
+	lda	(%%2),y
+	bmi	frequency_transposition
+
+	note_transposition:
+		//	tmp_note = transp + notes
+		txa
+		//clc
+		adc	notes+%%1
+		//sta	tmp_note
+		tax
+
+		//	tmp_freq = freq_add;
+		lda	freq_add+%%1
+		sta	tmp_freq
+		//rts
+		jmp	determine_audf
+
+frequency_transposition
+	//	tmp_freq = transp + freq_add;
+	txa
+	//clc
+	adc	freq_add+%%1
+	sta	tmp_freq
+
+	//	tmp_note = notes;
+	//lda	notes+0
+	//sta	tmp_note
+	ldx	notes+%%1
+	//rts
+	//jmp	determine_audf
+
+//------------------------------------------------------------------------------------------------------------------------------------------------------
+
+determine_audf
+	//	acc != 1
+
+	//	audf = FrqTbl[tmp_note] + tmp_freq;
+	//ldx	tmp_note
+	lda	FrqTbl,x
+	clc
+	adc	tmp_freq
+	sta	audf+%%1
+
+	.if	(%%1 == 2 || %%1 == 3)
+		rts
+	.else
+		//	if	((audctls & filter_mask) == 0)	//	filter test
+		lda	audctls+%%1
+		.if	(%%1 == 0)
+			and	#CHANNEL0_FILTER_MASK
+		.else
+			and	#CHANNEL1_FILTER_MASK
+		.endif
+		bne	filter
+			rts
+
+	filter:
+		//	if	(accents[env_ind] == 0)
+		ldy	env_ind+%%1
+		lda	(%%3),y
+		bne	filter_with_no_transposition
+
+		filter_with_note_transposition:
+			//	audf+2 = FrqTbl[tmp_note + acc_params[0]] + tmp_freq + 0xff;
+			//lda	tmp_note
+			txa
+			clc
+			ldy	#ACC_OFFSET_FILTER_TRANSP
+			adc	(%%4),y
+			tax
+			lda	FrqTbl,x
+			clc
+			adc	tmp_freq
+			clc
+			adc	#$ff
+			sta	audf+%%1+2
+			rts
+
+	filter_with_no_transposition:
+		//	audf+2 = audf + 0xff;
+		lda	audf+%%1
+		clc
+		adc	#$ff
+		sta	audf+%%1+2
+		rts
+	.endif
+.endm
+
+//******************************************************************************************************************************************************
+
+.proc	play_instr0
+	play_instr	0, instr0_ptr, acc0_ptr, acc_param0_ptr
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	play_instr1
+	play_instr	1, instr1_ptr, acc1_ptr, acc_param1_ptr
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	play_instr2
+	play_instr	2, instr2_ptr, acc2_ptr, acc_param2_ptr
+.endp
+
+//******************************************************************************************************************************************************
+
+.proc	play_instr3
+	play_instr	3, instr3_ptr, acc3_ptr, acc_param3_ptr
+.endp
+
+//******************************************************************************************************************************************************
+
+.endl // NRefDltPlayer
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/dlt.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/dlt.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/fc.as8 kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/fc.as8
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/fc.as8	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/fc.as8	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,703 @@
+; Deassembled with da65 by Mono / Tristesse
+
+  opt ?+ o+ h+ c-
+
+;irqens = $10
+audf1 = $d200
+;audc1 = $d201
+audf2 = $d202
+;audc2 = $d203
+;audctl = $d208
+;irqen = $d20e
+;irqst = $d20e
+skctl = $d20f
+  
+audf12 = $d210
+audc12 = $d211
+audf22 = $d212
+audc22 = $d213
+audf32 = $d214
+audc32 = $d215
+audf42 = $d216
+audc42 = $d217
+audctl2 = $d218
+stimer2 = $d219
+irqen2 = $d21e
+skctl2 = $d21f
+
+; FC player zpg
+; = $1c..$1f
+track1ad = $e0
+track2ad = $e2
+track3ad = $e4
+trackad = track1ad
+track1pos = $e6
+track2pos = $e8
+track3pos = $ea
+trackpos = track1pos
+pat1pos = $e7
+pat2pos = $e9
+pat3pos = $eb
+patpos = pat1pos
+note1dur = $ec
+note2dur = $ee
+note3dur = $f0
+notedur = note1dur
+pat1delay = $ed
+pat2delay = $ef
+pat3delay = $f1
+patdelay = pat1delay
+patad = $f2
+songno = $f4
+
+
+
+dataad = $fc
+instrad = $fe
+
+  org $400
+  jmp initplay
+;  jmp dosound
+  
+dosound:
+  jsr setpokey
+  jmp fc_play
+  
+; Initialize playing of FC module.
+initplay:
+  ldx #<$a00
+  ldy #>$a00
+;doinit:
+  jsr fc_init
+;  jmp setpokey
+
+; Setting POKEY registers due to panning settings.
+setpokey:
+  ldx #8
+?loop:
+  lda L0710_audf1s,x
+  sta audf1,x
+  sta audf12,x
+  dex
+  bpl ?loop
+  rts
+
+findsongbegin:
+  sta songno
+  
+  ldx #0
+?find:
+  stx track1pos
+  stx track2pos
+  stx track3pos
+  lda #0
+  sta pat1pos
+  sta pat2pos
+  sta pat3pos
+  sta note1dur
+  sta note2dur
+  sta note3dur
+  sta pat1delay
+  sta pat2delay
+  sta pat3delay
+  txa
+  ldy #2
+  ldx #4
+?calc:
+  jsr ?calcsongad
+  dey
+  dex
+  dex
+  bpl ?calc
+?loop:
+  ldx #4
+?chk:
+  jsr ?chksongend
+  dex
+  dex
+  bpl ?chk
+  
+  lda #$ff
+  cmp track1pos
+  beq ?end
+  cmp track2pos
+  beq ?end
+  cmp track3pos
+  beq ?end
+  
+  lda #$fe
+  ldy #0
+  cmp (track1ad),y
+  beq ?end
+  cmp (track2ad),y
+  beq ?end
+  cmp (track3ad),y
+  beq ?end
+  lda (track1ad),y
+  and (track2ad),y
+  and (track3ad),y
+  cmp #$ff
+  bne ?loop
+
+?end:
+  ldx #4
+?corr:
+  jsr ?corrpos
+  dex
+  dex
+  bpl ?corr
+  ldx track1pos
+  cpx track2pos
+  scs
+  ldx track2pos
+  cpx track3pos
+  scs
+  ldx track3pos
+  inx
+  
+  dec songno
+  bne ?find
+  txa
+  rts
+  
+?corrpos:
+  lda patpos,x
+  seq
+  inc trackpos,x
+  rts
+  
+?chksongend:
+  lda (trackad,x)
+  cmp #$fe
+  bcs ?ret
+  lda trackpos,x
+  cmp #$ff
+  beq ?ret
+  
+  lda patdelay,x
+  bne ?decdelay
+  
+  lda (trackad,x)
+  cmp #$40
+  bcc ?pattern
+  sne
+  jsr ?incpos	;ommit AUDCTL
+  jsr ?incpos
+  jmp ?chksongend
+
+?decdelay: 
+  dec patdelay,x
+?ret:
+  rts
+  
+?incpos:
+  inc trackad,x
+  sne
+  inc trackad+1,x
+  ldy trackpos,x
+  iny
+  seq
+  inc trackpos,x
+  rts
+
+?pattern:
+  tay
+  lda L0722_lpatternad,y
+  sta patad
+  lda L0782_hpatternad,y
+  sta patad+1
+?next:
+  ldy patpos,x
+  inc patpos,x
+  lda (patad),y
+  cmp #$40
+  bcc ?note
+  cmp #$60
+  bcc ?duration
+  cmp #$ff
+  bcc ?next
+  
+  lda #0
+  sta patdelay,x
+  sta notedur,x
+  sta patpos,x
+  jsr ?incpos
+  jmp ?chksongend
+
+?note:
+  lda notedur,x
+  sta patdelay,x
+  rts
+  
+?duration:
+  and #$1f
+  sta notedur,x
+  jmp ?next
+  
+?calcsongad:
+  pha
+  clc
+  adc L0802_ltrackad,y
+  sta trackad,x
+  lda #0
+  adc L0805_htrackad,y
+  sta trackad+1,x
+  pla
+  rts
+
+; Initialize of FC player
+fc_init:
+  stx dataad
+  sty dataad+1
+  pha
+
+  ;calculate note durations table
+  ldy #2
+  lda (dataad),y          ;TODO: change to primitive tempocntr
+  ldx #0
+?fctempoloop:
+  sta L07E2_delaytab,x
+  clc
+  adc (dataad),y
+  inx
+  cpx #$20
+  bcc ?fctempoloop
+  
+  ;update track addresses
+  lda dataad
+  ldx dataad+1
+  clc
+  adc #3
+  scc
+  inx
+  sta L0802_ltrackad
+  stx L0805_htrackad
+  inx
+  sta L0802_ltrackad+1
+  stx L0805_htrackad+1
+  inx
+  sta L0802_ltrackad+2
+  stx L0805_htrackad+2
+  
+  ;update instruments table address
+  inx
+  sta instrad
+  stx instrad+1
+  
+  ;update patterns address
+  clc
+  adc #$20*4
+  scc
+  inx
+  sta dataad
+  stx dataad+1
+  
+  ldx #0
+  ldy #0
+?fcpatternsloop:
+  lda dataad
+  sta L0722_lpatternad,y
+  lda dataad+1
+  sta L0782_hpatternad,y
+?fcpatternendloop:
+  lda (dataad,x)
+  inc dataad
+  sne
+  inc dataad+1
+  cmp #$ff
+  bne ?fcpatternendloop
+  iny
+  cpy #$40
+  bcc ?fcpatternsloop
+  
+  ;update instruments envelope address
+  ldx #0
+?fcinstrenvelopesloop:
+  lda dataad
+  sta L0762_linstrenvad,x
+  lda dataad+1
+  sta L07C2_hinstrenvad,x
+  ldy #0
+?fcinstrenvendloop:
+  lda (dataad),y
+  iny
+  cmp #$ff
+  bne ?fcinstrenvendloop
+  tya
+  clc
+  adc dataad
+  sta dataad
+  scc
+  inc dataad+1
+  inx
+  cpx #$20
+  bcc ?fcinstrenvelopesloop
+  
+  pla
+
+?fcinitmus:
+  seq
+  jsr findsongbegin
+  sta L0400_beginmusic
+  
+?fcreset:
+  lda #$40
+  sta L070E_playerstate
+;  jmp fc_player
+
+; Playing FC
+fc_play:
+  ;jmp fc_player
+  
+fc_player:
+;        jsr     L0410
+;        ldx     #$08
+;L0406:  lda     L0710_audf1s,x
+;        sta     audf1,x
+;        dex
+;        bpl     L0406
+;        rts
+        
+L0410:  bit     L070E_playerstate
+        bmi     L043C
+        bvc     L044C
+        lda     #$00
+        ldx     #$0B
+L041B:  sta     L06E1_patternpos,x
+        dex
+        bpl     L041B
+        sta     L070E_playerstate
+        ldx     #$02
+L0426:  lda     #$08
+        sta     L070B_transp,x
+        lda     L0400_beginmusic
+        sta     L06DE_trackpos,x
+        dex
+        bpl     L0426
+        lda     #$50
+        sta     L0718_audctls
+        jmp     L044C
+        
+; Music restart
+L043C:  lda     #$00
+        ldx     #$07
+L0440:  sta     L0710_audf1s,x
+        dex
+        bpl     L0440
+        lda     #$80
+        sta     L070E_playerstate
+        rts
+        
+L044C:  inc     L070F_evenframe
+        ldx     #$02
+L0451:  stx     $1E   ;# number
+        inx
+        txa
+        asl     @
+        tay
+        sty     $1F   ;# offset (++<<)
+        dex
+        lda     L0802_ltrackad,x
+        sta     $1C
+        lda     L0805_htrackad,x
+        sta     $1D
+        lda     L06E4_delaycntr,x
+        beq     L046C
+        jmp     L0554
+L046C:  ldy     L06DE_trackpos,x
+        lda     ($1C),y
+        cmp     #$40
+        beq     L0483
+        cmp     #$FF
+        beq     L0491
+        cmp     #$FE
+        bne     L04AA
+        sta     L070E_playerstate
+        jmp     L062F
+        
+L0483:  iny
+        lda     ($1C),y
+        sta     L0718_audctls
+        iny
+        tya
+        sta     L06DE_trackpos,x
+        jmp     L046C
+        
+L0491:  lda     L0400_beginmusic
+        sta     L06DE_trackpos,x
+        lda     #$50
+        sta     L0718_audctls
+        lda     #$00
+        sta     L06E4_delaycntr,x
+        sta     L06E7_delay,x
+        sta     L06E1_patternpos,x
+        jmp     L046C
+        
+L04AA:  pha
+        and     #$80
+        beq     L04BA
+        inc     L06DE_trackpos,x
+        pla
+        and     #$0F
+        sta     L070B_transp,x
+        bpl     L046C
+        
+L04BA:  pla
+        tay
+        lda     L0722_lpatternad,y
+        sta     $1C
+        lda     L0782_hpatternad,y
+        sta     $1D
+        lda     L06E7_delay,x
+        sta     L06E4_delaycntr,x
+        lda     #$00
+        sta     L0702_slidedir,x
+        
+L04D1:  ldy     L06E1_patternpos,x
+        lda     ($1C),y
+        bmi     L04DF
+        asl     @
+        bmi     L0500
+        lsr     @
+        jmp     L0515
+        
+L04DF:  asl     @
+        asl     @
+        tay
+        
+        ;modified by mono for play .FC file directly
+        lda (instrad),y
+        sta L06ED_instrenvno,x
+        iny
+        lda (instrad),y
+        sta L06F3_distort,x
+        iny
+        lda (instrad),y
+        sta L06F6_vibrato,x
+        iny
+        lda (instrad),y
+        sta L06F9_effect,x
+        ;lda     L0808_instrdef,y
+        ;sta     L06ED_instrenvno,x
+        ;lda     L0808_instrdef+1,y
+        ;sta     L06F3_distort,x
+        ;lda     L0808_instrdef+2,y
+        ;sta     L06F6_vibrato,x
+        ;lda     L0808_instrdef+3,y
+        ;sta     L06F9_effect,x
+        inc     L06E1_patternpos,x
+        jmp     L04D1
+        
+L0500:  lsr     @
+        and     #$1F
+        tax
+        lda     L07E2_delaytab,x
+        ldx     $1E
+        sta     L06E4_delaycntr,x
+        sta     L06E7_delay,x
+        inc     L06E1_patternpos,x
+        jmp     L04D1
+        
+L0515:  sta     L06FF_note,x
+        clc
+        adc     L070B_transp,x
+        tay
+        cpx     #$00
+        bne     L0530
+        lda     L0656_lfreqtab,y
+        sta     L0710_audf1s
+        lda     L0696_hfreqtab,y
+        sta     L0712_audf2s
+        jmp     L053B
+L0530:  lda     L0628_freqtab,y
+        sta     L06EA_freq,x
+        ldy     $1F
+        sta     L0710_audf1s,y
+L053B:  lda     #$00
+        sta     L06F0_instrenvpos,x
+        inc     L06E1_patternpos,x
+	
+        ldy     L06E1_patternpos,x
+        lda     ($1C),y
+        cmp     #$FF
+        bne     L0554
+        lda     #$00
+        sta     L06E1_patternpos,x
+        inc     L06DE_trackpos,x
+        
+L0554:  lda     L06ED_instrenvno,x
+        tay
+        lda     L0762_linstrenvad,y
+        sta     L056A
+        lda     L07C2_hinstrenvad,y
+        sta     L056B
+        ldx     $1E
+        ldy     L06F0_instrenvpos,x
+L056A           = * + 1
+L056B           = * + 2
+        lda     $FFFF,y ;get envelope
+        cmp     #$FF
+        beq     L0597
+        bpl     L0582
+        ldy     $1F
+        sta     L0711_audc1s,y
+        lda     #$00
+        sta     L0710_audf1s,y
+        inc     L06F0_instrenvpos,x
+        jmp     L05F8
+        
+L0582:  ldy     $1F
+        inc     L06F0_instrenvpos,x
+        ora     L06F3_distort,x
+        sta     L0711_audc1s,y
+        cpx     #$00
+        beq     L0597
+        lda     L06EA_freq,x
+        sta     L0710_audf1s,y
+        
+L0597:  lda     L06F6_vibrato,x
+        beq     L05BF
+        lda     L070F_evenframe
+        and     #$01
+        bne     L05A8
+        lda     L06F6_vibrato,x
+        bne     L05AA
+L05A8:  lda     #$00
+L05AA:  sta     L05B2
+        clc
+        lda     L06FF_note,x
+L05B2           = * + 1
+        adc     #$02
+        adc     L070B_transp,x
+        tay
+        lda     L0628_freqtab,y
+        ldy     $1F
+        sta     L0710_audf1s,y
+        
+L05BF:  lda     L06F9_effect,x
+        beq     L05F8
+        bmi     L05E6
+L05C6:  ldy     L06FC_finevibrpos,x
+        inc     L06FC_finevibrpos,x
+        lda     L0719_finevibrenv,y
+        cmp     #$1F
+        bne     L05DA
+        lda     #$00
+        sta     L06FC_finevibrpos,x
+        beq     L05C6
+L05DA:  clc
+        adc     L06EA_freq,x
+        ldy     $1F
+        sta     L0710_audf1s,y
+        jmp     L05F8
+L05E6:  lda     L06EA_freq,x
+        cmp     #$FF
+        beq     L05F8
+        inc     L06EA_freq,x
+        inc     L06EA_freq,x
+        ldy     $1F
+        sta     L0710_audf1s,y
+        
+L05F8:  lda     L0702_slidedir,x
+        beq     L0626
+        lda     L0705_slidedelay,x
+        beq     L0608
+        dec     L0705_slidedelay,x
+        jmp     L0626
+L0608:  lda     L0702_slidedir,x
+        bpl     L0617
+        clc
+        lda     L06EA_freq,x
+        adc     L0708_slidestep,x
+        jmp     L061E
+L0617:  sec
+        lda     L06EA_freq,x
+        sbc     L0708_slidestep,x
+L061E:  sta     L06EA_freq,x
+        ldy     $1F
+        sta     L0710_audf1s,y
+        
+L0626:
+L0628_freqtab           = * + 2
+        dec     L06E4_delaycntr,x
+        dex
+        bmi     L062F
+        jmp     L0451
+L062F:  rts
+
+;Freq tables (1ch)     ;adres tablicy jest cofniety o 8, bo jest transpozycja 8 by default!!!!!!!!!
+        dta   $FF,$F1,$E4,$D7,$CB,$C0,$B5,$AA
+        dta   $A1,$98,$8F,$87,$7F,$78,$72,$6B
+        dta   $65,$5F,$5A,$55,$50,$4B,$47,$43
+        dta   $3F,$3C,$38,$35,$32,$2F,$2C,$2A
+        dta   $27,$25,$23,$21,$1F,$1D
+L0656_lfreqtab:  dta   $1C,$1A,$17,$16,$13,$0F,$07,$00
+;Lo freq table
+        dta   $38,$8C,$00,$6A,$E8,$6A,$EF,$80
+        dta   $08,$AE,$46,$E6,$95,$41,$F6,$B0
+        dta   $6E,$30,$F6,$BB,$84,$52,$22,$F4
+        dta   $C8,$A0,$7A,$55,$34,$14,$F5,$D8
+        dta   $BD,$A4,$8D,$77,$60,$4E,$38,$27
+        dta   $15,$06,$F7,$E8,$DB,$CF,$C3,$B8
+        dta   $AC,$A2,$9A,$90,$88,$7F,$78,$70
+L0696_hfreqtab:  dta   $6A,$64,$5E,$57,$52,$32,$0A,$00
+;Hi freq table
+        dta   $0B,$0A,$0A,$09,$08,$08,$07,$07
+        dta   $07,$06,$06,$05,$05,$05,$04,$04
+        dta   $04,$04,$03,$03,$03,$03,$03,$02
+        dta   $02,$02,$02,$02,$02,$02,$01,$01
+        dta   $01,$01,$01,$01,$01,$01,$01,$01
+        dta   $01,$01,$00,$00,$00,$00,$00,$00
+        dta   $00,$00,$00,$00,$00,$00,$00,$00
+        dta   $00,$00,$00,$00,$00,$00,$00,$00
+        
+L06DE_trackpos:  dta   $00,$00,$00
+L06E1_patternpos:  dta   $00,$00,$00
+L06E4_delaycntr:  dta   $00,$00,$00
+L06E7_delay:  dta   $00,$00,$00
+L06EA_freq:  dta   $00,$00,$00
+L06ED_instrenvno:  dta   $00,$00,$00
+L06F0_instrenvpos:  dta   $00,$00,$00
+L06F3_distort:  dta   $00,$00,$00
+L06F6_vibrato:  dta   $00,$00,$00
+L06F9_effect:  dta   $00,$00,$00
+L06FC_finevibrpos:  dta   $00,$00,$00
+L06FF_note:  dta   $00,$00,$00
+L0702_slidedir:  dta   $00,$00,$00
+L0705_slidedelay:  dta   $00,$00,$00
+L0708_slidestep:  dta   $00,$00,$00
+L070B_transp:  dta   $00,$00,$00
+L070E_playerstate:  dta   $00
+L070F_evenframe:  dta   $00
+; POKEY shadow registers
+L0710_audf1s:  dta   $00
+L0711_audc1s:  dta   $00
+L0712_audf2s:  dta   $00,$00,$00,$00,$00,$00
+L0718_audctls:  dta   $50
+
+L0719_finevibrenv:  dta   $00,$00,$01,$01,$00,$00,$FF,$FF,$1F
+
+L0400_beginmusic:  .ds 1
+
+; part of compiled music adapted to universal player
+
+;Lo patterns addr
+L0722_lpatternad:  .ds 64
+;Lo instr addr
+L0762_linstrenvad:  .ds 32
+;Hi patterns addr
+L0782_hpatternad:  .ds 64
+;Hi instr addr
+L07C2_hinstrenvad:  .ds 32
+;Note duration (calculated based on tempo)
+L07E2_delaytab:  .ds 32
+        
+;Lo track addr
+L0802_ltrackad:  .ds 3
+;Hi track addr
+L0805_htrackad:  .ds 3
+
+  ert * >= 0xa00
+
+  end
+
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/fc.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/fc.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/fp3depk.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/fp3depk.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/fp3depk.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/fp3depk.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,64 @@
+outerFlags	equ	$fc
+innerFlags	equ	$fd
+outPtr	equ	$fe
+
+	org	$8000
+getByte
+	lda	$aaaa
+	inw	getByte+1
+	rts
+exit
+	jmp	$aaaa
+copyTwoOrThree
+	sta	outPtr
+	txa	; lda #1
+	rol	@
+copyMany
+	tax
+	beq	exit
+copy
+	lda	(outPtr),y
+putByte
+	sta	$8080,y
+	iny
+	bne	samePage
+	tya	; lda #0
+	sec
+	adc	outPtr+1
+setPage
+	sta	outPtr+1
+	sta	putByte+2
+samePage
+	dex
+	bne	copy
+
+	asl	innerFlags
+	bne	gotInnerFlags
+	asl	outerFlags
+	bne	gotOuterFlags
+
+start
+	sec
+	jsr	getByte
+	rol	@
+	sta	outerFlags
+gotOuterFlags
+	lda	#1
+	bcc	setInnerFlags
+	jsr	getByte
+	rol	@
+setInnerFlags
+	sta	innerFlags
+gotInnerFlags
+	jsr	getByte
+	ldx	#1
+	bcc	putByte
+	lsr	@
+	bne	copyTwoOrThree
+	jsr	getByte
+	bcs	copyMany
+	tay
+	jsr	getByte
+	bcc	setPage	; jmp
+
+	end
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/mpt.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/mpt.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/mpt.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/mpt.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,904 @@
+*----------------*
+* Player MPT 2.4 *
+* ver.spackowana *
+*----------------*
+
+ org $0500
+
+*--- strona 0
+
+addr   equ $ec ,$ed
+word   equ $ee ,$ef
+audzer equ $f0 ,$f1 ,$f2 ,$f3
+licslp equ $f4 ,$f5 ,$f6 ,$f7
+lensmp equ $f8
+lsbmsb equ $f9
+adrs1  equ $fa ,$fb
+adrs2  equ $fc ,$fd
+adrsmp equ $fe ,$ff
+
+*--- program
+
+ jmp init
+
+play lda czygrc
+ bne *+3
+ rts
+ lda #0
+ sta oraaud
+ inc licz
+ lda pozptr
+ cmp maxptr
+ bcc r1
+ dec zegar
+ beq p1
+ jmp r5
+p1 ldx #0
+ stx pozptr
+p2 lda #0
+ sta ptrwsk,x
+ sta licspc,x
+ lda adrtrl,x
+ sta addr
+ lda adrtrh,x
+ sta addr+1
+ ldy pozsng
+p3 lda (addr),y
+ iny
+ cmp #$ff
+ beq p5
+ cmp #$fe
+ bne p6
+p4 jmp inic2
+p5 lda (addr),y
+ bmi p4
+ asl @
+ tay
+ sty pozsng
+ jmp p3
+p6 sta numptr,x
+ lda (addr),y
+ sta poddzw,x
+p7 inx
+ cpx #4
+ bne p2
+ iny
+ sty pozsng
+ jmp r5
+r1 dec zegar
+ bpl r5
+ lda tempo
+ sta zegar
+ ldx #3
+r2 dec licspc,x
+ bpl r4
+ lda numptr,x
+ asl @
+ tay
+aptrlz lda $ffff,y
+ sta addr
+ iny
+aptrhz lda $ffff,y
+ sta addr+1
+ ora addr
+ beq r4
+ lda ptrwsk,x
+ sta licptr
+ jsr newdzw
+ ldy licptr
+ iny
+ tya
+ sta ptrwsk,x
+ lda ilespc,x
+ sta licspc,x
+ cpx #2
+ bne r4
+ lda adcvol,x
+ eor #$f
+ asl @
+ asl @
+ asl @
+ asl @
+ adc <volstb
+ sta volsmp+1
+ lda >volstb
+ adc #0
+ sta volsmp+2
+r4 dex
+ bpl r2
+ inc pozptr
+r5 ldx #1
+ lda typsmp
+ cmp #2
+ beq r6
+ ldx #3
+r6 lda typsmp
+ cmp #2
+ bne r7
+ cpx kansmp
+ beq r8
+r7 jmp dzwiek
+r8 lda audzer,x
+ and filtry,x
+ beq r9
+ ldy #$28
+ lda (addr),y
+ clc
+ adc numdzw,x
+ jsr czest
+ sec
+ adc p1pom,x
+ sta freq+2,x
+r9 dex
+ bpl r6
+ lda #3
+ sta $d20f
+ lda audzer+1
+ and #$10
+ beq w1
+ ldy numdzw+1
+ lda bsfrql,y
+ sta freq
+ lda bsfrqh,y
+ sta freq+1
+w1 lda freq
+ sta $d200
+ lda freq+1
+ sta $d202
+ lda freq+2
+ sta $d204
+ lda freq+3
+ sta $d206
+ lda volume
+ ldx #$ff
+ ldy typsmp
+ cpy #1
+ bne w2
+ ldx kansmp
+ beq w3
+w2 sta $d201
+w3 lda volume+1
+ cpx #1
+ beq w4
+ sta $d203
+w4 cpy #2
+ beq w6
+ lda volume+2
+ cpx #2
+ beq w5
+ sta $d205
+w5 lda volume+3
+ cpx #3
+ beq w6
+ sta $d207
+w6 lda audzer
+ ora audzer+1
+ ora audzer+2
+ ora audzer+3
+ ora oraaud
+ sta $d208
+ rts
+filtry dta b(4),b(2),b(0),b(0)
+
+dzwiek lda adrinl,x
+ sta addr
+ lda adrinh,x
+ sta addr+1
+ ora addr
+ bne d0
+ sta volume,x
+ sta audzer,x
+ jmp r9
+d0 ldy licslp,x
+ cpy #$20
+ beq d3
+ lda (addr),y
+ sec
+ sbc adcvol,x
+ bit sprvol
+ beq d1
+ and #$f0
+d1 sta volume,x
+ iny
+ lda (addr),y
+ sta przech
+ iny
+ sty licslp,x
+ and #7
+ beq d4
+ tay
+ lda akcadl-1,y
+ sta akjmpz+1
+ lda akcadh-1,y
+ sta akjmpz+2
+ lda przech
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ ora #$28
+ tay
+ lda (addr),y
+ clc
+akjmpz jsr $ffff
+d2 lda #0
+ sta audzer,x
+ jmp r9
+d3 lda p3max,x
+ beq d4
+ dec p3lic,x
+ bne d4
+ sta p3lic,x
+ lda volume,x
+ and #15
+ beq d4
+ dec volume,x
+d4 ldy #$23
+ lda (addr),y
+ sta audzer,x
+ lda trnlic,x
+ clc
+ adc #$25
+ tay
+ and #3
+ sta trnlic,x
+ dey
+ lda (addr),y
+ adc adcdzw,x
+ sta numdzw,x
+ jsr czest+2
+ sta freq,x
+ lda p2lic,x
+ beq d5
+ dec p2lic,x
+ jmp r8
+d5 lda branch,x
+ sta p1jmpz+1
+p1jmpz bpl *
+ jmp typ0dz
+ brk
+ jmp typ1dz
+ brk
+ jmp typ2dz
+ brk
+ jmp typ3dz
+czygrc dta b(0)
+ jmp typ4dz
+zapisx dta b(0)
+ jmp typ5dz
+zapisy dta b(0)
+ jmp typ6dz
+sprvol dta b($10)
+ jmp typ7dz
+
+newdzw lda #0
+ sta adcvol,x
+ ldy licptr
+ dey
+new iny
+ lda (addr),y
+ cmp #$fe
+ bne q0
+ sty licptr
+ rts
+q0 cmp #$e0
+ bcc q1
+ lda maxptr
+ sta pozptr
+ bne new
+q1 cmp #$d0
+ bcc q2
+ and #15
+ sta tempo
+ sta zegar
+ bpl new
+q2 cmp #$c0
+ bcc q3
+ and #15
+ eor #15
+ sta adcvol,x
+ bpl new
+q3 cmp #$80
+ bcc q4
+ and #$3f
+ sta ilespc,x
+ bpl new
+q4 cmp #$40
+ bcc q5
+ iny
+ sty licptr
+ and #$1f
+ sta numsmp,x
+ asl @
+ tay
+ainslz lda $ffff,y
+ sta adrinl,x
+ iny
+ainshz lda $ffff,y
+ sta adrinh,x
+ jmp newdzw
+
+q5 sty licptr
+ sta przech
+ clc
+ adc poddzw,x
+ sta adcdzw,x
+ lda typsmp
+ beq n9
+ cmp #2
+ beq n8
+ lda numsmp,x
+ cmp #$1f
+ bne n9
+ lda przech
+ sec
+ sbc #1
+n6 and #15
+ tay
+ lda (adrsmp),y
+ sta adrs2+1
+ tya
+ ora #$10
+ tay
+ lda (adrsmp),y
+ sta lensmp
+ ldy #1
+ ora adrs2+1
+ bne n7
+ ldy #0
+n7 sty czysmp
+ lda #0
+ sta adrs2
+ sta adrinl,x
+ sta adrinh,x
+ txa
+ asl @
+ sta wsksmp
+ stx kansmp
+ rts
+n8 cpx #2
+ bcs nb
+n9 lda adrinl,x
+ sta word
+ lda adrinh,x
+ sta word+1
+ ora word
+ beq na-1
+ ldy #$20
+ lda (word),y
+ and #15
+ sta p1lsb,x
+ lda (word),y
+ and #$70
+ lsr @
+ lsr @
+ sta branch,x
+ iny
+ lda (word),y
+ asl @
+ asl @
+ pha
+ and #$3f
+ sta p2lic,x
+ pla
+ and #$c0
+ sta frqwsk,x
+ iny
+ lda (word),y
+ sta p3max,x
+ sta p3lic,x
+ lda #0
+ sta licslp,x
+ sta trnlic,x
+ sta p1lic,x
+ sta p1pom,x
+ lda adcdzw,x
+ sta numdzw,x
+ jsr czest
+ sta freq,x
+ cpx kansmp
+ beq na
+ rts
+na ldy #$ff
+ sty kansmp
+ iny
+ sty czysmp
+ rts
+nb cpx #2
+ bne nd
+ ldy adcdzw+2
+ lda frsmpl,y
+ sta smpl1z+1
+ lda frsmph,y
+ sta smpl2z+1
+ lda #0
+ sta lsbmsb
+ sta adrs1
+ lda numsmp+2
+ and #15
+ tay
+ lda (adrsmp),y
+ sta adrs1+1
+ tya
+ ora #$10
+ tay
+ lda (adrsmp),y
+ sta smpl3z+1
+ ora adrs1+1
+ bne nc
+ sta smpl1z+1
+ sta smpl2z+1
+nc rts
+nd lda numsmp+3
+ and #15
+ tay
+ lda (adrsmp),y
+ sta adrs2+1
+ tya
+ ora #$10
+ tay
+ lda (adrsmp),y
+ ora adrs2+1
+ beq ne
+ lda (adrsmp),y
+ sec
+ sbc adrs2+1
+ sta lensmp
+ lda #0
+ sta adrs2
+ lda #$8d
+ bne nf
+ne lda #$ad
+nf sta drum2z
+ sta drum1z
+ lda #$18
+ sta $d207
+ rts
+
+typ0dz lda licz
+ and #7
+ lsr @
+ lsr @
+ bcc t2
+ bne typ1dz
+ lda p1lsb,x
+t1 clc
+ sta p1pom,x
+ adc freq,x
+ sta freq,x
+ jmp r8
+t2 lda #0
+ sta p1pom,x
+ jmp r8
+typ1dz lda freq,x
+ sec
+ sbc p1lsb,x
+ sta freq,x
+ sec
+ lda #0
+ sbc p1lsb,x
+ sta p1pom,x
+ jmp r8
+typ2dz lda p1lic,x
+ clc
+ sta p1pom,x
+ adc freq,x
+t3 sta freq,x
+ clc
+ lda p1lic,x
+ adc p1lsb,x
+ sta p1lic,x
+ jmp r8
+typ3dz lda numdzw,x
+ sec
+ sbc p1lic,x
+t4 sta numdzw,x
+ jsr czest
+ jmp t3
+typ4dz lda #0
+ sec
+ sbc p1lic,x
+ sta p1pom,x
+ lda freq,x
+ sec
+ sbc p1lic,x
+ jmp t3
+typ5dz lda numdzw,x
+ clc
+ adc p1lic,x
+ jmp t4
+typ6dz jsr t5
+ jmp t1
+typ7dz jsr t5
+ clc
+ adc numdzw,x
+ jsr a3
+ jmp r8
+t5 ldy p1lic,x
+ lda p1lsb,x
+ bmi t6
+ iny
+ iny
+t6 dey
+ tya
+ sta p1lic,x
+ cmp p1lsb,x
+ bne t7
+ lda p1lsb,x
+ eor #$ff
+ sta p1lsb,x
+t7 lda p1lic,x
+ rts
+czest and #$3f
+ ora frqwsk,x
+ tay
+t1frqz lda $ffff,y
+ rts
+
+akcadl dta l(a1),l(a0),l(a2)
+ dta l(a4),l(a5),l(a6),l(a8)
+akcadh dta h(a1),h(a0),h(a2)
+ dta h(a4),h(a5),h(a6),h(a8)
+audora dta b($40),b(0),b($20),b(0)
+
+a0 adc freq,x
+a1 sta freq,x
+ rts
+a2 adc adcdzw,x
+a3 sta numdzw,x
+ jsr czest
+ sta freq,x
+ rts
+a4 sta freq,x
+ lda audora,x
+ bpl a7
+a5 sta freq,x
+ lda #$80
+ bne a7
+a6 sta freq,x
+ lda #1
+a7 ora oraaud
+ sta oraaud
+ rts
+a8 and $d20a
+ sta freq,x
+a9 rts
+
+bsfrql equ *-1
+ dta b($f2),b($33),b($96)
+ dta b($e2),b($38),b($8c),b(0)
+ dta b($6a),b($e8),b($6a),b($ef)
+ dta b($80),b(8),b($ae),b($46)
+ dta b($e6),b($95),b($41),b($f6)
+ dta b($b0),b($6e),b($30),b($f6)
+ dta b($bb),b($84),b($52),b($22)
+ dta b($f4),b($c8),b($a0),b($7a)
+ dta b($55),b($34),b($14),b($f5)
+ dta b($d8),b($bd),b($a4),b($8d)
+ dta b($77),b($60),b($4e),b($38)
+ dta b($27),b($15),b(6),b($f7)
+ dta b($e8),b($db),b($cf),b($c3)
+ dta b($b8),b($ac),b($a2),b($9a)
+ dta b($90),b($88),b($7f),b($78)
+ dta b($70),b($6a),b($64),b($5e)
+
+bsfrqh equ *-1
+ dta b(13,13,12,11,11,10,10,9,8,8,7,7,7,6,6)
+ dta b(5,5,5,4,4,4,4,3,3,3,3,3,2,2,2,2)
+ dta b(2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,0)
+ dta b(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+
+volstb dta d'8888888888888888'
+ dta d'667777888889999:'
+ dta d'556667788899:::;'
+ dta d'455667788899::;;'
+ dta d'44556677899::;;<'
+ dta d'34456677899::;<<'
+ dta d'33455677899:;;<='
+ dta d'23445677899:;<<='
+ dta d'2334566789::;<=='
+ dta d'2234566789::;<=>'
+ dta d'1234566789::;<=>'
+ dta d'1234556789:;;<=>'
+ dta d'1234456789:;<<=>'
+ dta d'1233456789:;<==>'
+ dta d'1223456789:;<=>>'
+ dta d'0123456789:;<=>?'
+
+frsmpl dta b($20),b($22),b($24),b($26),b($29)
+ dta b($2b),b($2e),b($30),b($33),b($37)
+ dta b($3a),b($3d),b($41),b($45),b($49)
+ dta b($4d),b($52),b($57),b($5c),b($61)
+ dta b($67),b($6e),b($74),b($7b),b($82)
+ dta b($8a),b($92),b($9b),b($a4),b($ae)
+ dta b($b8),b($c3),b($cf),b($dc),b($e9)
+ dta b($f6),b(5),b($15),b($25),b($37)
+ dta b($49),b($5d),b($71),b($87),b($9f)
+ dta b($b8),b($d2),b($ed),b($b),b($2a)
+ dta b($4b),b($6e),b($93),b($ba),b($e3)
+ dta b($f),b($3e),b($70),b($a4),b($db)
+
+frsmph dta d'               '
+ dta d'               '
+ dta d'      !!!!!!!!!'
+ dta d'!!!"""""""#####'
+
+*--- inicjacja
+
+iniadl dta l(inic0),l(inic2)
+ dta l(inic4),l(inic5)
+ dta l(inic6),l(inic7)
+ dta l(inic8),l(inic9)
+iniadh dta h(inic0),h(inic2)
+ dta h(inic4),h(inic5)
+ dta h(inic6),h(inic7)
+ dta h(inic8),h(inic9)
+
+init stx zapisx
+ sty zapisy
+ and #7
+ tay
+ lda iniadl,y
+ sta inic1+1
+ lda iniadh,y
+ sta inic1+2
+inic1 jmp $ffff
+
+inic0 lda zapisy
+ ldx zapisx
+ sta ainslz+1
+ sta ainshz+1
+ stx ainslz+2
+ stx ainshz+2
+ clc
+ adc #$40
+ sta aptrlz+1
+ sta aptrhz+1
+ bcc i2
+ inx
+i2 stx aptrlz+2
+ stx aptrhz+2
+ clc
+ adc #$80
+ sta t1frqz+1
+ bcc i4
+ inx
+i4 stx t1frqz+2
+ inx
+ sta j4+1
+ stx j4+2
+ ldx #9
+j4 lda $ffff,x
+ sta adrtrl,x
+ dex
+ bpl j4
+ dec tempo
+
+inic2 lda #0
+ sta czygrc
+ ldx <licptr-branch
+i9 sta branch,x
+ dex
+ bpl i9
+ ldx #8
+k9 sta $d200,x
+ dex
+ bpl k9
+ rts
+
+inic4 jsr inic2
+ lda zapisx
+ asl @
+ sta pozsng
+ lda maxptr
+ sta pozptr
+ lda #1
+ sta zegar
+ sta czygrc
+ rts
+
+inic5 lda zapisy
+ sta adrsmp
+ lda zapisx
+ sta adrsmp+1
+j5 rts
+
+inic6 lda zapisy
+ and #3
+ tax
+ lda zapisx
+ jsr n6
+ lda czysmp
+ beq j5
+ asl  zapisy
+j6 jsr nopy
+ lda #1
+ sta typsmp
+j7 lda czysmp
+ beq j5
+ cmp #1
+ bne j9
+ ldy #0
+ inc czysmp
+j9 lda (adrs2),y
+ ldx wsksmp
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ ora #$10
+k15h1z sta $d40a
+ sta $d40a
+ sta $d201,x
+ lda (adrs2),y
+ ora #$10
+k15h2z sta $d40a
+ sta $d40a
+ sta $d201,x
+ iny
+ bne j7
+ inc adrs2+1
+ lda adrs2+1
+ cmp lensmp
+ bne j7
+ sty czysmp
+ rts
+
+nopy bcc j8
+ lda #$ea
+ sta k15h1z
+ sta k15h1z+1
+ sta k15h1z+2
+ sta k15h2z
+ sta k15h2z+1
+ sta k15h2z+2
+ rts
+j8 lda #$8d
+ sta k15h1z
+ sta k15h2z
+ lda #$a
+ sta k15h1z+1
+ sta k15h2z+1
+ lda #$d4
+ sta k15h1z+2
+ sta k15h2z+2
+ rts
+
+inic7 lda #0
+ sta czysmp
+ lda zapisx
+ lsr @
+ jsr nopy
+ lda #1
+ sta typsmp
+k1 jsr j7
+ lda typsmp
+ bne k1
+ rts
+
+inic8 lda #2
+ sta typsmp
+ sta kansmp
+ressmp lda #$18
+ sta $d207
+ lda <ressmp+1
+ sta adrs1
+ lda >ressmp+1
+ sta adrs1+1
+ lda #$ad
+ sta drum2z
+ sta drum1z
+ ldy #0
+ sty smpl1z+1
+ sty smpl2z+1
+k2 ldx $d40b
+ lda (adrs2),y
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ ora #$10
+drum1z sta $d207
+ jsr k6
+k3 cpx $d40b
+ beq k3
+ sta $d205
+ ldx $d40b
+ lda (adrs2),y
+ inc adrs2
+ bne k4
+ inc adrs2+1
+ dec lensmp
+ bne k4
+ lda #$ad
+ sta drum2z
+ sta drum1z
+ lda #8
+k4 ora #$10
+drum2z sta $d207
+ jsr k6
+k5 cpx $d40b
+ beq k5
+ sta $d205
+ lda typsmp
+ bne k2
+ rts
+
+k6 clc
+ lda lsbmsb
+smpl1z adc #0
+ sta lsbmsb
+ lda adrs1
+smpl2z adc #0
+ sta adrs1
+ bcc k7
+ inc adrs1+1
+ lda adrs1+1
+smpl3z cmp #0
+ bne k7
+ sty smpl1z+1
+ sty smpl2z+1
+ rts
+k7 lda (adrs1),y
+ bit lsbmsb
+ bmi k8
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+k8 and #15
+ tay
+volsmp lda volstb,y
+ ldy #0
+ rts
+
+inic9 ldy #0
+ sty typsmp
+ sty czysmp
+ dey
+ sty kansmp
+ rts
+
+*--- zmienne
+
+adrtrl org *+4
+adrtrh org *+4
+maxptr org *+1
+tempo  org *+1
+
+branch org *+4
+volume org *+4
+adcvol org *+4
+freq   org *+4
+frqwsk org *+4
+adcdzw org *+4
+poddzw org *+4
+adrinl org *+4
+adrinh org *+4
+numdzw org *+4
+numsmp org *+4
+numptr org *+4
+ptrwsk org *+4
+ilespc org *+4
+licspc org *+4
+p1lsb  org *+4
+p1lic  org *+4
+p1pom  org *+4
+p2lic  org *+4
+p3max  org *+4
+p3lic  org *+4
+trnlic org *+4
+zegar  org *+1
+pozsng org *+1
+pozptr org *+1
+wsksmp org *+1
+kansmp org *+1
+czysmp org *+1
+typsmp org *+1
+oraaud org *+1
+licz   org *+1
+przech org *+1
+licptr org *+1
+
+ end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/mpt.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/mpt.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/os.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/os.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/os.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/os.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,55 @@
+	org	$c000
+nmi
+	bit	$d40f
+	bpl	nmi_vbl
+	jmp	($200)
+nmi_vbl
+	cld
+	pha
+	txa:pha
+	tya:pha
+	sta	$d40f
+	jmp	($222)
+
+vbl
+	inc	20
+	bne	vbl_1
+	inc	19
+	bne	vbl_1
+	inc	18
+vbl_1
+	jmp	($224)
+
+vbld
+	pla:tay
+	pla:tax
+	pla:rti
+
+irq
+	cld
+	jmp	($216)
+
+setvbv
+	asl	@
+	sta	$22d
+	txa
+	ldx	#5
+	sta	$d40a
+	dex:rne
+	ldx	$22d
+	sta	$217,x
+	tya:sta	$216,x
+	rts
+
+reset
+	mwa	#vbl	$222
+	mwa	#vbld	$224
+	rts
+
+	org	$e45c
+	jmp	setvbv
+	jmp	vbl
+	jmp	vbld
+
+	org	$fffa
+	dta	a(nmi,reset,irq)
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/rmt4.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/rmt4.obx differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/rmt8.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/rmt8.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/rmt.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/rmt.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/rmt.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/rmt.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,1326 @@
+;*
+;* Raster Music Tracker, RMT Atari routine version 1.20051226
+;* (c) Radek Sterba, Raster/C.P.U., 2002 - 2005
+;* http://raster.atari.org
+;*
+;* Warnings:
+;*
+;* 1. RMT player routine needs 19 itself reserved bytes in zero page (no accessed
+;*    from any other routines) as well as cca 1KB of memory before the "PLAYER"
+;*    address for frequency tables and functionary variables. It's:
+;*	  a) from PLAYER-$400 to PLAYER for stereo RMTplayer
+;*    b) from PLAYER-$380 to PLAYER for mono RMTplayer
+;*
+;* 2. RMT player routine MUST (!!!) be compiled from the begin of the memory page.
+;*    i.e. "PLAYER" address can be $..00 only!
+;*
+;* 3. Because of RMTplayer provides a lot of effects, it spent a lot of CPU time.
+;*
+;* STEREOMODE	equ 0				;0 => compile RMTplayer for 4 tracks mono
+;*									;1 => compile RMTplayer for 8 tracks stereo
+;*									;2 => compile RMTplayer for 4 tracks stereo L1 R2 R3 L4
+;*									;3 => compile RMTplayer for 4 tracks stereo L1 L2 R3 R4
+;*
+PLAYER		equ $0600
+;*
+	IFT STEREOMODE==1
+TRACKS		equ 8
+	ELS
+TRACKS		equ 4
+	EIF
+;*
+;* RMT FEATures definitions
+;* For optimizations of RMT player routine to concrete RMT modul only!
+;* --------BEGIN--------
+FEAT_INSTRSPEED		equ 0			;* cca 21 or 5 bytes
+FEAT_CONSTANTSPEED	equ 0			;* cca 28 bytes
+;* VARIOUS COMMANDS
+FEAT_COMMAND1		equ 1			;* cca 8 bytes
+FEAT_COMMAND2		equ 1			;* cca 20 bytes (+save 1 address in zero page) and quicker whole RMT routine
+FEAT_COMMAND3		equ 1			;* cca 12 bytes
+FEAT_COMMAND4		equ 1			;* cca 15 bytes
+FEAT_COMMAND5		equ 1			;* cca 67 bytes
+FEAT_COMMAND6		equ 1			;* cca 15 bytes
+;* COMMAND7 SETNOTE (i.e. command 7 with parameter != $80)
+FEAT_COMMAND7SETNOTE		equ 1		;* cca 12 bytes
+;* COMMAND7 VOLUMEONLY (i.e. command 7 with parameter == $80)
+FEAT_COMMAND7VOLUMEONLY		equ 1		;* cca 74 bytes
+;* PORTAMENTO
+FEAT_PORTAMENTO		equ 1			;* cca 138 bytes and quicker whole RMT routine
+;* FILTER
+FEAT_FILTER			equ 1			;* cca 179 bytes and quicker whole RMT routine
+FEAT_FILTERG0L		equ	1			;* (cca 38 bytes for each)
+FEAT_FILTERG1L		equ	1
+FEAT_FILTERG0R		equ	1
+FEAT_FILTERG1R		equ	1
+;* BASS16B (i.e. distortion value 6)
+FEAT_BASS16			equ 1			;* cca 194 bytes +128bytes freq table and quicker whole RMT routine
+FEAT_BASS16G1L		equ 1			;* (cca 47 bytes for each)
+FEAT_BASS16G3L		equ 1
+FEAT_BASS16G1R		equ 1
+FEAT_BASS16G3R		equ 1
+;* VOLUME ONLY for particular generators
+FEAT_VOLUMEONLYG0L	equ 1			;* (cca 7 bytes for each)
+FEAT_VOLUMEONLYG2L	equ 1
+FEAT_VOLUMEONLYG3L	equ 1
+FEAT_VOLUMEONLYG0R	equ 1
+FEAT_VOLUMEONLYG2R	equ 1
+FEAT_VOLUMEONLYG3R	equ 1
+;* TABLE TYPE (i.e. TABLETYPE=1)
+FEAT_TABLETYPE		equ 1			;* cca 53 bytes and quicker whole RMT routine
+;* TABLE MODE (i.e. TABLEMODE=1)
+FEAT_TABLEMODE		equ 1			;* cca 16 bytes and quicker whole RMT routine
+;* TABLE GO (i.e. TGO is nonzero value)
+FEAT_TABLEGO		equ 1			;* cca 6 bytes and quicker whole RMT routine
+;* AUDCTLMANUALSET (i.e. any MANUAL AUDCTL setting is nonzero value)
+FEAT_AUDCTLMANUALSET	equ 1		;* cca 27 bytes and quicker whole RMT routine
+;* VOLUME MINIMUM (i.e. VMIN is nonzero value)
+FEAT_VOLUMEMIN		equ 1			;* cca 12 bytes and quicker whole RMT routine
+;* --------END--------
+
+;*
+;* RMT ZeroPage addresses
+	org 203
+p_tis
+p_instrstable	org *+2
+p_trackslbstable	org *+2
+p_trackshbstable	org *+2
+p_song			org *+2
+ns				org *+2
+nr				org *+2
+nt				org *+2
+reg1			org *+1
+reg2			org *+1
+reg3			org *+1
+tmp				org *+1
+	IFT FEAT_COMMAND2
+frqaddcmd2		org *+1
+	EIF
+	IFT TRACKS>4
+	org PLAYER-$400
+	ELS
+	org PLAYER-$380
+	EIF
+track_variables
+trackn_db	org *+TRACKS
+trackn_hb	org *+TRACKS
+trackn_idx	org *+TRACKS
+trackn_pause	org *+TRACKS
+trackn_note	org *+TRACKS
+trackn_volume	org *+TRACKS
+trackn_distor 	org *+TRACKS
+trackn_shiftfrq	org *+TRACKS
+	IFT FEAT_PORTAMENTO
+trackn_portafrqc org *+TRACKS
+trackn_portafrqa org *+TRACKS
+trackn_portaspeed org *+TRACKS
+trackn_portaspeeda org *+TRACKS
+trackn_portadepth org *+TRACKS
+	EIF
+trackn_instrx2	org *+TRACKS
+trackn_instrdb	org *+TRACKS
+trackn_instrhb	org *+TRACKS
+trackn_instridx	org *+TRACKS
+trackn_instrlen	org *+TRACKS
+trackn_instrlop	org *+TRACKS
+trackn_instrreachend	org *+TRACKS
+trackn_volumeslidedepth org *+TRACKS
+trackn_volumeslidevalue org *+TRACKS
+	IFT FEAT_VOLUMEMIN
+trackn_volumemin		org *+TRACKS
+	EIF
+trackn_effdelay			org *+TRACKS
+trackn_effvibratoa		org *+TRACKS
+trackn_effvibratobeg	org *+TRACKS
+trackn_effvibratoend	org *+TRACKS
+trackn_effshift		org *+TRACKS
+trackn_tabletypespeed org *+TRACKS
+	IFT FEAT_TABLEMODE
+trackn_tablemode	org *+TRACKS
+	EIF
+trackn_tablenote	org *+TRACKS
+trackn_tablea		org *+TRACKS
+trackn_tableend		org *+TRACKS
+	IFT FEAT_TABLEGO
+trackn_tablelop		org *+TRACKS
+	EIF
+trackn_tablespeeda	org *+TRACKS
+trackn_command		org *+TRACKS
+	IFT FEAT_BASS16
+trackn_outnote		org *+TRACKS
+	EIF
+	IFT FEAT_FILTER
+trackn_filter		org *+TRACKS
+	EIF
+trackn_audf	org *+TRACKS
+trackn_audc	org *+TRACKS
+	IFT FEAT_AUDCTLMANUALSET
+trackn_audctl	org *+TRACKS
+	EIF
+	IFT FEAT_CONSTANTSPEED==0
+v_speed			org *+1
+	EIF
+v_aspeed		org *+1
+	IFT FEAT_INSTRSPEED==0||FEAT_INSTRSPEED>1
+v_ainstrspeed	org *+1
+	EIF
+v_abeat			org *+1
+track_endvariables
+		org PLAYER-$100-$140-$30
+INSTRPAR	equ 12
+tabbeganddistor
+ dta frqtabpure-frqtab,$00
+ dta frqtabpure-frqtab,$20
+ dta frqtabpure-frqtab,$40
+ dta frqtabbass1-frqtab,$c0
+ dta frqtabpure-frqtab,$80
+ dta frqtabpure-frqtab,$a0
+ dta frqtabbass1-frqtab,$c0
+ dta frqtabbass2-frqtab,$c0
+vibtabbeg dta 0,vib1-vib0,vib2-vib0,vib3-vib0,vibx-vib0
+vib0	dta 0
+vib1	dta 1,-1,-1,1
+vib2	dta 1,0,-1,-1,0,1
+vib3	dta 1,1,0,-1,-1,-1,-1,0,1,1
+vibx
+:PLAYER-$100-$140-* dta 0
+;		org PLAYER-$100-$140
+	IFT FEAT_BASS16
+frqtabbasslo
+	dta $F2,$33,$96,$E2,$38,$8C,$00,$6A,$E8,$6A,$EF,$80,$08,$AE,$46,$E6
+	dta $95,$41,$F6,$B0,$6E,$30,$F6,$BB,$84,$52,$22,$F4,$C8,$A0,$7A,$55
+	dta $34,$14,$F5,$D8,$BD,$A4,$8D,$77,$60,$4E,$38,$27,$15,$06,$F7,$E8
+	dta $DB,$CF,$C3,$B8,$AC,$A2,$9A,$90,$88,$7F,$78,$70,$6A,$64,$5E,$00
+	EIF
+		org PLAYER-$100-$100
+frqtab
+	ERT [<frqtab]!=0	;* frqtab must begin at the memory page bound! (i.e. $..00 address)
+frqtabbass1
+	dta $BF,$B6,$AA,$A1,$98,$8F,$89,$80,$F2,$E6,$DA,$CE,$BF,$B6,$AA,$A1
+	dta $98,$8F,$89,$80,$7A,$71,$6B,$65,$5F,$5C,$56,$50,$4D,$47,$44,$3E
+	dta $3C,$38,$35,$32,$2F,$2D,$2A,$28,$25,$23,$21,$1F,$1D,$1C,$1A,$18
+	dta $17,$16,$14,$13,$12,$11,$10,$0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07
+frqtabbass2
+	dta $FF,$F1,$E4,$D8,$CA,$C0,$B5,$AB,$A2,$99,$8E,$87,$7F,$79,$73,$70
+	dta $66,$61,$5A,$55,$52,$4B,$48,$43,$3F,$3C,$39,$37,$33,$30,$2D,$2A
+	dta $28,$25,$24,$21,$1F,$1E,$1C,$1B,$19,$17,$16,$15,$13,$12,$11,$10
+	dta $0F,$0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00
+frqtabpure
+	dta $F3,$E6,$D9,$CC,$C1,$B5,$AD,$A2,$99,$90,$88,$80,$79,$72,$6C,$66
+	dta $60,$5B,$55,$51,$4C,$48,$44,$40,$3C,$39,$35,$32,$2F,$2D,$2A,$28
+	dta $25,$23,$21,$1F,$1D,$1C,$1A,$18,$17,$16,$14,$13,$12,$11,$10,$0F
+	dta $0E,$0D,$0C,$0B,$0A,$09,$08,$07,$06,$05,$04,$03,$02,$01,$00,$00
+	IFT FEAT_BASS16
+frqtabbasshi
+	dta $0D,$0D,$0C,$0B,$0B,$0A,$0A,$09,$08,$08,$07,$07,$07,$06,$06,$05
+	dta $05,$05,$04,$04,$04,$04,$03,$03,$03,$03,$03,$02,$02,$02,$02,$02
+	dta $02,$02,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00
+	dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	EIF
+		org PLAYER-$0100
+volumetab
+	dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	dta $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01
+	dta $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01,$02,$02,$02,$02
+	dta $00,$00,$00,$01,$01,$01,$01,$01,$02,$02,$02,$02,$02,$03,$03,$03
+	dta $00,$00,$01,$01,$01,$01,$02,$02,$02,$02,$03,$03,$03,$03,$04,$04
+	dta $00,$00,$01,$01,$01,$02,$02,$02,$03,$03,$03,$04,$04,$04,$05,$05
+	dta $00,$00,$01,$01,$02,$02,$02,$03,$03,$04,$04,$04,$05,$05,$06,$06
+	dta $00,$00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07
+	dta $00,$01,$01,$02,$02,$03,$03,$04,$04,$05,$05,$06,$06,$07,$07,$08
+	dta $00,$01,$01,$02,$02,$03,$04,$04,$05,$05,$06,$07,$07,$08,$08,$09
+	dta $00,$01,$01,$02,$03,$03,$04,$05,$05,$06,$07,$07,$08,$09,$09,$0A
+	dta $00,$01,$01,$02,$03,$04,$04,$05,$06,$07,$07,$08,$09,$0A,$0A,$0B
+	dta $00,$01,$02,$02,$03,$04,$05,$06,$06,$07,$08,$09,$0A,$0A,$0B,$0C
+	dta $00,$01,$02,$03,$03,$04,$05,$06,$07,$08,$09,$0A,$0A,$0B,$0C,$0D
+	dta $00,$01,$02,$03,$04,$05,$06,$07,$07,$08,$09,$0A,$0B,$0C,$0D,$0E
+	dta $00,$01,$02,$03,$04,$05,$06,$07,$08,$09,$0A,$0B,$0C,$0D,$0E,$0F
+	org PLAYER
+;*
+;* Set of RMT main vectors:
+;*
+RASTERMUSICTRACKER
+	jmp rmt_init
+	jmp rmt_play
+	jmp rmt_p3
+	jmp rmt_silence
+	jmp SetPokey
+rmt_init
+	stx ns
+	sty ns+1
+	pha
+	IFT track_endvariables-track_variables>255
+	ldy #0
+	tya
+ri0	sta track_variables,y
+	sta track_endvariables-$100,y
+	iny
+	bne ri0
+	ELS
+	ldy #track_endvariables-track_variables
+	lda #0
+ri0	sta track_variables-1,y
+	dey
+	bne ri0
+	EIF
+	ldy #4
+	lda (ns),y
+	sta v_maxtracklen
+	iny
+	IFT FEAT_CONSTANTSPEED==0
+	lda (ns),y
+	sta v_speed
+	EIF
+	IFT FEAT_INSTRSPEED==0
+	iny
+	lda (ns),y
+	sta v_instrspeed
+	sta v_ainstrspeed
+	ELI FEAT_INSTRSPEED>1
+	lda #FEAT_INSTRSPEED
+	sta v_ainstrspeed
+	EIF
+	ldy #8
+ri1	lda (ns),y
+	sta p_tis-8,y
+	iny
+	cpy #8+8
+	bne ri1
+	pla
+	pha
+	IFT TRACKS>4
+	asl @
+	asl @
+	asl @
+	clc
+	adc p_song
+	sta p_song
+	pla
+	php
+	and #$e0
+	asl @
+	rol @
+	rol @
+	rol @
+	ELS
+	asl @
+	asl @
+	clc
+	adc p_song
+	sta p_song
+	pla
+	php
+	and #$c0
+	asl @
+	rol @
+	rol @
+	EIF
+	plp
+	adc p_song+1
+	sta p_song+1
+	jsr GetSongLineTrackLineInitOfNewSetInstrumentsOnlyRmtp3
+rmt_silence
+	IFT STEREOMODE>0
+	lda #0
+	sta $d208
+	sta $d218
+	ldy #3
+	sty $d20f
+	sty $d21f
+	ldy #8
+si1	sta $d200,y
+	sta $d210,y
+	dey
+	bpl si1
+	ELS
+	lda #0
+	sta $d208
+	ldy #3
+	sty $d20f
+	ldy #8
+si1	sta $d200,y
+	dey
+	bpl si1
+	EIF
+	IFT FEAT_INSTRSPEED==0
+	lda v_instrspeed
+	ELS
+	lda #FEAT_INSTRSPEED
+	EIF
+	rts
+GetSongLineTrackLineInitOfNewSetInstrumentsOnlyRmtp3
+GetSongLine
+	ldx #0
+	stx v_abeat
+nn0
+nn1	txa
+	tay
+	lda (p_song),y
+	cmp #$fe
+	bcs nn2
+	tay
+	lda (p_trackslbstable),y
+	sta trackn_db,x
+	lda (p_trackshbstable),y
+nn1a sta trackn_hb,x
+	lda #0
+	sta trackn_idx,x
+	lda #1
+nn1a2 sta trackn_pause,x
+	lda #$80
+	sta trackn_instrx2,x
+	inx
+xtracks01	cpx #TRACKS
+	bne nn1
+	lda p_song
+	clc
+xtracks02	adc #TRACKS
+	sta p_song
+	bcc GetTrackLine
+	inc p_song+1
+nn1b
+	jmp GetTrackLine
+nn2
+	beq nn3
+nn2a
+	lda #0
+	beq nn1a2
+nn3
+	ldy #2
+	lda (p_song),y
+	tax
+	iny
+	lda (p_song),y
+	sta p_song+1
+	stx p_song
+	ldx #0
+	beq nn0
+GetTrackLine
+oo0
+oo0a
+	IFT FEAT_CONSTANTSPEED==0
+	lda v_speed
+	sta v_bspeed
+	EIF
+	ldx #-1
+oo1
+	inx
+	dec trackn_pause,x
+	bne oo1x
+oo1b
+	lda trackn_db,x
+	sta ns
+	lda trackn_hb,x
+	sta ns+1
+oo1i
+	ldy trackn_idx,x
+	inc trackn_idx,x
+	lda (ns),y
+	sta reg1
+	and #$3f
+	cmp #61
+	beq oo1a
+	bcs oo2
+	sta trackn_note,x
+	IFT FEAT_BASS16
+	sta trackn_outnote,x
+	EIF
+	iny
+	lda (ns),y
+	lsr @
+	and #$3f*2
+	sta trackn_instrx2,x
+oo1a
+	lda #1
+	sta trackn_pause,x
+	ldy trackn_idx,x
+	inc trackn_idx,x
+	lda (ns),y
+	lsr @
+	ror reg1
+	lsr @
+	ror reg1
+	lda reg1
+	and #$f0
+	sta trackn_volume,x
+oo1x
+xtracks03sub1	cpx #TRACKS-1
+	bne oo1
+	IFT FEAT_CONSTANTSPEED==0
+	lda #$ff
+v_bspeed equ *-1
+	sta v_speed
+	ELS
+	lda #FEAT_CONSTANTSPEED
+	EIF
+	sta v_aspeed
+	jmp InitOfNewSetInstrumentsOnly
+oo2
+	cmp #63
+	beq oo63
+	lda reg1
+	and #$c0
+	beq oo62_b
+	asl @
+	rol @
+	rol @
+	sta trackn_pause,x
+	jmp oo1x
+oo62_b
+	iny
+	lda (ns),y
+	sta trackn_pause,x
+	inc trackn_idx,x
+	jmp oo1x
+oo63
+	lda reg1
+	IFT FEAT_CONSTANTSPEED==0
+	bmi oo63_1X
+	iny
+	lda (ns),y
+	sta v_bspeed
+	inc trackn_idx,x
+	jmp oo1i
+oo63_1X
+	EIF
+	cmp #255
+	beq oo63_11
+	iny
+	lda (ns),y
+	sta trackn_idx,x
+	jmp oo1i
+oo63_11
+	jmp GetSongLine
+p2xrmtp3	jmp rmt_p3
+p2x0 dex
+	 bmi p2xrmtp3
+InitOfNewSetInstrumentsOnly
+p2x1 ldy trackn_instrx2,x
+	bmi p2x0
+SetUpInstrumentY2
+	lda (p_instrstable),y
+	sta trackn_instrdb,x
+	sta nt
+	iny
+	lda (p_instrstable),y
+	sta trackn_instrhb,x
+	sta nt+1
+	IFT FEAT_FILTER
+	lda #1
+	sta trackn_filter,x
+	EIF
+	IFT FEAT_TABLEGO
+	IFT FEAT_FILTER
+	tay
+	ELS
+	ldy #1
+	EIF
+	lda (nt),y
+	sta trackn_tablelop,x
+	iny
+	ELS
+	ldy #2
+	EIF
+	lda (nt),y
+	sta trackn_instrlen,x
+	iny
+	lda (nt),y
+	sta trackn_instrlop,x
+	iny
+	lda (nt),y
+	sta trackn_tabletypespeed,x
+	IFT FEAT_TABLETYPE||FEAT_TABLEMODE
+	and #$3f
+	EIF
+	sta trackn_tablespeeda,x
+	IFT FEAT_TABLEMODE
+	lda (nt),y
+	and #$40
+	sta trackn_tablemode,x
+	EIF
+	IFT FEAT_AUDCTLMANUALSET
+	iny
+	lda (nt),y
+	sta trackn_audctl,x
+	iny
+	ELS
+	ldy #6
+	EIF
+	lda (nt),y
+	sta trackn_volumeslidedepth,x
+	IFT FEAT_VOLUMEMIN
+	iny
+	lda (nt),y
+	sta trackn_volumemin,x
+	iny
+	ELS
+	ldy #8
+	EIF
+	lda (nt),y
+	sta trackn_effdelay,x
+	iny
+	lda (nt),y
+	tay
+	lda vibtabbeg,y
+	sta trackn_effvibratoa,x
+	sta trackn_effvibratobeg,x
+	lda vibtabbeg+1,y
+	sta trackn_effvibratoend,x
+	ldy #10
+	lda (nt),y
+	sta trackn_effshift,x
+	lda #128
+	sta trackn_volumeslidevalue,x
+	sta trackn_instrx2,x
+	asl @
+	sta trackn_instrreachend,x
+	sta trackn_shiftfrq,x
+	tay
+	lda (nt),y
+	sta trackn_tableend,x
+	adc #0
+	sta trackn_instridx,x
+	lda #INSTRPAR
+	sta trackn_tablea,x
+	tay
+	lda (nt),y
+	sta trackn_tablenote,x
+xata_rtshere
+	jmp p2x0
+rmt_play
+rmt_p0
+	jsr SetPokey
+rmt_p1
+	IFT FEAT_INSTRSPEED==0||FEAT_INSTRSPEED>1
+	dec v_ainstrspeed
+	bne rmt_p3
+	EIF
+	IFT FEAT_INSTRSPEED==0
+	lda #$ff
+v_instrspeed	equ *-1
+	sta v_ainstrspeed
+	ELI FEAT_INSTRSPEED>1
+	lda #FEAT_INSTRSPEED
+	sta v_ainstrspeed
+	EIF
+rmt_p2
+	dec v_aspeed
+	bne rmt_p3
+	inc v_abeat
+	lda v_abeat
+	cmp #$ff
+v_maxtracklen equ *-1
+	beq p2o3
+	jmp GetTrackLine
+p2o3
+	jmp GetSongLineTrackLineInitOfNewSetInstrumentsOnlyRmtp3
+go_ppnext	jmp ppnext
+rmt_p3
+	lda #>frqtab
+	sta nr+1
+xtracks05sub1	ldx #TRACKS-1
+pp1
+	lda trackn_instrhb,x
+	beq go_ppnext
+	sta ns+1
+	lda trackn_instrdb,x
+	sta ns
+	ldy trackn_instridx,x
+	lda (ns),y
+	sta reg1
+	iny
+	lda (ns),y
+	sta reg2
+	iny
+	lda (ns),y
+	sta reg3
+	iny
+	tya
+	cmp trackn_instrlen,x
+	bcc pp2
+	beq pp2
+	lda #$80
+	sta trackn_instrreachend,x
+pp1b
+	lda trackn_instrlop,x
+pp2	sta trackn_instridx,x
+	lda reg1
+	IFT TRACKS>4
+	cpx #4
+	bcc pp2s
+	lsr @
+	lsr @
+	lsr @
+	lsr @
+pp2s
+	EIF
+	and #$0f
+	ora trackn_volume,x
+	tay
+	lda volumetab,y
+	sta tmp
+	lda reg2
+	and #$0e
+	tay
+	lda tabbeganddistor,y
+	sta nr
+	lda tmp
+	ora tabbeganddistor+1,y
+	sta trackn_audc,x
+InstrumentsEffects
+	lda trackn_effdelay,x
+	beq ei2
+	cmp #1
+	bne ei1
+	lda trackn_shiftfrq,x
+	clc
+	adc trackn_effshift,x
+	clc
+	ldy trackn_effvibratoa,x
+	adc vib0,y
+	sta trackn_shiftfrq,x
+	iny
+	tya
+	cmp trackn_effvibratoend,x
+	bne ei1a
+	lda trackn_effvibratobeg,x
+ei1a
+	sta trackn_effvibratoa,x
+	jmp ei2
+ei1
+	dec trackn_effdelay,x
+ei2
+	ldy trackn_tableend,x
+	cpy #INSTRPAR+1
+	bcc ei3
+	lda trackn_tablespeeda,x
+	bpl ei2f
+ei2c
+	tya
+	cmp trackn_tablea,x
+	bne ei2c2
+	IFT FEAT_TABLEGO
+	lda trackn_tablelop,x
+	ELS
+	lda #INSTRPAR
+	EIF
+	sta trackn_tablea,x
+	bne ei2a
+ei2c2
+	inc trackn_tablea,x
+ei2a
+	lda trackn_instrdb,x
+	sta nt
+	lda trackn_instrhb,x
+	sta nt+1
+	ldy trackn_tablea,x
+	lda (nt),y
+	IFT FEAT_TABLEMODE
+	ldy trackn_tablemode,x
+	beq ei2e
+	clc
+	adc trackn_tablenote,x
+ei2e
+	EIF
+	sta trackn_tablenote,x
+	lda trackn_tabletypespeed,x
+	IFT FEAT_TABLETYPE||FEAT_TABLEMODE
+	and #$3f
+	EIF
+ei2f
+	sec
+	sbc #1
+	sta trackn_tablespeeda,x
+ei3
+	lda trackn_instrreachend,x
+	bpl ei4
+	lda trackn_volume,x
+	beq ei4
+	IFT FEAT_VOLUMEMIN
+	cmp trackn_volumemin,x
+	beq ei4
+	bcc ei4
+	EIF
+	tay
+	lda trackn_volumeslidevalue,x
+	clc
+	adc trackn_volumeslidedepth,x
+	sta trackn_volumeslidevalue,x
+	bcc ei4
+	tya
+	sbc #16
+	sta trackn_volume,x
+ei4
+	IFT FEAT_COMMAND2
+	lda #0
+	sta frqaddcmd2
+	EIF
+	lda reg2
+	sta trackn_command,x
+	and #$70
+	lsr @
+	lsr @
+	sta jmx+1
+jmx	bcc *
+	jmp cmd0
+	nop
+	jmp cmd1
+	nop
+	jmp cmd2
+	nop
+	jmp cmd3
+	nop
+	jmp cmd4
+	nop
+	jmp cmd5
+	nop
+	jmp cmd6
+	nop
+	jmp cmd7
+cmd1
+	IFT FEAT_COMMAND1
+	lda reg3
+	jmp cmd0c
+	EIF
+cmd2
+	IFT FEAT_COMMAND2
+	lda reg3
+	sta frqaddcmd2
+	lda trackn_note,x
+	jmp cmd0a
+	EIF
+cmd3
+	IFT FEAT_COMMAND3
+	lda trackn_note,x
+	clc
+	adc reg3
+	sta trackn_note,x
+	jmp cmd0a
+	EIF
+cmd4
+	IFT FEAT_COMMAND4
+	lda trackn_shiftfrq,x
+	clc
+	adc reg3
+	sta trackn_shiftfrq,x
+	lda trackn_note,x
+	jmp cmd0a
+	EIF
+cmd5
+	IFT FEAT_COMMAND5&&FEAT_PORTAMENTO
+	IFT FEAT_TABLETYPE
+	lda trackn_tabletypespeed,x
+	bpl cmd5a1
+	ldy trackn_note,x
+	lda (nr),y
+	clc
+	adc trackn_tablenote,x
+	jmp cmd5ax
+	EIF
+cmd5a1
+	lda trackn_note,x
+	clc
+	adc trackn_tablenote,x
+	cmp #61
+	bcc cmd5a2
+	lda #63
+cmd5a2
+	tay
+	lda (nr),y
+cmd5ax
+	sta trackn_portafrqc,x
+	ldy reg3
+	bne cmd5a
+	sta trackn_portafrqa,x
+cmd5a
+	tya
+	lsr @
+	lsr @
+	lsr @
+	lsr @
+	sta trackn_portaspeed,x
+	sta trackn_portaspeeda,x
+	lda reg3
+	and #$0f
+	sta trackn_portadepth,x
+	lda trackn_note,x
+	jmp cmd0a
+	ELI FEAT_COMMAND5
+	jmp pp9
+	EIF
+cmd6
+	IFT FEAT_COMMAND6&&FEAT_FILTER
+	lda reg3
+	clc
+	adc trackn_filter,x
+	sta trackn_filter,x
+	lda trackn_note,x
+	jmp cmd0a
+	ELI FEAT_COMMAND6
+	jmp pp9
+	EIF
+cmd7
+	IFT FEAT_COMMAND7SETNOTE||FEAT_COMMAND7VOLUMEONLY
+	IFT FEAT_COMMAND7SETNOTE
+	lda reg3
+	IFT FEAT_COMMAND7VOLUMEONLY
+	cmp #$80
+	beq cmd7a
+	EIF
+	sta trackn_note,x
+	jmp cmd0a
+	EIF
+	IFT FEAT_COMMAND7VOLUMEONLY
+cmd7a
+	lda trackn_audc,x
+	ora #$f0
+	sta trackn_audc,x
+	lda trackn_note,x
+	jmp cmd0a
+	EIF
+	EIF
+cmd0
+	lda trackn_note,x
+	clc
+	adc reg3
+cmd0a
+	IFT FEAT_TABLETYPE
+	ldy trackn_tabletypespeed,x
+	bmi cmd0b
+	EIF
+	clc
+	adc trackn_tablenote,x
+	cmp #61
+	bcc cmd0a1
+	lda #0
+	sta trackn_audc,x
+	lda #63
+cmd0a1
+	IFT FEAT_BASS16
+	sta trackn_outnote,x
+	EIF
+	tay
+	lda (nr),y
+	clc
+	adc trackn_shiftfrq,x
+	IFT FEAT_COMMAND2
+	clc
+	adc frqaddcmd2
+	EIF
+	IFT FEAT_TABLETYPE
+	jmp cmd0c
+cmd0b
+	cmp #61
+	bcc cmd0b1
+	lda #0
+	sta trackn_audc,x
+	lda #63
+cmd0b1
+	tay
+	lda trackn_shiftfrq,x
+	clc
+	adc trackn_tablenote,x
+	clc
+	adc (nr),y
+	IFT FEAT_COMMAND2
+	clc
+	adc frqaddcmd2
+	EIF
+	EIF
+cmd0c
+	sta trackn_audf,x
+pp9
+	IFT FEAT_PORTAMENTO
+	lda trackn_portaspeeda,x
+	beq pp10
+	dec trackn_portaspeeda,x
+	bne pp10
+	lda trackn_portaspeed,x
+	sta trackn_portaspeeda,x
+	lda trackn_portafrqa,x
+	cmp trackn_portafrqc,x
+	beq pp10
+	bcs pps1
+	adc trackn_portadepth,x
+	bcs pps8
+	cmp trackn_portafrqc,x
+	bcs pps8
+	jmp pps9
+pps1
+	sbc trackn_portadepth,x
+	bcc pps8
+	cmp trackn_portafrqc,x
+	bcs pps9
+pps8
+	lda trackn_portafrqc,x
+pps9
+	sta trackn_portafrqa,x
+pp10
+	lda reg2
+	and #$01
+	beq pp11
+	lda trackn_portafrqa,x
+	clc
+	adc trackn_shiftfrq,x
+	sta trackn_audf,x
+pp11
+	EIF
+ppnext
+	dex
+	bmi rmt_p4
+	jmp pp1
+rmt_p4
+	IFT FEAT_AUDCTLMANUALSET
+	lda trackn_audctl+0
+	ora trackn_audctl+1
+	ora trackn_audctl+2
+	ora trackn_audctl+3
+	tax
+	ELS
+	ldx #0
+	EIF
+qq1
+	stx v_audctl
+	IFT FEAT_FILTER
+	IFT FEAT_FILTERG0L
+	lda trackn_command+0
+	bpl qq2
+	lda trackn_audc+0
+	and #$0f
+	beq qq2
+	lda trackn_audf+0
+	clc
+	adc trackn_filter+0
+	sta trackn_audf+2
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2L
+	lda trackn_audc+2
+	and #$10
+	bne qq1a
+	EIF
+	lda #0
+	sta trackn_audc+2
+qq1a
+	txa
+	ora #4
+	tax
+	EIF
+qq2
+	IFT FEAT_FILTERG1L
+	lda trackn_command+1
+	bpl qq3
+	lda trackn_audc+1
+	and #$0f
+	beq qq3
+	lda trackn_audf+1
+	clc
+	adc trackn_filter+1
+	sta trackn_audf+3
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG3L
+	lda trackn_audc+3
+	and #$10
+	bne qq2a
+	EIF
+	lda #0
+	sta trackn_audc+3
+qq2a
+	txa
+	ora #2
+	tax
+	EIF
+qq3
+	IFT FEAT_FILTERG0L||FEAT_FILTERG1L
+	cpx v_audctl
+	bne qq5
+	EIF
+	EIF
+	IFT FEAT_BASS16
+	IFT FEAT_BASS16G1L
+	lda trackn_command+1
+	and #$0e
+	cmp #6
+	bne qq4
+	lda trackn_audc+1
+	and #$0f
+	beq qq4
+	ldy trackn_outnote+1
+	lda frqtabbasslo,y
+	sta trackn_audf+0
+	lda frqtabbasshi,y
+	sta trackn_audf+1
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG0L
+	lda trackn_audc+0
+	and #$10
+	bne qq3a
+	EIF
+	lda #0
+	sta trackn_audc+0
+qq3a
+	txa
+	ora #$50
+	tax
+	EIF
+qq4
+	IFT FEAT_BASS16G3L
+	lda trackn_command+3
+	and #$0e
+	cmp #6
+	bne qq5
+	lda trackn_audc+3
+	and #$0f
+	beq qq5
+	ldy trackn_outnote+3
+	lda frqtabbasslo,y
+	sta trackn_audf+2
+	lda frqtabbasshi,y
+	sta trackn_audf+3
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2L
+	lda trackn_audc+2
+	and #$10
+	bne qq4a
+	EIF
+	lda #0
+	sta trackn_audc+2
+qq4a
+	txa
+	ora #$28
+	tax
+	EIF
+	EIF
+qq5
+	stx v_audctl
+	IFT TRACKS>4
+	IFT FEAT_AUDCTLMANUALSET
+	lda trackn_audctl+4
+	ora trackn_audctl+5
+	ora trackn_audctl+6
+	ora trackn_audctl+7
+	tax
+	ELS
+	ldx #0
+	EIF
+	stx v_audctl2
+	IFT FEAT_FILTER
+	IFT FEAT_FILTERG0R
+	lda trackn_command+0+4
+	bpl qs2
+	lda trackn_audc+0+4
+	and #$0f
+	beq qs2
+	lda trackn_audf+0+4
+	clc
+	adc trackn_filter+0+4
+	sta trackn_audf+2+4
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2R
+	lda trackn_audc+2+4
+	and #$10
+	bne qs1a
+	EIF
+	lda #0
+	sta trackn_audc+2+4
+qs1a
+	txa
+	ora #4
+	tax
+	EIF
+qs2
+	IFT FEAT_FILTERG1R
+	lda trackn_command+1+4
+	bpl qs3
+	lda trackn_audc+1+4
+	and #$0f
+	beq qs3
+	lda trackn_audf+1+4
+	clc
+	adc trackn_filter+1+4
+	sta trackn_audf+3+4
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG3R
+	lda trackn_audc+3+4
+	and #$10
+	bne qs2a
+	EIF
+	lda #0
+	sta trackn_audc+3+4
+qs2a
+	txa
+	ora #2
+	tax
+	EIF
+qs3
+	IFT FEAT_FILTERG0R||FEAT_FILTERG1R
+	cpx v_audctl2
+	bne qs5
+	EIF
+	EIF
+	IFT FEAT_BASS16
+	IFT FEAT_BASS16G1R
+	lda trackn_command+1+4
+	and #$0e
+	cmp #6
+	bne qs4
+	lda trackn_audc+1+4
+	and #$0f
+	beq qs4
+	ldy trackn_outnote+1+4
+	lda frqtabbasslo,y
+	sta trackn_audf+0+4
+	lda frqtabbasshi,y
+	sta trackn_audf+1+4
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG0R
+	lda trackn_audc+0+4
+	and #$10
+	bne qs3a
+	EIF
+	lda #0
+	sta trackn_audc+0+4
+qs3a
+	txa
+	ora #$50
+	tax
+	EIF
+qs4
+	IFT FEAT_BASS16G3R
+	lda trackn_command+3+4
+	and #$0e
+	cmp #6
+	bne qs5
+	lda trackn_audc+3+4
+	and #$0f
+	beq qs5
+	ldy trackn_outnote+3+4
+	lda frqtabbasslo,y
+	sta trackn_audf+2+4
+	lda frqtabbasshi,y
+	sta trackn_audf+3+4
+	IFT FEAT_COMMAND7VOLUMEONLY&&FEAT_VOLUMEONLYG2R
+	lda trackn_audc+2+4
+	and #$10
+	bne qs4a
+	EIF
+	lda #0
+	sta trackn_audc+2+4
+qs4a
+	txa
+	ora #$28
+	tax
+	EIF
+	EIF
+qs5
+	stx v_audctl2
+	EIF
+rmt_p5
+	IFT FEAT_INSTRSPEED==0||FEAT_INSTRSPEED>1
+	lda v_ainstrspeed
+	ELS
+	lda #1
+	EIF
+	rts
+SetPokey
+	IFT STEREOMODE==1		;* L1 L2 L3 L4 R1 R2 R3 R4
+	ldy #$ff
+v_audctl2 equ *-1
+	lda trackn_audf+0+4
+	ldx trackn_audf+0
+xstastx01	sta $d210
+	stx $d200
+	lda trackn_audc+0+4
+	ldx trackn_audc+0
+xstastx02	sta $d211
+	stx $d201
+	lda trackn_audf+1+4
+	ldx trackn_audf+1
+xstastx03	sta $d212
+	stx $d202
+	lda trackn_audc+1+4
+	ldx trackn_audc+1
+xstastx04	sta $d213
+	stx $d203
+	lda trackn_audf+2+4
+	ldx trackn_audf+2
+xstastx05	sta $d214
+	stx $d204
+	lda trackn_audc+2+4
+	ldx trackn_audc+2
+xstastx06	sta $d215
+	stx $d205
+	lda trackn_audf+3+4
+	ldx trackn_audf+3
+xstastx07	sta $d216
+	stx $d206
+	lda trackn_audc+3+4
+	ldx trackn_audc+3
+xstastx08	sta $d217
+	stx $d207
+	lda #$ff
+v_audctl equ *-1
+xstysta01	sty $d218
+	sta $d208
+	ELI STEREOMODE==0		;* L1 L2 L3 L4
+	ldy #$ff
+v_audctl equ *-1
+	lda trackn_audf+0
+	ldx trackn_audc+0
+	sta $d200
+	stx $d201
+	lda trackn_audf+1
+	ldx trackn_audc+1
+	sta $d200+2
+	stx $d201+2
+	lda trackn_audf+2
+	ldx trackn_audc+2
+	sta $d200+4
+	stx $d201+4
+	lda trackn_audf+3
+	ldx trackn_audc+3
+	sta $d200+6
+	stx $d201+6
+	sty $d208
+	ELI STEREOMODE==2		;* L1 R2 R3 L4
+	ldy #$ff
+v_audctl equ *-1
+	lda trackn_audf+0
+	ldx trackn_audc+0
+	sta $d200
+	stx $d201
+	sta $d210
+	lda trackn_audf+1
+	ldx trackn_audc+1
+	sta $d210+2
+	stx $d211+2
+	lda trackn_audf+2
+	ldx trackn_audc+2
+	sta $d210+4
+	stx $d211+4
+	sta $d200+4
+	lda trackn_audf+3
+	ldx trackn_audc+3
+	sta $d200+6
+	stx $d201+6
+	sta $d210+6
+	sty $d218
+	sty $d208
+	ELI STEREOMODE==3		;* L1 L2 R3 R4
+	ldy #$ff
+v_audctl equ *-1
+	lda trackn_audf+0
+	ldx trackn_audc+0
+	sta $d200
+	stx $d201
+	lda trackn_audf+1
+	ldx trackn_audc+1
+	sta $d200+2
+	stx $d201+2
+	lda trackn_audf+2
+	ldx trackn_audc+2
+	sta $d210+4
+	stx $d211+4
+	sta $d200+4
+	lda trackn_audf+3
+	ldx trackn_audc+3
+	sta $d210+6
+	stx $d211+6
+	sta $d200+6
+	sty $d218
+	sty $d208
+	EIF
+	rts
+RMTEND
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/tm2.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/tm2.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/tm2.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/tm2.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,1551 @@
+;-------------------
+;  TMC 2.00 Player
+;------------------
+
+player equ $500
+normal equ 1 ; change to 0 for short version
+
+       org player
+
+addr   equ $fa
+byte   equ $fc
+bajt   equ $fd
+filter equ $fe
+maxvol equ $ff
+
+; some tables on start (to avoid page breaking)
+
+voltab dta d'                '
+       dta d'        !!!!!!!!'
+       dta d'    !!!!!!!!""""'
+       dta d'   !!!!!"""""###'
+       dta d'  !!!!""""####$$'
+       dta d'  !!!"""###$$$%%'
+       dta d'  !!"""##$$$%%&&'
+       dta d'  !!""##$$%%&&'''''
+       dta d' !!""##$$%%&&''''('
+       dta d' !!""#$$%%&''''(()'
+       dta d' !!"##$%%&''''())*'
+       dta d' !!"#$$%&''''()**+'
+       dta d' !""#$%&&''()**+,'
+       dta d' !"##$%&''()**+,-'
+       dta d' !"#$%&''''()*+,-.'
+       dta d' !"#$%&''()*+,-./'
+
+frqtab dta 0,$f1,$e4,$d7
+       dta $cb,$c0,$b5,$aa
+       dta $a1,$98,$8f,$87
+       dta $7f,$78,$72,$6b
+       dta $65,$5f,$5a,$55
+       dta $50,$4b,$47,$43
+       dta $3f,$3c,$38,$35
+       dta $32,$2f,$2c,$2a
+       dta $27,$25,$23,$21
+       dta $1f,$1d,$1c,$1a
+       dta $18,$17,$16,$14
+       dta $13,$12,$11,$10
+       dta 15,14,13,12
+       dta 11,10,9,8
+       dta 7,6,5,4
+       dta 3,2,1,0
+
+       dta 0,$f2,$e9,$da
+       dta $ce,$bf,$b6,$aa
+       dta $a1,$98,$8f,$89
+       dta $80,$7a,$71,$6b
+       dta $65,$5f,$5c,$56
+       dta $50,$4d,$47,$44
+       dta $3e,$3c,$38,$35
+       dta $32,$2f,$2d,$2a
+       dta $28,$25,$23,$21
+       dta $1f,$1d,$1c,$1a
+       dta $18,$17,$16,$14
+       dta $13,$12,$11,$10
+       dta 15,14,13,12
+       dta 11,10,9,8
+       dta 7,6,5,4
+       dta 3,2,1,0
+
+       dta 0,$ff,$f1,$e4
+       dta $d8,$ca,$c0,$b5
+       dta $ab,$a2,$99,$8e
+       dta $87,$7f,$79,$73
+       dta $70,$66,$61,$5a
+       dta $55,$52,$4b,$48
+       dta $43,$3f,$3c,$39
+       dta $37,$33,$30,$2d
+       dta $2a,$28,$25,$24
+       dta $21,$1f,$1e,$1c
+       dta $1b,$19,$17,$16
+       dta $15,$13,$12,$11
+       dta $10,15,14,13
+       dta 12,11,10,9
+       dta 8,7,6,5
+       dta 4,3,2,1
+
+       dta 0,$f3,$e6,$d9
+       dta $cc,$c1,$b5,$ad
+       dta $a2,$99,$90,$88
+       dta $80,$79,$72,$6c
+       dta $66,$60,$5b,$55
+       dta $51,$4c,$48,$44
+       dta $40,$3c,$39,$35
+       dta $32,$2f,$2d,$2a
+       dta $28,$25,$23,$21
+       dta $1f,$1d,$1c,$1a
+       dta $18,$17,$16,$14
+       dta $13,$12,$11,$10
+       dta 15,14,13,12
+       dta 11,10,9,8
+       dta 7,6,5,4
+       dta 3,2,1,0
+
+basslo dta l($be2,$b38,$a8c,$a00)
+       dta l($96a,$8e8,$86a,$7ef)
+       dta l($780,$708,$6ae,$646)
+       dta l($5e6,$595,$541,$4f6)
+       dta l($4b0,$46e,$430,$3f6)
+       dta l($3bb,$384,$352,$322)
+       dta l($2f4,$2c8,$2a0,$27a)
+       dta l($255,$234,$214,$1f5)
+       dta l($1d8,$1bd,$1a4,$18d)
+       dta l($177,$160,$14e,$138)
+       dta l($127,$115,$106,$0f7)
+       dta l($0e8,$0db,$0cf,$0c3)
+       dta l($0b8,$0ac,$0a2,$09a)
+       dta l($090,$088,$07f,$078)
+       dta l($070,$06a,$064,$05e)
+       dta l($057,$052,$032,$00a)
+
+       dta 0,$f2,$33,$96
+       dta $e2,$38,$8c,$00
+       dta $6a,$e8,$6a,$ef
+       dta $80,$08,$ae,$46
+       dta $e6,$95,$41,$f6
+       dta $b0,$6e,$30,$f6
+       dta $bb,$84,$52,$22
+       dta $f4,$c8,$a0,$7a
+       dta $55,$34,$14,$f5
+       dta $d8,$bd,$a4,$8d
+       dta $77,$60,$4e,$38
+       dta $27,$15,$06,$f7
+       dta $e8,$db,$cf,$c3
+       dta $b8,$ac,$a2,$9a
+       dta $90,$88,$7f,$78
+       dta $70,$6a,$64,$5e
+
+basshi dta h($be2,$b38,$a8c,$a00)
+       dta h($96a,$8e8,$86a,$7ef)
+       dta h($780,$708,$6ae,$646)
+       dta h($5e6,$595,$541,$4f6)
+       dta h($4b0,$46e,$430,$3f6)
+       dta h($3bb,$384,$352,$322)
+       dta h($2f4,$2c8,$2a0,$27a)
+       dta h($255,$234,$214,$1f5)
+       dta h($1d8,$1bd,$1a4,$18d)
+       dta h($177,$160,$14e,$138)
+       dta h($127,$115,$106,$0f7)
+       dta h($0e8,$0db,$0cf,$0c3)
+       dta h($0b8,$0ac,$0a2,$09a)
+       dta h($090,$088,$07f,$078)
+       dta h($070,$06a,$064,$05e)
+       dta h($057,$052,$032,$00a)
+
+       dta 0,13,13,12
+       dta 11,11,10,10
+       dta 9,8,8,7
+       dta 7,7,6,6
+       dta 5,5,5,4
+       dta 4,4,4,3
+       dta 3,3,3,3
+       dta 2,2,2,2
+       dta 2,2,2,1
+       dta 1,1,1,1
+       dta 1,1,1,1
+       dta 1,1,1,0
+       dta 0,0,0,0
+       dta 0,0,0,0
+       dta 0,0,0,0
+       dta 0,0,0,0
+
+tables_len equ *-player
+
+;      org +$300
+       jmp init
+       jmp play
+       jmp sound
+
+; some external controls
+quadro dta 1           ; 0=mono, 1-63=stereo, 64-127= RMT stereo, 128-255=quadro
+pokeys dta 16          ; which data should go to which pokey (0,1,2 and 3 respectively)
+       dta 20          ; for stereo config: 16=first 4 tracks, 20=last 4 tracks
+       dta 0           ; for quadro values should be:
+       dta 0           ; 0=main volume from tracks 0-3, 4=main volume from tracks 4-5
+                       ; 8=additional volume from tracks 0-3, 12=additional volume from tracks 4-5
+                       ; typical: 0,4,12,8 which should sound well on pokeys 0&2 on left channel
+                       ; and pokeys 1&3 on right channel
+                       ; (on stereo atari these settings should also sound well)
+silent dta d'        ' ; which channel should be silent
+
+; these values are usable from the outside of player
+czygrc dta 0           ; if song should be played
+pozsng dta 0           ; position in song
+
+specialflag dta 0      ; flag triggered in song data
+adrsng dta a(0)        ; address of song line
+
+tempo  dta 0           ; tempo of song
+ltempo dta 0           ; counter of tempo
+pozptr dta 0           ; counter of positions in patterns (64 means end of pattern)
+
+       ift normal ; !!!
+
+aud1   dta 0           ; total AUDCTL of left channel
+aud2   dta 0           ; and right
+
+voltabs equ *          ; (24 bytes)
+
+       eif ; !!!
+
+vol1ch dta d'        ' ; volume of main channels
+
+       ift normal ; !!!
+
+vol2ch dta d'        ' ; volume of additional channels
+volume dta d'        ' ; volume of channels in stereo (taken from vol1ch and vol2ch)
+
+freqtabs equ *         ; (24 bytes)
+
+       eif ; !!!
+
+frq    dta d'        ' ; frequency
+
+       ift normal ; !!!
+
+note   dta d'        ' ; actual note played on channel (taken from aktwys)
+freqen dta d'        ' ; frequency of channels in stereo (taken from frq)
+
+       eif ; !!!
+
+; data for accesing pattern data
+adrptl dta d'        ' ; address of pattern data
+adrpth dta d'        ' ;
+pozwpt dta d'        ' ; index for accesing data in pattern
+poddzw dta d'        ' ; change of note
+delay  dta d'        ' ; how many spaces in pattern should be skipped
+
+; data for accesing instrument data
+czygrx dta d'        ' ; if something is played on channel
+adrsnl dta d'        ' ; address of instrument data
+adrsnh dta d'        ' ;
+numdzw dta d'        ' ; number of instrument
+wysdzw dta d'        ' ; note to play
+aktwys dta d'        ' ; actual played note
+znksz  dta d'        ' ; distortion
+audctl dta d'        ' ; AUDCTL
+slupy  dta d'        ' ; counter for data inside instrument
+
+; data for specific sound effects
+sndlen dta d'        ' ; length of instrument
+sndlop dta d'        ' ; where to loop sound data
+actvol dta d'        ' ; volume of sounds
+actvl1 dta d'        ' ; actual control of main volume
+
+       ift normal ; !!!
+
+actvl2 dta d'        ' ; and additional volume
+
+       eif ; !!!
+
+opad1  dta d'        ' ; how soon the sound should fade (main volume)
+opad2  dta d'        ' ; and additional volume
+lopad1 dta d'        ' ; counters for fading
+lopad2 dta d'        ' ;
+opadst dta d'        ' ; start of fading
+typ    dta d'        ' ; type of effect
+param  dta d'        ' ; parameter for effect
+typdat dta d'        ' ; data for effect
+czekaj dta d'        ' ; how soon the effect should start
+dtyp   dta d'        ' ; how often the effect should chanfe
+ltyp   dta d'        ' ; counter for effect change
+ilperm dta d'        ' ; how many arpeggio sounds
+aperm  dta d'        ' ; actual arpeggio sound
+dperm  dta d'        ' ; how soon the arpeggio should change
+lperm  dta d'        ' ; counter for arpeggio
+kolejn dta d'        ' ; order of arpeggio
+sndfilter dta d'        ' ; filter from sound data
+mainaudctl dta d'        ' ; main audctl
+addaudctl dta d'        ' ; additional audctl
+shiftfrq dta d'        '
+shiftnote dta d'        '
+shiftfilter dta d'        '
+
+; some useful tables
+
+       ift normal ; !!!
+
+przeci dta 4,5,6,7     ; which channel is the opposite (used only in stereo)
+       dta 0,1,2,3
+
+       eif ; !!!
+
+audtb1 dta 4,2,0,0     ; which byte in audctl has to be set to make sound "2 channel synth"
+       dta 4,2,0,0
+audtb2 dta 0,16,0,8    ; which byte in audctl has to be set to make sound "2 channel bass"
+       dta 0,16,0,8
+usedaudctl dta 4+129,$50+2+129,129,$28+129 ; bits of AUDCTL used in channel
+       dta 4+129,$50+2+129,129,$28+129
+
+;-------------------------
+; start of player program
+
+player_program equ *
+
+; new address of song line
+p3     dey
+       lda (addr),y
+       sta pozsng
+       mvx #0 byte
+       asl @
+       rol byte
+       asl @
+       rol byte
+       asl @
+       rol byte
+       asl @
+       rol byte
+       adc pozsng ; clc
+       scc:inc byte
+       clc
+zm0    adc #0
+       sta addr
+       lda byte
+zm1    adc #0
+       sta addr+1
+       jmp p1
+
+; play song (call only one time per frame)
+play   jsr pokey
+       lda czygrc
+       beq rsound
+       dec ltempo
+       bmi p4
+rsound jmp sound+3
+
+p4     dec pozptr
+       bne r1
+
+; get new patterns from song
+       ldx #0
+       inc pozsng
+       mwa adrsng addr
+
+p1     ldy #16
+       lda (addr),y
+       bmi p3
+       jeq stop
+       sta pozptr
+       dey
+
+p2     lda (addr),y
+       dey
+       sty byte
+       tay
+zm2    lda $ffff,y
+       sta adrptl,x
+zm3    lda $ffff,y
+       sta adrpth,x
+       lda #0
+       sta delay,x
+       sta pozwpt,x
+       ldy byte
+       lda (addr),y
+       sta poddzw,x
+       inx
+       dey
+       bpl p2
+       lda #17
+       add addr
+       sta adrsng
+       lda #0
+       adc addr+1
+       sta adrsng+1
+
+; get new data from patterns
+r1     mva tempo ltempo
+
+       ldx #7
+r2     dec delay,x
+       bmi r13
+
+r14    dex
+       bpl r2
+       jmp sound+3
+
+r13    mva adrptl,x addr
+       mva adrpth,x addr+1
+
+       ldy pozwpt,x
+r3     lda (addr),y ; get data
+       bne r4
+
+       iny ; $00: only new volume
+       lda (addr),y
+       sta actvol,x
+       and #$f0
+       sta actvl1,x
+
+       ift normal ; !!!
+
+       lda (addr),y
+       asl @
+       asl @
+       asl @
+       asl @
+       sta actvl2,x
+
+       eif ; !!!
+
+       iny
+       tya
+       sta pozwpt,x
+       jmp r14
+
+r4     cmp #$40
+       bcs r5
+       adc poddzw,x ; $01-$3f: new note with sound and maybe volume
+       sta wysdzw,x
+       iny
+       lda (addr),y
+       bpl r11
+       and #$7f
+       sta byte
+       iny
+       lda (addr),y
+       sta actvol,x
+       and #$f0
+       sta actvl1,x
+
+       ift normal ; !!!
+
+       lda (addr),y
+       asl @
+       asl @
+       asl @
+       asl @
+       sta actvl2,x
+
+       eif ; !!!
+
+       iny
+       tya
+       sta pozwpt,x
+       ldy byte
+       jsr dzwiek
+       jmp r14
+
+r11    tay ; without volume
+       inc pozwpt,x
+       inc pozwpt,x
+       lda actvol,x
+       and #$f0
+       sta actvl1,x
+
+       ift normal ; !!!
+
+       lda actvol,x
+       asl @
+       asl @
+       asl @
+       asl @
+       sta actvl2,x
+
+       eif ; !!!
+
+       jsr dzwiek
+       jmp r14
+
+r5     cmp #$80
+       bcs r6
+       and #$3f ; $41-$7f: new note with volume
+       add poddzw,x
+       sta wysdzw,x
+       iny
+       lda (addr),y
+       sta actvol,x
+       and #$f0
+       sta actvl1,x
+
+       ift normal ; !!!
+
+       lda (addr),y
+       asl @
+       asl @
+       asl @
+       asl @
+       sta actvl2,x
+
+       eif ; !!!
+
+       iny
+       tya
+       sta pozwpt,x
+       jmp r14
+
+r6     bne r7
+       iny ; $80: more than 15 spaces
+       lda (addr),y
+       sta delay,x
+       iny
+       tya
+       sta pozwpt,x
+       jmp r14
+
+r7     cmp #$c0
+       bcs r8
+       and #$3f ; $81-$bf: new note
+       add poddzw,x
+       sta wysdzw,x
+       inc pozwpt,x
+       jmp r14
+
+r8     cmp #$d0
+       bcs r9
+       iny ; $c0-$cf: new tempo
+       inc pozwpt,x
+       and #15
+       sta tempo
+       sta ltempo
+       jmp r3
+
+r9     cmp #$e0 ; special code
+       bcs r15
+       mva (addr),y byte
+       iny
+       mva (addr),y bajt
+       iny
+       tya
+       sta pozwpt,x
+       lda byte
+       jsr specialcode
+       jmp r14
+
+r15    cmp #$f0 ; special code with volume
+       bcs r12
+       mva (addr),y byte
+       iny
+       mva (addr),y bajt
+       lda byte
+       jsr specialcode
+       ldy pozwpt,x
+       iny
+       iny
+       lda (addr),y
+       sta actvol,x
+       and #$f0
+       sta actvl1,x
+
+       ift normal ; !!!
+
+       lda (addr),y
+       asl @
+       asl @
+       asl @
+       asl @
+       sta actvl2,x
+
+       eif ; !!!
+
+       iny
+       tya
+       sta pozwpt,x
+       jmp r14
+
+r12    cmp #$ff
+       bcs r10
+       sbc #$ef ; $f0-$fe: spaces-$f0 (c is clear here)
+       sta delay,x
+       inc pozwpt,x
+       jmp r14
+
+r10    lda #$40 ; $ff: spaces till the end of pattern
+       sta delay,x
+       jmp r14
+
+; main play sound loop
+sound  jsr pokey
+       ldx #7
+p5     lda czygrx,x
+       beq p6
+       jmp graj
+
+grajreturn equ *
+       lda silent,x
+       beq p7
+
+       lda #0 ; silent channel
+       sta vol1ch,x
+
+       ift normal ; !!!
+
+       sta vol2ch,x
+
+       eif ; !!!
+
+       dex
+       bpl p5
+       jmp p8
+
+p7     ldy bajt
+       lda frqtab,y
+       add byte
+       sta frq,x
+       tya
+       sta aktwys,x
+
+       lda audctl,x
+       and audtb2,x
+       beq p11
+       lda bajt ; 2 channel bass
+       and #$7f
+       tay
+       lda basslo,y
+       add byte
+       sta frq-1,x
+       lda basshi,y
+       adc #0
+       sta frq,x
+       lda #0
+       sta vol1ch-1,x
+       ldy przeci,x
+       sta vol2ch-1,y
+       dex
+       dex
+       bpl p5
+       jmp p8
+
+p11    lda audctl,x
+       and audtb1,x
+       beq p6
+       lda sndfilter,x ;two channel filter
+       add bajt
+       sta aktwys+2,x
+       tay
+       lda frqtab,y
+       add byte
+       sec
+       adc filter
+       sta frq+2,x
+
+p6     dex
+       bpl p5
+
+; sound postprocessing
+p8     inx
+       stx byte
+
+       ift normal ; !!!
+
+       ldx #3
+       lda quadro
+       beq p9
+       and #$40
+       bne p12
+
+       ldx #7 ; standard stereo settings
+p9     txa
+       tay
+       lda vol1ch,y
+       bne p10
+       ldy przeci,x
+       lda vol2ch,y
+       bne p10
+       txa
+       tay
+       lda #0
+p10    ora znksz,y
+       sta volume,x
+       lda frq,y
+       sta freqen,x
+       lda aktwys,y
+       sta note,x
+
+       lda audctl,y
+       ora byte
+       sta byte
+
+       cpx #4
+       sne:sta aud2
+       dex
+       bpl p9
+       sta aud1
+       rts
+
+p12    equ * ; RMT stereo
+p13    lda vol1ch,x
+       ora znksz,x
+       sta volume,x
+       lda vol2ch+4,x
+       ora znksz+4,x
+       sta volume+4,x
+       mva frq,x freqen,x
+       mva frq+4,x freqen+4,x
+       mva aktwys,x note,x
+       mva aktwys+4,x note+4,x
+       dex
+       bpl p13
+
+       lda audctl
+       ora audctl+1
+       ora audctl+2
+       ora audctl+3
+       sta aud1
+       lda audctl+4
+       ora audctl+5
+       ora audctl+6
+       ora audctl+7
+       sta aud2
+       rts
+
+; set pokey
+pokey  lda quadro
+       jeq pokey1
+       jpl pokey2
+
+       lda pokeys+3 ; data for pokey 3
+       tax
+       lsr @
+       lsr @
+       and #1
+       tay
+       lda aud1,y
+       sta $d238
+       txa
+       and #4
+       tay
+       lda freqtabs,y
+       sta $d230
+       lda voltabs,x
+       sta $d231
+       lda freqtabs+1,y
+       sta $d232
+       lda voltabs+1,x
+       sta $d233
+       lda freqtabs+2,y
+       sta $d234
+       lda voltabs+2,x
+       sta $d235
+       lda freqtabs+3,y
+       sta $d236
+       lda voltabs+3,x
+       sta $d237
+
+       lda pokeys+2 ; data for pokey 2
+       tax
+       lsr @
+       lsr @
+       and #1
+       tay
+       lda aud1,y
+       sta $d228
+       txa
+       and #4
+       tay
+       lda freqtabs,y
+       sta $d220
+       lda voltabs,x
+       sta $d221
+       lda freqtabs+1,y
+       sta $d222
+       lda voltabs+1,x
+       sta $d223
+       lda freqtabs+2,y
+       sta $d224
+       lda voltabs+2,x
+       sta $d225
+       lda freqtabs+3,y
+       sta $d226
+       lda voltabs+3,x
+       sta $d227
+
+pokey2 lda pokeys+1 ; data for pokey 1
+       tax
+       lsr @
+       lsr @
+       and #1
+       tay
+       lda aud1,y
+       sta $d218
+       txa
+       ldy quadro
+       spl:and #4
+       tay
+       lda freqtabs,y
+       sta $d210
+       lda voltabs,x
+       sta $d211
+       lda freqtabs+1,y
+       sta $d212
+       lda voltabs+1,x
+       sta $d213
+       lda freqtabs+2,y
+       sta $d214
+       lda voltabs+2,x
+       sta $d215
+       lda freqtabs+3,y
+       sta $d216
+       lda voltabs+3,x
+       sta $d217
+
+pokey1 lda pokeys ; data for pokey 0
+       tax
+       lsr @
+       lsr @
+       and #1
+       tay
+       lda aud1,y
+       sta $d208
+       txa
+       ldy quadro
+       spl:and #4
+       tay
+       lda freqtabs,y
+       sta $d200
+       lda voltabs,x
+       sta $d201
+       lda freqtabs+1,y
+       sta $d202
+       lda voltabs+1,x
+       sta $d203
+       lda freqtabs+2,y
+       sta $d204
+       lda voltabs+2,x
+       sta $d205
+       lda freqtabs+3,y
+       sta $d206
+       lda voltabs+3,x
+       sta $d207
+       rts
+
+       els ; !!!
+
+       rts
+
+pokey  lda audctl+4
+       ora audctl+5
+       ora audctl+6
+       ora audctl+7
+       sta $d218
+       lda frq+4
+       sta $d210
+       lda vol1ch+4
+       ora znksz+4
+       sta $d211
+       lda frq+5
+       sta $d212
+       lda vol1ch+5
+       ora znksz+5
+       sta $d213
+       lda frq+6
+       sta $d214
+       lda vol1ch+6
+       ora znksz+6
+       sta $d215
+       lda frq+7
+       sta $d216
+       lda vol1ch+7
+       ora znksz+7
+       sta $d217
+
+       lda audctl+0
+       ora audctl+1
+       ora audctl+2
+       ora audctl+3
+       sta $d208
+       lda frq+0
+       sta $d200
+       lda vol1ch+0
+       ora znksz+0
+       sta $d201
+       lda frq+1
+       sta $d202
+       lda vol1ch+1
+       ora znksz+1
+       sta $d203
+       lda frq+2
+       sta $d204
+       lda vol1ch+2
+       ora znksz+2
+       sta $d205
+       lda frq+3
+       sta $d206
+       lda vol1ch+3
+       ora znksz+3
+       sta $d207
+       rts
+
+       eif ; !!!
+
+; sound processing
+graj   lda adrsnl,x
+       sta addr
+       lda adrsnh,x
+       sta addr+1
+
+       mva shiftfrq,x byte
+       mva shiftnote,x bajt
+       mva shiftfilter,x filter
+
+       lda slupy,x
+       cmp sndlen,x
+       bcc n1
+       sta opadst,x
+       lda sndlop,x
+       sta slupy,x
+       jmp n0
+
+n1     lda opadst,x ; sound fading
+       beq n6
+n0     lda opad1,x
+       beq n7
+       dec lopad1,x
+       bne n7
+       sta lopad1,x
+       lda actvl1,x
+       beq n7
+       sub #16
+       sta actvl1,x
+n7     lda opad2,x
+       beq n6
+       dec lopad2,x
+       bne n6
+       sta lopad2,x
+
+       ift normal ; !!!
+
+       lda actvl2,x
+       beq n6
+       sub #16
+       sta actvl2,x
+
+       eif ; !!!
+
+n6     ldy aperm,x ; arpeggio
+       lda (addr),y
+       add wysdzw,x
+       add:sta bajt
+       dec lperm,x
+       bpl m1
+       lda dperm,x
+       sta lperm,x
+       lda kolejn,x
+       beq m6
+       add aperm,x
+       sta aperm,x
+       beq m7
+       cmp ilperm,x
+       bcc m1
+       lda #$ff
+       sta kolejn,x
+       jmp m1
+
+m7     lda #1
+       sta kolejn,x
+       jmp m1
+
+m6     inc aperm,x
+       lda ilperm,x
+       cmp aperm,x
+       bcs m1
+       lda #0
+       sta aperm,x
+
+m1     lda #19
+       add:sta addr
+       scc:inc addr+1
+
+       ldy slupy,x
+       lda (addr),y ; main sound data
+       and #$f0
+       sta znksz,x
+       lda (addr),y
+       and #15
+       ora actvl1,x
+       tay
+       lda voltab,y
+       ora maxvol
+       tay
+       lda voltab,y
+       sta vol1ch,x
+
+       ift normal ; !!!
+
+       ldy slupy,x
+       iny
+       lda (addr),y
+       and #15
+       ora actvl2,x
+       tay
+       lda voltab,y
+       ora maxvol
+       tay
+       lda voltab,y
+       sta vol2ch,x
+
+       eif ; !!!
+
+       lda czekaj,x
+       bne m2
+       lda typ,x
+       sta m5+1
+m5     bpl * ; jmp
+       jmp typ0
+       nop
+       jmp typ1
+       nop
+       jmp typ2
+       nop
+       jmp typ3
+       nop
+       jmp typ4
+       nop
+       jmp typ5
+       nop
+       jmp typ6
+       nop
+       jmp typ7
+
+m2     dec czekaj,x
+m3     ldy slupy,x ; accents
+       iny
+       lda (addr),y
+       and #$70
+       lsr @
+       lsr @
+       lsr @
+       sta n5+1
+       lda (addr),y
+       bmi n3
+       lda mainaudctl,x
+       jmp n4
+n3     lda addaudctl,x
+n4     and usedaudctl,x
+       sta audctl,x
+       iny
+       iny
+       tya
+       sta slupy,x
+       dey
+       lda (addr),y
+n5     bcc * ; jmp
+       bcc a0
+       bcc a1
+       bcc a2
+       bcc a3
+       bcc a4
+       bcc a5
+       bcc a6
+       bcc a7
+
+; accents
+a1     adc:sta shiftfrq,x
+       lda (addr),y
+a0     add:sta byte
+       jmp grajreturn
+
+a3     adc:sta shiftnote,x
+       lda (addr),y
+a2     add:sta bajt
+       jmp grajreturn
+
+a5     adc:sta shiftfilter,x
+       lda (addr),y
+a4     add:sta filter
+       jmp grajreturn
+
+a6     sta byte
+       lda #0
+a7     sta bajt
+       jmp grajreturn
+
+; effects
+typ1   lda typdat,x
+       and #3
+       lsr @
+       bcc t0
+       bne t1
+       lda param,x
+       add:sta byte
+t0     dec ltyp,x
+       bpl typ0
+       inc typdat,x
+       mva dtyp,x ltyp,x
+       jmp m3
+
+t1     lda byte
+       sbc param,x ; sec
+       sta byte
+       dec ltyp,x
+       bpl typ0
+       inc typdat,x
+       mva dtyp,x ltyp,x
+       jmp m3
+
+typ2   ldy typdat,x
+       lda param,x
+       bmi t2
+       iny
+       iny
+t2     dey
+       tya
+       add:sta byte
+       dec ltyp,x
+       bpl typ0
+       tya
+       sta typdat,x
+       cmp param,x
+       bne t3
+       eor #$ff
+       sta param,x
+t3     mva dtyp,x ltyp,x
+typ0   jmp m3
+
+typ3   ldy typdat,x
+       lda param,x
+       bmi t4
+       iny
+       iny
+t4     dey
+       tya
+       add:sta bajt
+       dec ltyp,x
+       bpl typ0
+       tya
+       sta typdat,x
+       cmp param,x
+       bne t3
+       eor #$ff
+       sta param,x
+       mva dtyp,x ltyp,x
+       jmp m3
+
+typ4   lda typdat,x
+       add:sta byte
+       dec ltyp,x
+       bpl typ0
+       lda param,x
+       add:sta typdat,x
+       mva dtyp,x ltyp,x
+       jmp m3
+
+typ5   lda bajt
+       sub typdat,x
+       sta bajt
+       dec ltyp,x
+       bpl typ0
+       lda param,x
+       add:sta typdat,x
+       mva dtyp,x ltyp,x
+       jmp m3
+
+typ6   lda param,x
+       add:sta byte
+typ7   jmp m3 ; placeholder for new type of sound
+
+;----------------
+; init functions
+
+; play song, X=number of song
+songx  ldy #16
+zm4    lda #0
+       sta addr
+zm5    lda #0
+       sta addr+1
+       mva #0 pozsng
+d5     txa
+       beq inic
+       lda (addr),y
+       seq:bpl d4
+       dex
+d4     lda #17
+       add:sta addr
+       scc:inc addr+1
+       inc pozsng
+       bne d5
+       ldx #0
+
+; play song, X=line of song
+playx  lda #0
+       sta byte
+       txa
+       sta pozsng
+       asl @
+       rol byte
+       asl @
+       rol byte
+       asl @
+       rol byte
+       asl @
+       rol byte
+       adc pozsng ; clc
+       scc:inc byte
+       clc
+zm6    adc #0
+       sta addr
+       lda byte
+zm7    adc #0
+       sta addr+1
+inic   jsr stop
+       mwa addr adrsng
+       ldx #7
+i4     mva #$ff actvol,x
+       lda #$f0
+       sta actvl1,x
+
+       ift normal ; !!!
+
+       sta actvl2,x
+
+       eif ; !!!
+
+       dex
+       bpl i4
+       lda #3
+       sta $d20f
+       sta $d21f
+
+       ift normal ; !!!
+
+       sta $d22f
+       sta $d23f
+
+       eif ; !!!
+
+       dec pozsng
+       inx
+       stx ltempo
+       inx
+       stx pozptr
+       stx czygrc
+       rts
+
+i1     txa ; change of tempo
+       and #15
+       sta tempo
+       rts
+i2     stx czygrc ; pause, continue
+       rts
+
+init   cmp #$10 ; A=$00
+       jcc songx
+       cmp #$20 ; A=$10
+       bcc playx
+       cmp #$30 ; A=$20
+       jcc d2
+       cmp #$40 ; A=$30
+       bcc i1
+       cmp #$50 ; A=$40
+       jcc stop
+       cmp #$60 ; A=$50
+       bcc i2
+       cmp #$70 ; A=$60
+       jcs i3
+       sty bajt
+
+specialcode and #15
+       asl @
+       sta sc17+1
+       lda bajt
+sc17   bcc * ; jmp
+       bcc sc0
+       bcc sc1
+       bcc sc2
+       bcc sc3
+       bcc sc4
+       bcc sc5
+       bcc sc6
+       bcc sc7
+       bcc sc8
+       bcc sc9
+       bcc sc10
+       bcc sc11
+       bcc sc12
+       bcc sc13
+       bcc sc14
+       bcc sc15
+
+sc0    sta specialflag ; code 0: set special flag
+sc10   equ *
+sc11   equ *
+sc12   equ *
+sc13   equ *
+sc14   equ *
+sc15   equ *
+       rts
+
+; special codes
+sc4    sta sndfilter,x
+       rts
+sc5    sta mainaudctl,x
+       rts
+sc6    sta addaudctl,x
+       rts
+sc7    sta shiftfilter,x
+       rts
+sc8    sta shiftfrq,x
+       rts
+sc9    sta shiftnote,x
+       rts
+
+sc1    and #$70
+       lsr @
+       lsr @
+       sta typ,x
+       and #$30
+       sne:sta typdat,x
+       lda bajt
+       bmi sc16
+       and #15
+       sta param,x
+       rts
+
+sc16   and #15
+       eor #$ff
+       add #1
+       sta param,x
+       rts
+
+sc2    and #$3f
+       sta dtyp,x
+       sta ltyp,x
+       rts
+
+sc3    and #$80
+       asl @
+       rol @
+       sta kolejn,x
+       lda bajt
+       and #$70
+       lsr @
+       lsr @
+       lsr @
+       lsr @
+       sta ilperm,x
+       sne:sta kolejn,x
+       lda bajt
+       and #15
+       sta dperm,x
+       sta lperm,x
+       lda aperm,x
+       cmp ilperm,x
+       bcc sc0
+       lda ilperm,x
+       seq:sbc #1 ; sec
+       sta aperm,x
+       rts
+
+; init of new song
+i3     sty addr
+       stx addr+1
+
+       ldy #25
+       mva (addr),y+ quadro
+       mva (addr),y+ pokeys
+       mva (addr),y+ pokeys+1
+       mva (addr),y+ pokeys+2
+       mva (addr),y+ pokeys+3
+       lda (addr),y
+       sta tempo
+
+       lda addr ; low byte of instruments data
+       eor #$80
+       smi:inx
+       sta zm8+1
+       stx zm8+2
+
+       eor #$80 ; low byte of pattern data
+       smi:inx
+       sta zm2+1
+       stx zm2+2
+
+       inx      ; high byte of pattern data
+       sta zm3+1
+       stx zm3+2
+
+       inx      ; high byte of instrument data
+       sta zm9+1
+       stx zm9+2
+
+       eor #$80 ; track data
+       smi:inx
+       sta adrsng
+       sta zm0+1
+       sta zm4+1
+       sta zm6+1
+       stx adrsng+1
+       stx zm1+1
+       stx zm5+1
+       stx zm7+1
+
+       mva #$f0 maxvol
+       lda #0
+       sta czygrc
+       sta specialflag
+
+; stop playing
+stop   ldx #7
+       lda #0
+       sta czygrc
+d9     sta czygrx,x
+       sta audctl,x
+       sta vol1ch,x
+
+       ift normal ; !!!
+
+       sta vol2ch,x
+       sta volume,x
+       sta $d230,x
+       sta $d220,x
+
+       eif ; !!!
+
+       sta $d210,x
+       sta $d200,x
+       dex
+       bpl d9
+       sta $d218
+       sta $d208
+
+       ift normal ; !!!
+
+       sta $d238
+       sta $d228
+       sta aud1
+       sta aud2
+
+       eif ; !!!
+       rts
+
+; procedures for play new instrument
+d1     sta vol1ch,x ; if attempt to play empty sound - clear data
+
+       ift normal ; !!!
+
+       sta vol2ch,x
+       sta volume,x
+
+       eif ; !!!
+
+       sta audctl,x
+       rts
+
+d0     tya ; change only volume
+       sta actvol,x
+d3     and #$f0
+       sta actvl1,x
+       lda actvol,x
+
+       ift normal ; !!!
+
+       asl @
+       asl @
+       asl @
+       asl @
+       sta actvl2,x
+
+       eif ; !!!
+
+       rts
+
+d2     and #7
+       sta addr
+       txa
+       ldx addr
+       and #$3f
+       beq d0
+       sta wysdzw,x
+       tya
+       bmi d2-1
+       lda actvol,x
+       jsr d3
+dzwiek mva #0 czygrx,x
+zm9    lda $ffff,y
+       beq d1
+       sta adrsnh,x
+       sta addr+1
+zm8    lda $ffff,y
+       sta adrsnl,x
+       sta addr
+       tya
+       sta numdzw,x
+
+       ldy #8
+       mva (addr),y+ sndlen,x
+       mva (addr),y+ sndlop,x
+       mva (addr),y+ sndfilter,x
+       mva (addr),y+ mainaudctl,x
+       mva (addr),y+ addaudctl,x
+       mva (addr),y+ opad1,x
+       sta lopad1,x
+       mva (addr),y+ opad2,x
+       sta lopad2,x
+       lda (addr),y
+       and #$70
+       lsr @
+       lsr @
+       sta typ,x
+
+       lda (addr),y+
+       bmi d7
+       and #15
+       sta param,x
+       jmp d8
+d7     and #15
+       eor #$ff
+       add #1
+       sta param,x
+
+d8     mva (addr),y+ czekaj,x
+       lda (addr),y+
+       and #$3f
+       sta dtyp,x
+       sta ltyp,x
+       lda (addr),y
+       and #$80
+       asl @
+       rol @
+       sta kolejn,x
+       lda (addr),y
+       and #$70
+       lsr @
+       lsr @
+       lsr @
+       lsr @
+       sta ilperm,x
+       bne d6
+       sta kolejn,x
+d6     lda (addr),y-
+       and #15
+       sta dperm,x
+       sta lperm,x
+       lda (addr),y
+       and #$c0
+       ora wysdzw,x
+       sta wysdzw,x
+       tay
+       lda frqtab,y
+       sta frq,x
+
+       lda #0
+       sta slupy,x
+       sta typdat,x
+       sta opadst,x
+       sta aperm,x
+       sta shiftfrq,x
+       sta shiftnote,x
+       sta shiftfilter,x
+       lda #1
+       sta czygrx,x
+       rts
+
+endplr end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/tm2.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/tm2.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/tmc.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/tmc.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/tmc.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/tmc.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,963 @@
+*---------------*
+*  TMC  Player  *
+*Jaskier/Taquart*
+*---------------*
+
+ org $0500
+
+byte equ $fa
+bajt equ $fb
+addr equ $fc
+adrsng equ $fe
+
+player equ *
+ jmp init
+ jmp play
+ jmp sound
+
+maxvol dta b(15)
+volume dta d'        '
+freqen dta d'        '
+kanal  dta d'        '
+aktwys dta d'        '
+numdzw dta d'        '
+audctl dta d'        '
+aud1   dta b(0)
+aud2   dta b(0)
+
+voltab dta d'                '
+ dta d'        !!!!!!!!'
+ dta d'    !!!!!!!!""""'
+ dta d'   !!!!!"""""###'
+ dta d'  !!!!""""####$$'
+ dta d'  !!!"""###$$$%%'
+ dta d'  !!"""##$$$%%&&'
+ dta d'  !!""##$$%%&&'''''
+ dta d' !!""##$$%%&&''''('
+ dta d' !!""#$$%%&''''(()'
+ dta d' !!"##$%%&''''())*'
+ dta d' !!"#$$%&''''()**+'
+ dta d' !""#$%&&''()**+,'
+ dta d' !"##$%&''()**+,-'
+ dta d' !"#$%&''''()*+,-.'
+ dta d' !"#$%&''()*+,-./'
+
+frqtab dta b(0),b($f1),b($e4),b($d7)
+ dta b($cb),b($c0),b($b5),b($aa)
+ dta b($a1),b($98),b($8f),b($87)
+ dta b($7f),b($78),b($72),b($6b)
+ dta b($65),b($5f),b($5a),b($55)
+ dta b($50),b($4b),b($47),b($43)
+ dta b($3f),b($3c),b($38),b($35)
+ dta b($32),b($2f),b($2c),b($2a)
+ dta b($27),b($25),b($23),b($21)
+ dta b($1f),b($1d),b($1c),b($1a)
+ dta b($18),b($17),b($16),b($14)
+ dta b($13),b($12),b($11),b($10)
+ dta b(15),b(14),b(13),b(12)
+ dta b(11),b(10),b(9),b(8)
+ dta b(7),b(6),b(5),b(4)
+ dta b(3),b(2),b(1),b(0)
+
+ dta b(0),b($f2),b($e6),b($da)
+ dta b($ce),b($bf),b($b6),b($aa)
+ dta b($a1),b($98),b($8f),b($89)
+ dta b($80),b($7a),b($71),b($6b)
+ dta b($65),b($5f),b($5c),b($56)
+ dta b($50),b($4d),b($47),b($44)
+ dta b($3e),b($3c),b($38),b($35)
+ dta b($32),b($2f),b($2d),b($2a)
+ dta b($28),b($25),b($23),b($21)
+ dta b($1f),b($1d),b($1c),b($1a)
+ dta b($18),b($17),b($16),b($14)
+ dta b($13),b($12),b($11),b($10)
+ dta b(15),b(14),b(13),b(12)
+ dta b(11),b(10),b(9),b(8)
+ dta b(7),b(6),b(5),b(4)
+ dta b(3),b(2),b(1),b(0)
+
+ dta b(0),b($ff),b($f1),b($e4)
+ dta b($d8),b($ca),b($c0),b($b5)
+ dta b($ab),b($a2),b($99),b($8e)
+ dta b($87),b($7f),b($79),b($73)
+ dta b($70),b($66),b($61),b($5a)
+ dta b($55),b($52),b($4b),b($48)
+ dta b($43),b($3f),b($3c),b($39)
+ dta b($37),b($33),b($30),b($2d)
+ dta b($2a),b($28),b($25),b($24)
+ dta b($21),b($1f),b($1e),b($1c)
+ dta b($1b),b($19),b($17),b($16)
+ dta b($15),b($13),b($12),b($11)
+ dta b($10),b(15),b(14),b(13)
+ dta b(12),b(11),b(10),b(9)
+ dta b(8),b(7),b(6),b(5)
+ dta b(4),b(3),b(2),b(1)
+
+ dta b(0),b($f3),b($e6),b($d9)
+ dta b($cc),b($c1),b($b5),b($ad)
+ dta b($a2),b($99),b($90),b($88)
+ dta b($80),b($79),b($72),b($6c)
+ dta b($66),b($60),b($5b),b($55)
+ dta b($51),b($4c),b($48),b($44)
+ dta b($40),b($3c),b($39),b($35)
+ dta b($32),b($2f),b($2d),b($2a)
+ dta b($28),b($25),b($23),b($21)
+ dta b($1f),b($1d),b($1c),b($1a)
+ dta b($18),b($17),b($16),b($14)
+ dta b($13),b($12),b($11),b($10)
+ dta b(15),b(14),b(13),b(12)
+ dta b(11),b(10),b(9),b(8)
+ dta b(7),b(6),b(5),b(4)
+ dta b(3),b(2),b(1),b(0)
+
+basslo dta b(0),b($f2),b($33),b($96)
+ dta b($e2),b($38),b($8c),b($00)
+ dta b($6a),b($e8),b($6a),b($ef)
+ dta b($80),b($08),b($ae),b($46)
+ dta b($e6),b($95),b($41),b($f6)
+ dta b($b0),b($6e),b($30),b($f6)
+ dta b($bb),b($84),b($52),b($22)
+ dta b($f4),b($c8),b($a0),b($7a)
+ dta b($55),b($34),b($14),b($f5)
+ dta b($d8),b($bd),b($a4),b($8d)
+ dta b($77),b($60),b($4e),b($38)
+ dta b($27),b($15),b($06),b($f7)
+ dta b($e8),b($db),b($cf),b($c3)
+ dta b($b8),b($ac),b($a2),b($9a)
+ dta b($90),b($88),b($7f),b($78)
+ dta b($70),b($6a),b($64),b($5e)
+
+basshi dta b(0),b(13),b(13),b(12)
+ dta b(11),b(11),b(10),b(10)
+ dta b(9),b(8),b(8),b(7)
+ dta b(7),b(7),b(6),b(6)
+ dta b(5),b(5),b(5),b(4)
+ dta b(4),b(4),b(4),b(3)
+ dta b(3),b(3),b(3),b(3)
+ dta b(2),b(2),b(2),b(2)
+ dta b(2),b(2),b(2),b(1)
+ dta b(1),b(1),b(1),b(1)
+ dta b(1),b(1),b(1),b(1)
+ dta b(1),b(1),b(1),b(0)
+ dta b(0),b(0),b(0),b(0)
+ dta b(0),b(0),b(0),b(0)
+ dta b(0),b(0),b(0),b(0)
+ dta b(0),b(0),b(0),b(0)
+
+czygrx dta d'        '
+pozwpt dta d'        '
+delay  dta d'        '
+numptr dta d'        '
+poddzw dta d'        '
+wysdzw dta d'        '
+znksz  dta d'        '
+frq    dta d'        '
+vol1ch dta d'        '
+vol2ch dta d'        '
+adcvl1 dta d'        '
+adcvl2 dta d'        '
+adrsnl dta d'        '
+adrsnh dta d'        '
+slupy  dta d'        '
+opad1  dta d'        '
+opad2  dta d'        '
+lopad1 dta d'        '
+lopad2 dta d'        '
+typ    dta d'        '
+param  dta d'        '
+pomoc1 dta d'        '
+pomoc2 dta d'        '
+czekaj dta d'        '
+dtyp   dta d'        '
+ltyp   dta d'        '
+ilperm dta d'        '
+aperm  dta d'        '
+dperm  dta d'        '
+lperm  dta d'        '
+kolejn dta d'        '
+tempo  dta b(0)
+ltempo dta b(0)
+pozptr dta b(0)
+czygrc dta b(0)
+
+przeci dta b(4),b(5),b(6),b(7)
+ dta b(0),b(1),b(2),b(3)
+audtb1 dta b(4),b(2),b(0),b(0)
+ dta b(4),b(2),b(0),b(0)
+audtb2 dta b(0),b(16),b(0),b(8)
+ dta b(0),b(16),b(0),b(8)
+
+play lda czygrc
+ beq r1-3
+ lda pozptr
+ cmp #64
+ bcc r1
+ dec ltempo
+ beq *+5
+ jmp sound
+
+ ldx #7
+ lda #0
+p1 sta pozwpt,x
+ sta delay,x
+ dex
+ bpl p1
+ sta pozptr
+ tax
+ ldy #15
+p2 lda (adrsng),y
+ bpl p3
+ dey
+ lda (adrsng),y
+ bpl *+5
+ jmp stop
+ stx addr
+ asl @
+ asl @
+ rol addr
+ asl @
+ rol addr
+ asl @
+ rol addr
+zm0 adc #0
+ sta adrsng
+ lda addr
+zm1 adc #0
+ sta adrsng+1
+ bcc p2-2
+p3 sta numptr,x
+ dey
+ lda (adrsng),y
+ sta poddzw,x
+ inx
+ dey
+ bpl p2
+ clc
+ lda adrsng
+ adc #16
+ sta adrsng
+ bcc *+4
+ inc adrsng+1
+ jmp sound
+
+r1 dec ltempo
+ bpl r1-3
+ inc pozptr
+ lda tempo
+ sta ltempo
+ ldx #7
+r2 dec delay,x
+ bmi *+5
+ jmp r14
+ ldy numptr,x
+zm2 lda $ffff,y
+ sta addr
+zm3 lda $ffff,y
+ sta addr+1
+ ldy pozwpt,x
+r3 lda (addr),y
+ bne r4
+ jsr nparam
+ jmp r13
+r4 cmp #$40
+ bcs r5
+ adc poddzw,x
+ sta wysdzw,x
+ jsr nparam
+ ldy numdzw,x
+ jsr dzwiek
+ jmp r13
+r5 bne r8
+ iny
+ inc pozwpt,x
+ lda (addr),y
+ bpl r6
+ sta bajt
+ jsr nparam
+ lda bajt
+r6 and #$7f
+ bne r7
+ lda #64
+ sta pozptr
+ bne r13
+r7 sta tempo
+ sta ltempo
+ bne r13
+r8 cmp #$80
+ bcs r11
+ and #$3f
+ adc poddzw,x
+ sta wysdzw,x
+ iny
+ inc pozwpt,x
+ lda (addr),y
+ and #127
+ bne r9
+ lda #64
+ sta pozptr
+ bne r10
+r9 sta tempo
+ sta ltempo
+r10 jsr nparam
+ ldy numdzw,x
+ jsr dzwiek
+ jmp r13
+r11 cmp #$c0
+ bcs r12
+ and #$3f
+ sta numdzw,x
+ iny
+ inc pozwpt,x
+ jmp r3
+r12 and #$3f
+ sta delay,x
+r13 inc pozwpt,x
+r14 dex
+ bmi sound
+ jmp r2
+
+sound ldx #7
+p5 lda czygrx,x
+ beq p6
+ jsr graj
+ lda audctl,x
+ and audtb1,x
+ beq p6
+ ldy #71
+ lda (addr),y
+ clc
+ adc aktwys,x
+ sta aktwys+2,x
+ tay
+ lda frqtab,y
+ sec
+ adc pomoc1,x
+ sta frq+2,x
+p6 dex
+ bpl p5
+
+ asl maxvol
+ asl maxvol
+ asl maxvol
+ asl maxvol
+ inx
+ stx addr
+ stx addr+1
+ ldx #7
+p9 txa
+ tay
+ lda vol1ch,y
+ bne p10
+ ldy przeci,x
+ lda vol2ch,y
+ bne p10
+ txa
+ tay
+ lda #0
+p10 sta byte
+ tya
+ sta kanal,x
+ lda frq,y
+ sta freqen,x
+ lda audctl,y
+ sta bajt
+ ora addr+1
+ sta addr+1
+ lda bajt
+ and audtb1,x
+ beq p11
+ lda frq+2,y
+ sta freqen+2,x
+p11 lda bajt
+ and audtb2,x
+ beq p12
+ lda aktwys,y
+ and #$3f
+ tay
+ iny
+ sty addr
+ lda basshi-1,y
+ sta freqen,x
+ jmp p13
+p12 ldy addr
+ beq p13
+ lda basslo-1,y
+ sta freqen,x
+ lda #0
+ sta addr
+p13 lda byte
+ ora maxvol
+ tay
+ lda voltab,y
+ ldy kanal,x
+ ora znksz,y
+ sta volume,x
+ cpx #4
+ bne p14
+ lda addr+1
+ sta aud2
+ lda #0
+ sta addr+1
+p14 dex
+ bpl p9
+ lsr maxvol
+ lsr maxvol
+ lsr maxvol
+ lsr maxvol
+ lda addr+1
+quit ldx #3
+ stx $d21f
+ stx $d20f
+ ldx freqen+4
+ ldy freqen
+ stx $d210
+ sty $d200
+ ldx volume+4
+ ldy volume
+ stx $d211
+ sty $d201
+ ldx freqen+5
+ ldy freqen+1
+ stx $d212
+ sty $d202
+ ldx volume+5
+ ldy volume+1
+ stx $d213
+ sty $d203
+ ldx freqen+6
+ ldy freqen+2
+ stx $d214
+ sty $d204
+ ldx volume+6
+ ldy volume+2
+ stx $d215
+ sty $d205
+ ldx freqen+7
+ ldy freqen+3
+ stx $d216
+ sty $d206
+ ldx volume+7
+ ldy volume+3
+ stx $d217
+ sty $d207
+ sta aud1
+ ldx aud2
+ stx $d218
+ sta $d208
+ rts
+
+graj lda adrsnl,x
+ sta addr
+ lda adrsnh,x
+ sta addr+1
+ ldy slupy,x
+ cpy #63
+ beq n6
+ inc slupy,x
+ inc slupy,x
+ inc slupy,x
+ lda (addr),y
+ and #$f0
+ sta znksz,x
+ lda (addr),y
+ and #15
+ sec
+ sbc adcvl1,x
+ bpl n1
+ lda #0
+n1 sta vol1ch,x
+ iny
+ lda (addr),y
+ and #15
+ sec
+ sbc adcvl2,x
+ bpl n2
+ lda #0
+n2 sta vol2ch,x
+ lda (addr),y
+ and #$f0
+ beq n8
+ bpl n3
+ ldy #73
+ lda (addr),y
+ ldy slupy,x
+ dey
+ dey
+ bpl n4
+n3 lda #0
+n4 sta audctl,x
+ lda (addr),y
+ and #$70
+ beq n9
+ lsr @
+ lsr @
+ sta n5+1
+ lda #0
+ sta pomoc1,x
+ iny
+ lda (addr),y
+n5 bcc *
+ nop
+ nop
+ nop
+ nop
+ jmp a1
+ nop
+ jmp a2
+ nop
+ jmp a3
+ nop
+ jmp a4
+ nop
+ jmp a5
+ nop
+ jmp a6
+ nop
+ jmp a7
+n6 lda opad1,x
+ beq n7
+ dec lopad1,x
+ bne n7
+ sta lopad1,x
+ lda vol1ch,x
+ and #15
+ beq n7
+ dec vol1ch,x
+n7 lda opad2,x
+ beq n8
+ dec lopad2,x
+ bne n8
+ sta lopad2,x
+ lda vol2ch,x
+ and #15
+ beq n8
+ dec vol2ch,x
+n8 ldy #72
+ lda (addr),y
+ sta audctl,x
+n9 lda aperm,x
+ clc
+ adc #63
+ tay
+ lda (addr),y
+ adc wysdzw,x
+ sta aktwys,x
+ tay
+ lda frqtab,y
+ sta frq,x
+ dec lperm,x
+ bpl m1
+ lda dperm,x
+ sta lperm,x
+ lda kolejn,x
+ beq m6
+ clc
+ adc aperm,x
+ sta aperm,x
+ beq m7
+ cmp ilperm,x
+ bne m1
+ lda #$fe
+m7 clc
+ adc #1
+ sta kolejn,x
+ bne m1
+m6 inc aperm,x
+ lda ilperm,x
+ cmp aperm,x
+ bcs m1
+ lda #0
+ sta aperm,x
+m1 lda czekaj,x
+ beq m2
+ dec czekaj,x
+ rts
+m2 lda pomoc2,x
+ sta byte
+ lda param,x
+ sta bajt
+ jsr m4
+ dec ltyp,x
+ bpl m4-1
+ lda byte
+ sta pomoc2,x
+ lda bajt
+ sta param,x
+ lda dtyp,x
+ sta ltyp,x
+ rts
+m4 lda typ,x
+ sta m5+1
+m5 bpl *
+ jmp typ0
+ nop
+ jmp typ1
+ nop
+ jmp typ2
+ nop
+ jmp typ3
+ nop
+ jmp typ4
+ nop
+ jmp typ5
+ nop
+ jmp typ6
+ nop
+ jmp typ7
+
+typ1 lda byte
+ inc byte
+ and #3
+ lsr @
+ bcc t2
+ bne typ6
+ lda bajt
+t1 sta pomoc1,x
+ clc
+ adc frq,x
+ sta frq,x
+typ0 rts
+t2 lda #0
+ sta pomoc1,x
+ rts
+typ2 jsr t5
+ jmp t1
+typ3 jsr t5
+ clc
+ adc aktwys,x
+ jmp a5
+typ4 lda byte
+ sta pomoc1,x
+ clc
+ adc frq,x
+t3 sta frq,x
+ lda byte
+ clc
+ adc bajt
+ sta byte
+ rts
+typ5 lda aktwys,x
+ sec
+ sbc byte
+ sta aktwys,x
+ tay
+ lda frqtab,y
+ jmp t3
+typ6 lda frq,x
+ sec
+ sbc bajt
+ sta frq,x
+ sec
+ lda #0
+ sbc bajt
+ sta pomoc1,x
+ rts
+typ7 lda ltyp,x
+ bne typ0
+ lda bajt
+ bpl t4
+ lda vol2ch,x
+ beq typ0
+ lda vol1ch,x
+ cmp #15
+ beq typ0
+ inc vol1ch,x
+ rts
+t4 lda vol1ch,x
+ beq typ0
+ lda vol2ch,x
+ cmp #15
+ beq typ0
+ inc vol2ch,x
+ rts
+t5 ldy byte
+ lda bajt
+ bmi t6
+ iny
+ iny
+t6 dey
+ tya
+ sta byte
+ cmp bajt
+ bne t7
+ lda bajt
+ eor #$ff
+ sta bajt
+t7 tya
+ rts
+
+a2 adc frq,x
+a1 sta frq,x
+ rts
+a3 ldy wysdzw,x
+ adc frqtab,y
+ sta frq,x
+ tya
+ sta aktwys,x
+ rts
+a4 and $d20a
+ sta frq,x
+ rts
+a7 adc wysdzw,x
+a5 sta aktwys,x
+ tay
+ lda frqtab,y
+ sta frq,x
+ rts
+a6 sta aktwys,x
+ tay
+ lda frq,x
+ adc frqtab,y
+ sta frq,x
+ rts
+
+nparam iny
+ inc pozwpt,x
+ lda (addr),y
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ sta adcvl1,x
+ lda (addr),y
+ and #15
+ sta adcvl2,x
+ rts
+
+songx jsr stop
+ ldy #15
+zm4 lda #0
+ sta adrsng
+zm5 lda #0
+ sta adrsng+1
+d5 txa
+ beq inic
+d3 lda (adrsng),y
+ bpl d4
+ dex
+d4 clc
+ lda adrsng
+ adc #16
+ sta adrsng
+ bcc d5
+ inc adrsng+1
+ bcs d5
+
+playx jsr stop
+ lda #0
+ sta addr
+ txa
+ asl @
+ asl @
+ rol addr
+ asl @
+ rol addr
+ asl @
+ rol addr
+zm6 adc #0
+ sta adrsng
+ lda addr
+zm7 adc #0
+ sta adrsng+1
+inic lda #64
+ sta pozptr
+ lda #1
+ sta ltempo
+ sta czygrc
+ rts
+
+init cmp #$10
+ bcc songx
+ cmp #$20
+ bcc playx
+ cmp #$30
+ bcs *+5
+ jmp d2
+ cmp #$40
+ bcs i1
+ txa
+ and #15
+ beq i1-1
+ sta tempo
+ rts
+i1 cmp #$50
+ bcc stop
+ cmp #$60
+ bcs i2
+ lda #0
+i3 sta czygrc
+ rts
+i2 cmp #$70
+ bcc i3
+
+ lda #1
+ sta ltempo
+ lda #64
+ sta pozptr
+ sty addr
+ stx addr+1
+ ldy #30
+ lda (addr),y
+ sta tempo
+ lda addr
+ clc
+ adc #32
+ sta zm8+1
+ bcc *+3
+ inx
+ stx zm8+2
+ clc
+ adc #$40
+ sta zm9+1
+ bcc *+3
+ inx
+ stx zm9+2
+ clc
+ adc #$40
+ sta zm2+1
+ bcc *+3
+ inx
+ stx zm2+2
+ clc
+ adc #$80
+ sta zm3+1
+ bcc *+3
+ inx
+ stx zm3+2
+ clc
+ adc #$80
+ sta adrsng
+ sta zm0+1
+ sta zm4+1
+ sta zm6+1
+ bcc *+3
+ inx
+ stx adrsng+1
+ stx zm1+1
+ stx zm5+1
+ stx zm7+1
+
+stop ldy #7
+ lda #0
+ sta czygrc
+d9 sta $d200,y
+ sta $d210,y
+ sta volume,y
+ sta vol1ch,y
+ sta vol2ch,y
+ sta audctl,y
+ sta czygrx,y
+ dey
+ bpl d9
+ sta $d208
+ sta $d218
+ sta aud1
+ sta aud2
+ rts
+
+d1 sta vol1ch,x
+ sta vol2ch,x
+ sta audctl,x
+ lda wysdzw,x
+ sta aktwys,x
+ rts
+d0 tya
+ eor #$f0
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ sta adcvl1,x
+ tya
+ and #15
+ eor #15
+ sta adcvl2,x
+ rts
+d2 and #7
+ sta addr
+ txa
+ ldx addr
+ and #$3f
+ beq d0
+ sta wysdzw,x
+dzwiek lda #0
+ sta czygrx,x
+zm8 lda $ffff,y
+ sta adrsnl,x
+ sta addr
+zm9 lda $ffff,y
+ sta adrsnh,x
+ sta addr+1
+ ora addr
+ beq d1
+ ldy #74
+ lda (addr),y
+ sta opad1,x
+ sta lopad1,x
+ iny
+ lda (addr),y
+ sta opad2,x
+ sta lopad2,x
+ iny
+ lda (addr),y
+ and #$70
+ lsr @
+ lsr @
+ sta typ,x
+ lda (addr),y
+ and #15
+ sta param,x
+ lda (addr),y
+ bpl d7
+ lda param,x
+ eor #$ff
+ clc
+ adc #1
+ sta param,x
+d7 iny
+ lda (addr),y
+ sta czekaj,x
+ iny
+ lda (addr),y
+ and #$3f
+ sta dtyp,x
+ sta ltyp,x
+ iny
+ lda (addr),y
+ and #$80
+ beq d8
+ lda #1
+d8 sta kolejn,x
+ lda (addr),y
+ and #$70
+ lsr @
+ lsr @
+ lsr @
+ lsr @
+ sta ilperm,x
+ bne d6
+ sta kolejn,x
+d6 lda (addr),y
+ and #15
+ sta dperm,x
+ sta lperm,x
+ dey
+ lda (addr),y
+ and #$c0
+ clc
+ adc wysdzw,x
+ sta wysdzw,x
+ sta aktwys,x
+ tay
+ lda frqtab,y
+ sta frq,x
+ lda #0
+ sta slupy,x
+ sta pomoc1,x
+ sta pomoc2,x
+ sta aperm,x
+ lda #1
+ sta czygrx,x
+ rts
+
+endplr end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/tmc.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/tmc.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexb.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexb.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexb.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexb.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,103 @@
+HIDE_AUTHOR	equ	0
+	ift	HIDE_AUTHOR
+countdown	equ	$fca7
+	els
+countdown	equ	$fc98
+	eif
+
+	org	$124
+main
+	sei
+	mvy	#0	^4e
+	lda:rne	^4b
+	sta	^40
+	ldx	#29
+	sta:rpl	^00,x-
+	ert	*!=$13a
+	ldx	#8
+init_pokey_1
+	sta	$d210,x
+	sta	$d200,x
+	dex:bpl	init_pokey_1
+	lda	#3
+	sta	$d21f
+	sta	$d200
+
+; check PAL vs NTSC ANTIC
+; possible NTSC GTIA with PAL ANTIC
+	lda	#130
+	cmp:rne	^4b
+:3	sta	^4a
+	lda	^4b
+	sne:inc	ntsc
+
+	lda	song
+	jsr	init
+
+; TODO: support 400/800/600XL
+	mva	#$fe	^31
+	lda	<nmi
+	ldx	$135
+	seq:lda	<nmi_info
+	sta	$fffa
+	mva	>nmi	$fffb
+	mva	#$40	^4e
+
+	lda	#125
+
+player_loop
+	cmp:rne	^4b
+	jsr	player
+	ldx	#0
+ntsc	equ	*-1
+	lda	fastplay_low_bit
+	lsr	@
+	bcc	fastplay_is_even
+	lda	#0
+calls	equ	*-1
+	inc	calls
+	lsr	@
+fastplay_is_even
+	lda	vcount_period,x
+	adc	#125
+expected_vcount	equ	*-1
+	bcs	next_frame
+	cmp	vcount_wrap,x
+	bcc	same_frame
+next_frame
+	sbc	vcount_wrap,x
+	sec
+same_frame
+	sta	expected_vcount
+	lda	frame_period,x
+	adc	#0
+expected_frame	equ	*-1
+	sta	expected_frame
+	cmp	#0
+frame	equ	*-1
+	rne
+	lda	expected_vcount
+	bcs	player_loop	!
+
+nmi_info
+	pha
+	txa:pha
+	ldx	ntsc
+	jsr	countdown
+	pla:tax
+	pla
+nmi
+	inc	frame
+	rti
+
+vcount_wrap	dta	156,131
+init	dta	{jmp 0}
+	opt	o-
+	dta	a(0)
+player	jmp	0
+song	dta	0
+fastplay_low_bit	dta	0
+vcount_period	dta	0,0
+frame_period	dta	0,0
+
+	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexb.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexb.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexd.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexd.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexd.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexd.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,62 @@
+HIDE_AUTHOR	equ	0
+	ift	HIDE_AUTHOR
+countdown	equ	$fca7
+	els
+countdown	equ	$fc98
+	eif
+
+	org	$124
+main
+	sei
+	mvy	#0	^4e
+	lda:rne	^4b
+	sta	^40
+	ldx	#29
+	sta:rpl	^00,x-
+	ert	*!=$13a
+	sta	^2e
+	ldx	#8
+init_pokey_1
+	sta	$d210,x
+	sta	$d200,x
+	dex:bpl	init_pokey_1
+	lda	#3
+	sta	$d21f
+	sta	$d200
+
+; TODO: support 400/800/600XL
+	mva	#$fe	^31
+	lda	player
+	cmp	#{rts}
+	beq	no_player
+	mwa	#nmi	$fffa
+	mva	#$40	^4e
+no_player
+	lda	song
+	cli
+	jmp	init
+
+nmi
+	plp:php	; unblock IRQ if NMI blocked it
+	pha
+	txa:pha
+	tya:pha
+	jsr	player
+	ldx	$135
+	beq	no_info
+	ldx	$d014
+	dex
+	seq:ldx	#1
+	jsr	countdown
+no_info
+	pla:tay
+	pla:tax
+	pla:rti
+
+init	dta	{jmp 0}
+	opt	o-
+	dta	a(0)
+player	jmp	0
+song	dta	0
+
+	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexd.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexd.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexinfo.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexinfo.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexinfo.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexinfo.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,165 @@
+HIDE_AUTHOR	equ	0
+
+font	equ	$fc00
+
+	ift	TEST
+
+	org	$8000
+scr
+	dta	c'404 Error                       '
+:8	dta	$55
+	ift	HIDE_AUTHOR
+hidden
+	dta	c'(press space to show author)    '
+	dta	c'                                '
+author
+	eif
+	dta	c'by Grzegorz Kwiatek (Greg)      '
+	dta	c' & Lukasz Sychowicz (X-Ray)     '
+date
+	dta	c'01/03/2003          STEREO 02:26'
+
+dl
+:22	dta	$70
+	dta	$30,$62,a(scr),8,0
+	ift	HIDE_AUTHOR
+	dta	$42
+dl_author
+	dta	a(hidden),2,$10,$42,a(date)
+	dta	$41,a(dl)
+show_author
+	mwa	#author	dl_author
+	els
+	dta	2,2,$10,2
+	dta	$41,a(dl)
+	eif
+
+	els
+
+	org	$fc50
+	ift	HIDE_AUTHOR
+dl	org	*+39
+
+show_author
+	org	*+10
+	rts
+
+	els
+dl	org	*+32
+	dta	$41,a(dl)
+	eif
+
+	eif
+
+show_info
+	lda:rne	^4b
+	sta	^45
+	mvx	#$26	^16
+	mvx	#$0a	^17
+	mvx	#$21	^40
+	mwx	#dl	^42
+:>font!=>dl	ldx	>font
+	stx	^49
+
+	ift	TEST
+
+	mwa	#vbl	$fffa
+	mva	#$40	^4e
+	jmp	*
+	
+vbl
+	pha
+	txa:pha
+	ldx	$d014
+	dex
+	seq:ldx	#1
+	jsr	countdown
+	pla:tax
+	pla:rti
+
+	els
+
+	rts
+
+	eif
+
+countdown
+	ift	HIDE_AUTHOR
+	lda	#4
+	bit	$d20f
+	bne	no_author
+	lda	$d209
+	cmp	#$21
+	bne	no_author
+	jsr	show_author
+no_author
+	eif
+
+	cld
+	lda	countdown_framerate_lo,x
+	add	#0
+	sta	*-1
+	lda	countdown_framerate_hi,x
+	adc	#0
+	sta	*-1
+	bcc	countdown_skip
+	lda	dl-5
+	ora	dl-4
+	ora	dl-2
+	ora	dl-1
+	cmp	#'1'
+	ldx	#4
+	bcs	countdown_start
+countdown_skip
+	rts
+
+countdown_wrap
+	lda	#'9'
+	cpx	#3
+	sne:lda	#'5'
+	sta	dl-5,x
+countdown_next
+	dex
+countdown_start
+	lda	dl-5,x
+	cmp	#'1'
+	bcc	countdown_wrap
+	cmp	#':'
+	beq	countdown_next
+
+	dec	dl-5,x
+	rts
+
+countdown_framerate_lo	dta	l(312*114/2*65536/[1773447/2],262*114*65536/1789772)
+countdown_framerate_hi	dta	h(312*114/2*65536/[1773447/2],262*114*65536/1789772)
+
+	org	$100
+main
+	sei
+	mvy	#0	^4e
+	lda:rne	^4b
+	sta	^40
+	ldx	#29
+	sta:rpl	^00,x-
+; copy font from ROM, reordering from ANTIC codes to ASCII, semigraphics not needed
+copy_font_1
+	stx	^31	; #$ff
+	lda:pha	$e000,y	; punctuation
+	lda:pha	$e100,y	; uppercase
+	lda	$e300,y	; lowercase
+	dex:stx	^31
+	inx
+	sta	font+$300,y	; lowercase
+	pla:sta	font+$200,y	; uppercase
+	pla:sta	font+$100,y	; punctuation
+	iny
+	bne	copy_font_1
+	jsr	show_info
+	ert	*!=$13a
+
+	ift	TEST
+	jmp	*
+	run	main
+	eif
+
+	end
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/6502/xexinfo.obx and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/6502/xexinfo.obx differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/aatr.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/aatr.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/aatr.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/aatr.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,406 @@
+// aatr.ci - another ATR file extractor
+//
+// Copyright (C) 2012-2019  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/// ATR disk image reader.
+public abstract class AATR
+{
+	/// Reads part of the ATR file to the specified buffer.
+	protected abstract bool Read(
+		/// Offset in the file.
+		int offset,
+		/// Destination buffer.
+		byte[]! buffer,
+		/// Number of bytes to read.
+		int length);
+
+	int BytesPerSector;
+	int Sector4Offset;
+
+	/// Opens an ATR disk image.
+	/// Returns `true` on success.
+	public bool Open!()
+	{
+		byte[6] header;
+		if (!Read(0, header, 6) || header[0] != 0x96 || header[1] != 2)
+			return false;
+		BytesPerSector = header[4] | header[5] << 8;
+		Sector4Offset = 0x190;
+		switch (BytesPerSector) {
+		case 0x80:
+			break;
+		case 0x100:
+			// For 256-byte sectors, the boot sectors are stored as:
+			// a. 3*128 bytes (the more common format)
+			// b. 3*128 bytes followed by 3*128 zero bytes
+			// For correct disk images, (header[2] & 7) should be zero
+			// (i.e. the length of the image should be multiple of 128).
+			// Then (header[2] & 8) != 0 means case a, and (header[2] & 8) == 0 means case b.
+			// However, there are some strange disk images, such as SV2K12_STUFF_AtariDOS.atr,
+			// where (header[2] & 0xf) == 6 while it is case a.
+			// So, assume case b only if (header[2] & 0xf) == 0
+			// and default to the more common case a otherwise.
+			if ((header[2] & 0xf) == 0)
+				Sector4Offset = 0x310;
+			break;
+		default:
+			return false;
+		}
+		return true;
+	}
+
+	/// Returns sector size in bytes.
+	public int GetBytesPerSector() => BytesPerSector;
+
+	internal bool ReadSector(int sectorNo, byte[]! buffer, int length)
+	{
+		int offset;
+		if (sectorNo < 4) {
+			if (sectorNo < 1 || length > 128)
+				return false;
+			offset = (sectorNo << 7) - 0x70;
+		}
+		else
+			offset = Sector4Offset + (sectorNo - 4) * BytesPerSector;
+		return Read(offset, buffer, length);
+	}
+}
+
+/// Forward-only iterator over a directory on an ATR disk image.
+public class AATRDirectory
+{
+	internal AATR Disk;
+	int FirstSector;
+	int FileNo;
+	byte[128] Sector;
+	string() Filename;
+
+	public AATRDirectory()
+	{
+	}
+
+	/// Opens the root directory of the specified disk image.
+	public void OpenRoot!(
+		/// The disk image.
+		AATR disk)
+	{
+		Disk = disk;
+		FirstSector = 361;
+		FileNo = -1;
+	}
+
+	int GetFilenamePart(int sectorOffset, int maxLength)
+	{
+		for (int length = 0; length < maxLength; length++) {
+			int c = Sector[sectorOffset + length];
+			if (c == ' ') {
+				int result = length;
+				// make sure there are no spaces in filename
+				while (++length < maxLength) {
+					if (Sector[sectorOffset + length] != ' ')
+						return -1;
+				}
+				return result;
+			}
+			if ((c >= 'A' && c <= 'Z')
+			 || (c >= '0' && c <= '9')
+			 || c == '_')
+				continue;
+			return -1;
+		}
+		return maxLength;
+	}
+
+	/// Advances to the next entry (file or directory).
+	/// Returns the filename or `null` if no more entries found.
+	public string NextEntry!()
+	{
+		for (;;) {
+			if (FileNo >= 63)
+				return null;
+			FileNo++;
+			int sectorOffset = (FileNo & 7) << 4;
+			if (sectorOffset == 0 && !Disk.ReadSector(FirstSector + (FileNo >> 3), Sector, 128))
+				return null;
+			switch (Sector[sectorOffset] & 0xd7) { // mask out readonly and unused bits
+			case 0x00:
+				return null; // end of directory
+			case 0x40: // DOS 1 file
+				if (Disk.GetBytesPerSector() != 128)
+					continue;
+				break;
+			case 0x42: // DOS 2 file
+			case 0x03: // DOS 2.5 file
+			case 0x46: // MyDOS file
+			case 0x10: // MyDOS directory
+				break;
+			default:
+				continue;
+			}
+			int filenameLength = GetFilenamePart(sectorOffset + 5, 8);
+			if (filenameLength < 0)
+				continue;
+			int extLength = GetFilenamePart(sectorOffset + 13, 3);
+			if (extLength < 0 || (filenameLength == 0 && extLength == 0))
+				continue;
+			Filename = Encoding.UTF8.GetString(Sector, sectorOffset + 5, filenameLength);
+			if (extLength > 0) {
+				Sector[sectorOffset + 12] = '.';
+				string() ext = Encoding.UTF8.GetString(Sector, sectorOffset + 12, 1 + extLength);
+				Filename += ext;
+			}
+			return Filename;
+		}
+	}
+
+	internal int GetEntryType()
+	{
+		int sectorOffset = (FileNo & 7) << 4;
+		return Sector[sectorOffset] & 0xd7;
+	}
+
+	/// Returns `true` if the current entry is a directory.
+	public bool IsEntryDirectory() => GetEntryType() == 0x10;
+
+	internal int GetEntryFirstSector()
+	{
+		int sectorOffset = (FileNo & 7) << 4;
+		return Sector[sectorOffset + 3] | Sector[sectorOffset + 4] << 8;
+	}
+
+	/// Opens the specified subdirectory.
+	public void Open!(
+		/// The iterator pointing at the subdirectory to open.
+		AATRDirectory directory)
+	{
+		Disk = directory.Disk;
+		FirstSector = directory.GetEntryFirstSector();
+		FileNo = -1;
+	}
+
+	/// Advances to the specified entry.
+	/// Returns whether the entry is found.
+	public bool FindEntry!(
+		/// The name of the file or directory to find.
+		string filename)
+	{
+		for (;;) {
+			string currentFilename = NextEntry();
+			if (currentFilename == null)
+				return false;
+			if (currentFilename == filename)
+				return true;
+		}
+	}
+
+	/// Advances to the specified entry, which may be in a subdirectory.
+	/// Returns whether the entry is found.
+	public bool FindEntryRecursively!(
+		/// The name of the file or directory to find, with subdirectories separated with slashes.
+		string path)
+	{
+		int i = 0;
+		int pathLength = path.Length;
+		for (int j = 0; j < pathLength; j++) {
+			if (path[j] == '/') {
+				if (j - i > 12)
+					return false;
+				string() dirname = path.Substring(i, j - i);
+				if (!FindEntry(dirname) || !IsEntryDirectory())
+					return false;
+				Open(this);
+				i = j + 1;
+			}
+		}
+		if (pathLength - i > 12)
+			return false;
+		string() filename = path.Substring(i, pathLength - i);
+		return FindEntry(filename);
+	}
+}
+
+/// Iterator over all files on an ATR disk image.
+public class AATRRecursiveLister
+{
+	const int MaxDepth = 20;
+	AATRDirectory()[MaxDepth] Directories;
+	int Depth;
+	string() DirectoryPath;
+	string() FilePath;
+
+	public AATRRecursiveLister()
+	{
+	}
+
+	/// Opens a disk image.
+	public void Open!(
+		/// The disk image to list files on.
+		AATR disk)
+	{
+		Directories[0].OpenRoot(disk);
+		Depth = 0;
+		DirectoryPath = "";
+	}
+
+	/// Advances to the next file.
+	/// Returns the full path of the file or `null` if no more files found.
+	public string NextFile!()
+	{
+		for (;;) {
+			AATRDirectory! directory = Directories[Depth];
+			string filename = directory.NextEntry();
+			if (filename == null) {
+				if (Depth == 0)
+					return null;
+				int i = DirectoryPath.Length - 1;
+				while (--i >= 0 && DirectoryPath[i] != '/') {
+				}
+				DirectoryPath = DirectoryPath.Substring(0, i + 1);
+				Depth--;
+			}
+			else if (directory.IsEntryDirectory()) {
+				if (Depth >= MaxDepth - 1)
+					continue; // skip too deep directories
+				DirectoryPath += filename;
+				DirectoryPath += "/";
+				Directories[++Depth].Open(directory);
+			}
+			else {
+				// workaround "FilePath = DirectoryPath + filename;" unsupported by cito
+				FilePath = DirectoryPath;
+				FilePath += filename;
+				return FilePath;
+			}
+		}
+	}
+
+	/// Returns the directory iterator pointing at the file found by `NextFile`.
+	public AATRDirectory GetDirectory() => Directories[Depth];
+}
+
+/// Contents of a file on an ATR disk image.
+public class AATRFileStream
+{
+	AATR Disk;
+	int FirstSector;
+	int FileType;
+	int Position;
+	int NextSector;
+	byte[256] Sector;
+	int SectorOffset;
+
+	public AATRFileStream()
+	{
+	}
+
+	void Rewind!()
+	{
+		Position = 0;
+		NextSector = FirstSector;
+		SectorOffset = 255;
+	}
+
+	/// Opens a file.
+	public void Open!(
+		/// Directory iterator pointing at the file to open.
+		AATRDirectory directory)
+	{
+		Disk = directory.Disk;
+		FirstSector = directory.GetEntryFirstSector();
+		FileType = directory.GetEntryType() & 6;
+		Rewind();
+	}
+
+	/// Reads from the open file.
+	/// Returns the number of bytes read.
+	public int Read!(
+		/// Destination buffer.
+		byte[]! buffer,
+		/// Start offset in buffer at which the data is written.
+		int offset,
+		/// Maximum number of bytes to read.
+		int length)
+	{
+		int totalRead = 0;
+		int bytesPerSector = Disk.GetBytesPerSector();
+		while (length > 0) {
+			int got;
+			for (;;) {
+				got = Sector[bytesPerSector - 1];
+				if (FileType == 0) {
+					// DOS 1
+					if (got < 128)
+						got = 125;
+					else
+						got -= 128;
+				}
+				else if (got > bytesPerSector)
+					return -1;
+				got -= SectorOffset;
+				if (got > 0)
+					break;
+				if (!Disk.ReadSector(NextSector, Sector, bytesPerSector))
+					return totalRead;
+				SectorOffset = 0;
+				int sectorHi = Sector[bytesPerSector - 3];
+				if (FileType != 6) // not MyDOS
+					sectorHi &= 3;
+				NextSector = sectorHi << 8 | Sector[bytesPerSector - 2];
+			}
+			if (got > length)
+				got = length;
+			if (buffer != null)
+				Sector.CopyTo(SectorOffset, buffer, offset + totalRead, got);
+			Position += got;
+			SectorOffset += got;
+			totalRead += got;
+			length -= got;
+		}
+		return totalRead;
+	}
+
+	/// Returns the disk image containing this file.
+	public AATR GetDisk() => Disk;
+
+	/// Returns the current position in the open file.
+	public int GetPosition() => Position;
+
+	/// Sets the current position in the open file.
+	/// Returns `true` on success.
+	public bool SetPosition!(
+		/// Requested position.
+		int position)
+	{
+		int toSkip = position - Position;
+		if (toSkip >= 0)
+			return Read(null, 0, toSkip) == toSkip;
+		Rewind();
+		return Read(null, 0, position) == position;
+	}
+
+	/// Returns the length of the open file.
+	public int GetLength!()
+	{
+		int position = GetPosition();
+		int length = position + Read(null, 0, 0x7fffffff - position);
+		SetPosition(position);
+		return length;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/aatr-stdio.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/aatr-stdio.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/aatr-stdio.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/aatr-stdio.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ * aatr-stdio.c - another ATR file extractor
+ *
+ * Copyright (C) 2012-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include "aatr-stdio.h"
+#include "aatr.c"
+
+typedef struct {
+	AATR base;
+	FILE *fp;
+} AATRStdio;
+
+static bool AATRStdio_Read(const AATR *self, int offset, uint8_t *buffer, int length)
+{
+	FILE *fp = ((AATRStdio *) self)->fp;
+	return fseek(fp, offset, SEEK_SET) == 0
+		&& fread(buffer, length, 1, fp) == 1;
+}
+
+AATR *AATRStdio_New(const char *filename)
+{
+	FILE *fp = fopen(filename, "rb");
+	if (fp == NULL)
+		return NULL;
+	AATRStdio *self = (AATRStdio *) malloc(sizeof(AATRStdio));
+	if (self == NULL) {
+		fclose(fp);
+		return NULL;
+	}
+	static const AATRVtbl vtbl = { AATRStdio_Read };
+	self->base.vtbl = &vtbl;
+	self->fp = fp;
+	if (!AATR_Open(&self->base)) {
+		free(self);
+		fclose(fp);
+		return NULL;
+	}
+	return &self->base;
+}
+
+void AATRStdio_Delete(AATR *self)
+{
+	FILE *fp = ((AATRStdio *) self)->fp;
+	free(self);
+	fclose(fp);
+}
+
+#if 0
+int main(int argc, char **argv)
+{
+	AATR *disk = AATRStdio_New("C:\\0\\a8\\SV2K12_STUFF_AtariDOS.atr");
+	AATRRecursiveLister *lister = AATRRecursiveLister_New();
+	AATRFileStream *stream = AATRFileStream_New();
+	if (disk == NULL || lister == NULL || stream == NULL)
+		return 1;
+	AATRRecursiveLister_Open(lister, disk);
+	for (;;) {
+		const char *current_filename = AATRRecursiveLister_NextFile(lister);
+		if (current_filename == NULL)
+			break;
+		AATRFileStream_Open(stream, AATRRecursiveLister_GetDirectory(lister));
+		printf("%s (%d)\n", current_filename, AATRFileStream_GetLength(stream));
+	}
+	return 0;
+}
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/aatr-stdio.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/aatr-stdio.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/aatr-stdio.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/aatr-stdio.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * aatr-stdio.h - another ATR file extractor
+ *
+ * Copyright (C) 2012-2015  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _AATR_STDIO_H_
+#define _AATR_STDIO_H_
+
+#include "aatr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct AATR AATR;
+
+AATR *AATRStdio_New(const char *filename);
+void AATRStdio_Delete(AATR *self);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap6502.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap6502.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap6502.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap6502.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,40 @@
+// asap6502.ci - player routines for the 6502 CPU
+//
+// Copyright (C) 2011-2019  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+static class ASAP6502
+{
+	internal static byte[] GetPlayerRoutine(ASAPInfo info)
+	{
+		switch (info.Type) {
+		case ASAPModuleType.Cmc: return resource<byte[]>("cmc.obx");
+		case ASAPModuleType.Cm3: return resource<byte[]>("cm3.obx");
+		case ASAPModuleType.Cmr: return resource<byte[]>("cmr.obx");
+		case ASAPModuleType.Cms: return resource<byte[]>("cms.obx");
+		case ASAPModuleType.Dlt: return resource<byte[]>("dlt.obx");
+		case ASAPModuleType.Mpt: return resource<byte[]>("mpt.obx");
+		case ASAPModuleType.Rmt: return info.GetChannels() == 1 ? resource<byte[]>("rmt4.obx") : resource<byte[]>("rmt8.obx");
+		case ASAPModuleType.Tmc: return resource<byte[]>("tmc.obx");
+		case ASAPModuleType.Tm2: return resource<byte[]>("tm2.obx");
+		case ASAPModuleType.Fc:  return resource<byte[]>("fc.obx");
+		default: return null;
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,7426 @@
+// Generated automatically with "cito". Do not edit.
+#include <stdlib.h>
+#include <string.h>
+#include "asap.h"
+
+static void CiString_Assign(char **str, char *value)
+{
+	free(*str);
+	*str = value;
+}
+
+static char *CiString_Substring(const char *str, int len)
+{
+	char *p = malloc(len + 1);
+	memcpy(p, str, len);
+	p[len] = '\0';
+	return p;
+}
+
+typedef enum {
+	NmiStatus_RESET,
+	NmiStatus_ON_V_BLANK,
+	NmiStatus_WAS_V_BLANK
+} NmiStatus;
+
+typedef enum {
+	ASAPModuleType_SAP_B,
+	ASAPModuleType_SAP_C,
+	ASAPModuleType_SAP_D,
+	ASAPModuleType_SAP_S,
+	ASAPModuleType_CMC,
+	ASAPModuleType_CM3,
+	ASAPModuleType_CMR,
+	ASAPModuleType_CMS,
+	ASAPModuleType_DLT,
+	ASAPModuleType_MPT,
+	ASAPModuleType_RMT,
+	ASAPModuleType_TMC,
+	ASAPModuleType_TM2,
+	ASAPModuleType_FC
+} ASAPModuleType;
+typedef struct DurationParser DurationParser;
+typedef struct ASAPNativeModuleWriter ASAPNativeModuleWriter;
+typedef struct Cpu6502 Cpu6502;
+
+typedef enum {
+	FlashPackItemType_LITERAL,
+	FlashPackItemType_COPY_TWO_BYTES,
+	FlashPackItemType_COPY_THREE_BYTES,
+	FlashPackItemType_COPY_MANY_BYTES,
+	FlashPackItemType_SET_ADDRESS,
+	FlashPackItemType_END_OF_STREAM
+} FlashPackItemType;
+typedef struct FlashPackItem FlashPackItem;
+typedef struct FlashPack FlashPack;
+typedef struct PokeyChannel PokeyChannel;
+typedef struct Pokey Pokey;
+typedef struct PokeyPair PokeyPair;
+
+struct Cpu6502 {
+	ASAP *asap;
+	uint8_t memory[65536];
+	int cycle;
+	int pc;
+	int a;
+	int x;
+	int y;
+	int s;
+	int nz;
+	int c;
+	int vdi;
+};
+
+static void Cpu6502_Reset(Cpu6502 *self);
+
+static int Cpu6502_Peek(const Cpu6502 *self, int addr);
+
+static void Cpu6502_Poke(Cpu6502 *self, int addr, int data);
+
+static int Cpu6502_PeekReadModifyWrite(Cpu6502 *self, int addr);
+
+static int Cpu6502_Pull(Cpu6502 *self);
+
+static void Cpu6502_PullFlags(Cpu6502 *self);
+
+static void Cpu6502_Push(Cpu6502 *self, int data);
+
+static void Cpu6502_PushPc(Cpu6502 *self);
+
+static void Cpu6502_PushFlags(Cpu6502 *self, int b);
+
+static void Cpu6502_AddWithCarry(Cpu6502 *self, int data);
+
+static void Cpu6502_SubtractWithCarry(Cpu6502 *self, int data);
+
+static int Cpu6502_ArithmeticShiftLeft(Cpu6502 *self, int addr);
+
+static int Cpu6502_RotateLeft(Cpu6502 *self, int addr);
+
+static int Cpu6502_LogicalShiftRight(Cpu6502 *self, int addr);
+
+static int Cpu6502_RotateRight(Cpu6502 *self, int addr);
+
+static int Cpu6502_Decrement(Cpu6502 *self, int addr);
+
+static int Cpu6502_Increment(Cpu6502 *self, int addr);
+
+static void Cpu6502_ExecuteIrq(Cpu6502 *self, int b);
+
+static void Cpu6502_CheckIrq(Cpu6502 *self);
+
+static void Cpu6502_Shx(Cpu6502 *self, int addr, int data);
+
+/**
+ * Runs 6502 emulation for the specified number of Atari scanlines.
+ * Each scanline is 114 cycles of which 9 is taken by ANTIC for memory refresh.
+ * @param self This <code>Cpu6502</code>.
+ */
+static void Cpu6502_DoFrame(Cpu6502 *self, int cycleLimit);
+
+struct PokeyChannel {
+	int audf;
+	int audc;
+	int periodCycles;
+	int tickCycle;
+	int timerCycle;
+	int mute;
+	int out;
+	int delta;
+};
+
+static void PokeyChannel_Initialize(PokeyChannel *self);
+
+static void PokeyChannel_Slope(PokeyChannel *self, Pokey *pokey, const PokeyPair *pokeys, int cycle);
+
+static void PokeyChannel_DoTick(PokeyChannel *self, Pokey *pokey, const PokeyPair *pokeys, int cycle, int ch);
+
+static void PokeyChannel_DoStimer(PokeyChannel *self, int cycle);
+
+static void PokeyChannel_SetMute(PokeyChannel *self, bool enable, int mask, int cycle);
+
+static void PokeyChannel_MuteUltrasound(PokeyChannel *self, int cycle);
+
+static void PokeyChannel_SetAudc(PokeyChannel *self, Pokey *pokey, const PokeyPair *pokeys, int data, int cycle);
+
+static void PokeyChannel_EndFrame(PokeyChannel *self, int cycle);
+
+struct Pokey {
+	PokeyChannel channels[4];
+	int audctl;
+	int skctl;
+	int irqst;
+	bool init;
+	int divCycles;
+	int reloadCycles1;
+	int reloadCycles3;
+	int polyIndex;
+	int deltaBuffer[888];
+	int iirAcc;
+};
+
+static void Pokey_StartFrame(Pokey *self);
+
+static void Pokey_Initialize(Pokey *self);
+
+static void Pokey_AddDelta(Pokey *self, const PokeyPair *pokeys, int cycle, int delta);
+
+/**
+ * Fills <code>DeltaBuffer</code> up to <code>cycleLimit</code> basing on current Audf/Audc/Audctl values.
+ * @param self This <code>Pokey</code>.
+ */
+static void Pokey_GenerateUntilCycle(Pokey *self, const PokeyPair *pokeys, int cycleLimit);
+
+static void Pokey_EndFrame(Pokey *self, const PokeyPair *pokeys, int cycle);
+
+static bool Pokey_IsSilent(const Pokey *self);
+
+static void Pokey_Mute(Pokey *self, int mask);
+
+static void Pokey_InitMute(Pokey *self, int cycle);
+
+static int Pokey_Poke(Pokey *self, const PokeyPair *pokeys, int addr, int data, int cycle);
+
+static int Pokey_CheckIrq(Pokey *self, int cycle, int nextEventCycle);
+
+static int Pokey_StoreSample(Pokey *self, uint8_t *buffer, int bufferOffset, int i, ASAPSampleFormat format);
+
+static void Pokey_AccumulateTrailing(Pokey *self, int i);
+
+struct PokeyPair {
+	uint8_t poly9Lookup[511];
+	uint8_t poly17Lookup[16385];
+	int extraPokeyMask;
+	Pokey basePokey;
+	Pokey extraPokey;
+	int sampleFactor;
+	int sampleOffset;
+	int readySamplesStart;
+	int readySamplesEnd;
+};
+static void PokeyPair_Construct(PokeyPair *self);
+
+static void PokeyPair_Initialize(PokeyPair *self, bool ntsc, bool stereo);
+
+static int PokeyPair_Poke(PokeyPair *self, int addr, int data, int cycle);
+
+static int PokeyPair_Peek(const PokeyPair *self, int addr, int cycle);
+
+static void PokeyPair_StartFrame(PokeyPair *self);
+
+static int PokeyPair_EndFrame(PokeyPair *self, int cycle);
+
+/**
+ * Fills buffer with samples from <code>DeltaBuffer</code>.
+ * @param self This <code>PokeyPair</code>.
+ */
+static int PokeyPair_Generate(PokeyPair *self, uint8_t *buffer, int bufferOffset, int blocks, ASAPSampleFormat format);
+
+static bool PokeyPair_IsSilent(const PokeyPair *self);
+
+/**
+ * Information about a music file.
+ */
+struct ASAPInfo {
+	char *filename;
+	char *author;
+	char *title;
+	char *date;
+	int channels;
+	int songs;
+	int defaultSong;
+	int durations[32];
+	bool loops[32];
+	bool ntsc;
+	ASAPModuleType type;
+	int fastplay;
+	int music;
+	int init;
+	int player;
+	int covoxAddr;
+	int headerLen;
+	uint8_t songPos[32];
+};
+static void ASAPInfo_Construct(ASAPInfo *self);
+static void ASAPInfo_Destruct(ASAPInfo *self);
+
+static bool ASAPInfo_IsValidChar(int c);
+
+static bool ASAPInfo_CheckValidChar(int c);
+
+static bool ASAPInfo_CheckValidText(const char *s);
+
+static bool ASAPInfo_CheckTwoDateDigits(const ASAPInfo *self, int i);
+
+static int ASAPInfo_CheckDate(const ASAPInfo *self);
+
+static int ASAPInfo_GetTwoDateDigits(const ASAPInfo *self, int i);
+
+static int ASAPInfo_GetWord(uint8_t const *array, int i);
+
+static bool ASAPInfo_ParseModule(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static void ASAPInfo_AddSong(ASAPInfo *self, int playerCalls);
+
+static void ASAPInfo_ParseCmcSong(ASAPInfo *self, uint8_t const *module, int pos);
+
+static bool ASAPInfo_ParseCmc(ASAPInfo *self, uint8_t const *module, int moduleLen, ASAPModuleType type);
+
+static bool ASAPInfo_IsDltTrackEmpty(uint8_t const *module, int pos);
+
+static bool ASAPInfo_IsDltPatternEnd(uint8_t const *module, int pos, int i);
+
+static void ASAPInfo_ParseDltSong(ASAPInfo *self, uint8_t const *module, bool *seen, int pos);
+
+static bool ASAPInfo_ParseDlt(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static void ASAPInfo_ParseMptSong(ASAPInfo *self, uint8_t const *module, bool *globalSeen, int songLen, int pos);
+
+static bool ASAPInfo_ParseMpt(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static int ASAPInfo_GetRmtInstrumentFrames(uint8_t const *module, int instrument, int volume, int volumeFrame, bool onExtraPokey);
+
+static void ASAPInfo_ParseRmtSong(ASAPInfo *self, uint8_t const *module, bool *globalSeen, int songLen, int posShift, int pos);
+
+static bool ASAPInfo_ValidateRmt(uint8_t const *module, int moduleLen);
+
+static bool ASAPInfo_ParseRmt(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static void ASAPInfo_ParseTmcSong(ASAPInfo *self, uint8_t const *module, int pos);
+
+static int ASAPInfo_ParseTmcTitle(uint8_t *title, int titleLen, uint8_t const *module, int moduleOffset);
+
+static bool ASAPInfo_ParseTmc(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static void ASAPInfo_ParseTm2Song(ASAPInfo *self, uint8_t const *module, int pos);
+
+static bool ASAPInfo_ParseTm2(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static int ASAPInfo_AfterFF(uint8_t const *module, int moduleLen, int currentOffset);
+
+static int ASAPInfo_GetFcTrackCommand(uint8_t const *module, int const *trackPos, int n);
+
+static bool ASAPInfo_IsFcSongEnd(uint8_t const *module, int const *trackPos);
+
+static bool ASAPInfo_ValidateFc(uint8_t const *module, int moduleLen);
+
+static bool ASAPInfo_ParseFc(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static bool ASAPInfo_HasStringAt(uint8_t const *module, int moduleIndex, const char *s);
+
+static int ASAPInfo_ParseDec(const char *s, int minVal, int maxVal);
+
+static int ASAPInfo_ParseHex(const char *s);
+
+static bool ASAPInfo_ValidateSap(uint8_t const *module, int moduleLen);
+
+static bool ASAPInfo_ParseSap(ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static int ASAPInfo_PackExt(const char *ext);
+
+static int ASAPInfo_GetPackedExt(const char *filename);
+
+static bool ASAPInfo_IsOurPackedExt(int ext);
+
+static int ASAPInfo_GuessPackedExt(uint8_t const *module, int moduleLen);
+
+static int ASAPInfo_GetRmtSapOffset(const ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+static ASAPModuleType ASAPInfo_GetOriginalModuleType(const ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+/**
+ * Atari 8-bit chip music emulator.
+ * This class performs no I/O operations - all music data must be passed in byte arrays.
+ */
+struct ASAP {
+	int nextEventCycle;
+	Cpu6502 cpu;
+	int nextScanlineCycle;
+	NmiStatus nmist;
+	int consol;
+	uint8_t covox[4];
+	PokeyPair pokeys;
+	ASAPInfo moduleInfo;
+	int nextPlayerCycle;
+	int tmcPerFrameCounter;
+	int currentSong;
+	int currentDuration;
+	int blocksPlayed;
+	int silenceCycles;
+	int silenceCyclesCounter;
+	bool gtiaOrCovoxPlayedThisFrame;
+};
+static void ASAP_Construct(ASAP *self);
+static void ASAP_Destruct(ASAP *self);
+
+static int ASAP_PeekHardware(const ASAP *self, int addr);
+
+static void ASAP_PokeHardware(ASAP *self, int addr, int data);
+
+static void ASAP_Call6502(ASAP *self, int addr);
+
+static void ASAP_Call6502Player(ASAP *self);
+
+static bool ASAP_IsIrq(const ASAP *self);
+
+static void ASAP_HandleEvent(ASAP *self);
+
+static int ASAP_Do6502Frame(ASAP *self);
+
+static int ASAP_DoFrame(ASAP *self);
+
+static bool ASAP_Do6502Init(ASAP *self, int pc, int a, int x, int y);
+
+static int ASAP_MillisecondsToBlocks(int milliseconds);
+
+static void ASAP_PutLittleEndian(uint8_t *buffer, int offset, int value);
+
+static void ASAP_PutLittleEndians(uint8_t *buffer, int offset, int value1, int value2);
+
+static int ASAP_PutWavMetadata(uint8_t *buffer, int offset, int fourCC, const char *value);
+
+static int ASAP_GenerateAt(ASAP *self, uint8_t *buffer, int bufferOffset, int bufferLen, ASAPSampleFormat format);
+
+static uint8_t const *ASAP6502_GetPlayerRoutine(const ASAPInfo *info);
+
+struct DurationParser {
+	const char *source;
+	int position;
+	int length;
+};
+
+static int DurationParser_ParseDigit(DurationParser *self, int max);
+
+static int DurationParser_Parse(DurationParser *self, const char *s);
+
+struct ASAPNativeModuleWriter {
+	ASAPWriter *writer;
+	uint8_t const *sourceModule;
+	int sourceOffset;
+	int addressDiff;
+};
+
+static int ASAPNativeModuleWriter_GetByte(const ASAPNativeModuleWriter *self, int offset);
+
+static int ASAPNativeModuleWriter_GetWord(const ASAPNativeModuleWriter *self, int offset);
+
+static bool ASAPNativeModuleWriter_Copy(const ASAPNativeModuleWriter *self, int endOffset);
+
+static bool ASAPNativeModuleWriter_RelocateBytes(const ASAPNativeModuleWriter *self, int lowOffset, int highOffset, int count, int shift);
+
+static bool ASAPNativeModuleWriter_RelocateLowHigh(const ASAPNativeModuleWriter *self, int count);
+
+static bool ASAPNativeModuleWriter_RelocateWords(const ASAPNativeModuleWriter *self, int count);
+
+static bool ASAPNativeModuleWriter_Write(ASAPNativeModuleWriter *self, const ASAPInfo *info, ASAPModuleType type, int moduleLen);
+
+/**
+ * Static methods for writing modules in different formats.
+ */
+struct ASAPWriter {
+	uint8_t *output;
+	int outputOffset;
+	int outputEnd;
+};
+static void ASAPWriter_Construct(ASAPWriter *self);
+
+static void ASAPWriter_TwoDigitsToString(uint8_t *result, int offset, int value);
+
+static bool ASAPWriter_SecondsToString(uint8_t *result, int offset, int value);
+
+static bool ASAPWriter_WriteByte(ASAPWriter *self, int value);
+
+static bool ASAPWriter_WriteWord(ASAPWriter *self, int value);
+
+static bool ASAPWriter_WriteBytes(ASAPWriter *self, uint8_t const *array, int startIndex, int endIndex);
+
+static bool ASAPWriter_WriteString(ASAPWriter *self, const char *s);
+
+static bool ASAPWriter_WriteDec(ASAPWriter *self, int value);
+
+static bool ASAPWriter_WriteTextSapTag(ASAPWriter *self, const char *tag, const char *value);
+
+static bool ASAPWriter_WriteDecSapTag(ASAPWriter *self, const char *tag, int value);
+
+static bool ASAPWriter_WriteHexSapTag(ASAPWriter *self, const char *tag, int value);
+
+static bool ASAPWriter_WriteSapHeader(ASAPWriter *self, const ASAPInfo *info, int type, int init, int player);
+
+static bool ASAPWriter_WriteExecutableHeader(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, int type, int init, int player);
+
+static bool ASAPWriter_WritePlaTaxLda0(ASAPWriter *self);
+
+static bool ASAPWriter_WriteCmcInit(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info);
+
+static bool ASAPWriter_WriteExecutableFromSap(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, int type, uint8_t const *module, int moduleLen);
+
+static int ASAPWriter_WriteExecutableHeaderForSongPos(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, int player, int codeForOneSong, int codeForManySongs, int playerOffset);
+
+static bool ASAPWriter_WriteExecutable(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, uint8_t const *module, int moduleLen);
+
+static int ASAPWriter_PadXexInfo(uint8_t *dest, int offset, int endColumn);
+
+static int ASAPWriter_FormatXexInfoText(uint8_t *dest, int destLen, int endColumn, const char *src, bool author);
+
+static bool ASAPWriter_WriteXexInfoTextDl(ASAPWriter *self, int address, int len, int verticalScrollAt);
+
+static bool ASAPWriter_WriteXexInfo(ASAPWriter *self, const ASAPInfo *info);
+
+static bool ASAPWriter_WriteNative(ASAPWriter *self, const ASAPInfo *info, uint8_t const *module, int moduleLen);
+
+struct FlashPackItem {
+	FlashPackItemType type;
+	int value;
+};
+
+static int FlashPackItem_WriteValueTo(const FlashPackItem *self, uint8_t *buffer, int index);
+
+struct FlashPack {
+	int memory[65536];
+	uint8_t compressed[65536];
+	int compressedLength;
+	FlashPackItem items[64];
+	int itemsCount;
+};
+
+static int FlashPack_FindHole(const FlashPack *self);
+
+static int FlashPack_GetInnerFlags(const FlashPack *self, int index);
+
+static void FlashPack_PutItems(FlashPack *self);
+
+static void FlashPack_PutItem(FlashPack *self, FlashPackItemType type, int value);
+
+static bool FlashPack_IsLiteralPreferred(const FlashPack *self);
+
+static void FlashPack_CompressMemoryArea(FlashPack *self, int startAddress, int endAddress);
+
+static void FlashPack_PutPoke(FlashPack *self, int address, int value);
+
+static bool FlashPack_Compress(FlashPack *self, ASAPWriter *w);
+
+static const uint8_t CiResource_cm3_obx[2022] = {
+	255, 255, 0, 5, 223, 12, 76, 18, 11, 76, 120, 5, 76, 203, 7, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 160, 227, 237, 227, 160, 240, 236, 225,
+	249, 229, 242, 160, 246, 160, 178, 174, 177, 160, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
+	255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 110,
+	5, 142, 111, 5, 140, 112, 5, 41, 112, 74, 74, 74, 170, 189, 148, 11,
+	141, 169, 5, 189, 149, 11, 141, 170, 5, 169, 3, 141, 15, 210, 216, 165,
+	254, 72, 165, 255, 72, 172, 112, 5, 174, 111, 5, 173, 110, 5, 32, 178,
+	5, 104, 133, 255, 104, 133, 254, 96, 173, 118, 5, 133, 254, 173, 119, 5,
+	133, 255, 160, 0, 138, 240, 28, 177, 254, 201, 143, 240, 4, 201, 239, 208,
+	12, 202, 208, 9, 200, 192, 84, 176, 9, 152, 170, 16, 6, 200, 192, 84,
+	144, 229, 96, 142, 104, 5, 32, 123, 6, 169, 0, 162, 9, 157, 69, 5,
+	202, 16, 250, 141, 103, 5, 169, 1, 141, 113, 5, 169, 255, 141, 106, 5,
+	173, 114, 5, 133, 254, 173, 115, 5, 133, 255, 160, 19, 177, 254, 170, 173,
+	118, 5, 133, 254, 173, 119, 5, 133, 255, 172, 104, 5, 177, 254, 201, 207,
+	208, 13, 152, 24, 105, 85, 168, 177, 254, 48, 15, 170, 76, 52, 6, 201,
+	143, 240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 108, 5, 142, 109, 5,
+	96, 41, 15, 240, 245, 142, 221, 10, 142, 243, 10, 142, 2, 11, 140, 222,
+	10, 140, 244, 10, 140, 3, 11, 96, 142, 114, 5, 134, 254, 140, 115, 5,
+	132, 255, 24, 138, 105, 20, 141, 116, 5, 152, 105, 0, 141, 117, 5, 142,
+	118, 5, 200, 200, 140, 119, 5, 160, 19, 177, 254, 141, 108, 5, 141, 109,
+	5, 162, 8, 169, 0, 141, 113, 5, 157, 0, 210, 224, 3, 176, 8, 157,
+	9, 5, 169, 255, 157, 57, 5, 202, 16, 233, 169, 128, 162, 3, 157, 75,
+	5, 202, 16, 250, 96, 169, 1, 141, 113, 5, 169, 0, 240, 238, 41, 3,
+	201, 3, 240, 240, 224, 64, 176, 236, 192, 26, 176, 232, 170, 169, 128, 157,
+	75, 5, 169, 0, 157, 57, 5, 157, 60, 5, 157, 63, 5, 173, 111, 5,
+	157, 12, 5, 173, 112, 5, 10, 10, 10, 133, 254, 24, 173, 114, 5, 105,
+	48, 72, 173, 115, 5, 105, 1, 168, 104, 24, 101, 254, 157, 97, 5, 152,
+	105, 0, 157, 100, 5, 24, 173, 114, 5, 105, 148, 133, 254, 173, 115, 5,
+	105, 0, 133, 255, 173, 112, 5, 10, 109, 112, 5, 10, 168, 177, 254, 157,
+	79, 5, 200, 177, 254, 157, 82, 5, 41, 7, 141, 110, 5, 200, 177, 254,
+	157, 85, 5, 200, 177, 254, 157, 88, 5, 200, 177, 254, 157, 91, 5, 200,
+	177, 254, 157, 94, 5, 160, 0, 173, 110, 5, 201, 3, 208, 2, 160, 2,
+	201, 7, 208, 2, 160, 4, 185, 178, 11, 133, 254, 185, 179, 11, 133, 255,
+	189, 85, 5, 74, 74, 74, 74, 24, 109, 111, 5, 141, 111, 5, 141, 194,
+	7, 168, 173, 110, 5, 201, 7, 208, 15, 152, 10, 168, 177, 254, 157, 45,
+	5, 200, 140, 111, 5, 76, 131, 7, 177, 254, 157, 45, 5, 189, 85, 5,
+	41, 15, 24, 109, 111, 5, 141, 111, 5, 172, 111, 5, 173, 110, 5, 201,
+	5, 8, 177, 254, 40, 240, 8, 221, 45, 5, 208, 3, 56, 233, 1, 157,
+	48, 5, 189, 79, 5, 72, 41, 3, 168, 185, 184, 11, 157, 54, 5, 104,
+	74, 74, 74, 74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10,
+	160, 48, 201, 13, 240, 4, 24, 105, 0, 168, 185, 188, 11, 157, 51, 5,
+	96, 216, 165, 252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 113,
+	5, 208, 3, 76, 5, 11, 173, 78, 5, 240, 3, 76, 110, 9, 173, 108,
+	5, 205, 109, 5, 240, 3, 76, 91, 9, 173, 103, 5, 240, 3, 76, 220,
+	8, 162, 2, 188, 75, 5, 48, 3, 157, 75, 5, 157, 69, 5, 202, 16,
+	242, 173, 118, 5, 133, 252, 173, 119, 5, 133, 253, 172, 104, 5, 132, 254,
+	204, 106, 5, 208, 25, 173, 107, 5, 240, 20, 173, 104, 5, 172, 105, 5,
+	140, 104, 5, 206, 107, 5, 208, 232, 141, 104, 5, 168, 16, 226, 162, 0,
+	177, 252, 201, 254, 208, 14, 172, 104, 5, 200, 196, 254, 240, 67, 140, 104,
+	5, 76, 26, 8, 157, 66, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144,
+	223, 172, 104, 5, 177, 252, 16, 122, 201, 255, 240, 118, 74, 74, 74, 41,
+	14, 170, 189, 164, 11, 141, 126, 8, 189, 165, 11, 141, 127, 8, 173, 67,
+	5, 133, 255, 32, 147, 8, 140, 104, 5, 192, 85, 176, 4, 196, 254, 208,
+	143, 164, 254, 140, 104, 5, 76, 5, 11, 32, 148, 6, 160, 255, 96, 48,
+	251, 168, 96, 48, 247, 56, 152, 229, 255, 168, 96, 48, 239, 24, 152, 101,
+	255, 168, 96, 48, 231, 141, 108, 5, 141, 109, 5, 200, 96, 48, 221, 173,
+	68, 5, 48, 216, 141, 107, 5, 200, 140, 105, 5, 24, 152, 101, 255, 141,
+	106, 5, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239, 208, 243,
+	200, 96, 162, 2, 189, 72, 5, 240, 5, 222, 72, 5, 16, 99, 189, 75,
+	5, 208, 94, 188, 66, 5, 192, 64, 176, 87, 173, 116, 5, 133, 252, 173,
+	117, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177, 252, 133,
+	255, 37, 254, 201, 255, 240, 58, 188, 69, 5, 177, 254, 41, 192, 208, 12,
+	177, 254, 41, 63, 157, 15, 5, 254, 69, 5, 16, 235, 201, 64, 208, 19,
+	177, 254, 41, 63, 141, 111, 5, 189, 15, 5, 141, 112, 5, 32, 188, 6,
+	76, 72, 9, 201, 128, 208, 10, 177, 254, 41, 63, 157, 72, 5, 254, 69,
+	5, 202, 16, 144, 174, 103, 5, 232, 224, 48, 144, 2, 162, 0, 142, 103,
+	5, 206, 109, 5, 208, 14, 173, 108, 5, 141, 109, 5, 173, 103, 5, 208,
+	3, 238, 104, 5, 172, 48, 5, 173, 82, 5, 41, 7, 201, 5, 240, 4,
+	201, 6, 208, 1, 136, 140, 39, 5, 160, 0, 201, 5, 240, 4, 201, 6,
+	208, 2, 160, 2, 201, 7, 208, 2, 160, 40, 140, 44, 5, 162, 2, 189,
+	82, 5, 41, 224, 157, 40, 5, 189, 97, 5, 133, 252, 189, 100, 5, 133,
+	253, 189, 57, 5, 201, 255, 240, 54, 201, 15, 208, 32, 189, 63, 5, 240,
+	45, 222, 63, 5, 189, 63, 5, 208, 37, 188, 9, 5, 240, 1, 136, 152,
+	157, 9, 5, 189, 88, 5, 157, 63, 5, 76, 232, 9, 189, 57, 5, 74,
+	168, 177, 252, 144, 4, 74, 74, 74, 74, 41, 15, 157, 9, 5, 188, 45,
+	5, 189, 82, 5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 48, 5,
+	8, 169, 1, 40, 208, 2, 10, 10, 61, 60, 5, 240, 12, 188, 48, 5,
+	192, 255, 208, 5, 169, 0, 157, 9, 5, 152, 157, 36, 5, 169, 1, 141,
+	110, 5, 189, 57, 5, 201, 15, 240, 56, 41, 7, 168, 185, 208, 12, 133,
+	254, 189, 57, 5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 3, 168, 185,
+	91, 5, 37, 254, 240, 27, 189, 51, 5, 157, 36, 5, 142, 110, 5, 202,
+	16, 8, 141, 39, 5, 169, 0, 141, 44, 5, 232, 189, 54, 5, 157, 40,
+	5, 189, 57, 5, 41, 15, 201, 15, 240, 16, 254, 57, 5, 189, 57, 5,
+	201, 15, 208, 6, 189, 88, 5, 157, 63, 5, 189, 75, 5, 16, 10, 189,
+	9, 5, 208, 5, 169, 64, 157, 75, 5, 254, 60, 5, 160, 0, 189, 82,
+	5, 74, 74, 74, 74, 144, 1, 136, 74, 144, 1, 200, 24, 152, 125, 45,
+	5, 157, 45, 5, 189, 48, 5, 201, 255, 208, 2, 160, 0, 24, 152, 125,
+	48, 5, 157, 48, 5, 202, 48, 3, 76, 153, 9, 173, 40, 5, 141, 43,
+	5, 173, 82, 5, 41, 7, 170, 160, 3, 173, 110, 5, 240, 3, 188, 216,
+	12, 152, 72, 185, 188, 12, 8, 41, 127, 170, 152, 41, 3, 10, 168, 189,
+	36, 5, 153, 0, 210, 200, 189, 9, 5, 224, 3, 208, 3, 173, 9, 5,
+	29, 40, 5, 40, 16, 2, 169, 0, 153, 0, 210, 104, 168, 136, 41, 3,
+	208, 207, 160, 8, 173, 44, 5, 153, 0, 210, 24, 104, 133, 255, 104, 133,
+	254, 104, 133, 253, 104, 133, 252, 96, 104, 170, 240, 78, 201, 2, 240, 6,
+	104, 104, 202, 208, 251, 96, 165, 20, 197, 20, 240, 252, 173, 36, 2, 201,
+	137, 208, 7, 173, 37, 2, 201, 11, 240, 230, 173, 36, 2, 141, 146, 11,
+	173, 37, 2, 141, 147, 11, 169, 137, 141, 36, 2, 169, 11, 141, 37, 2,
+	104, 104, 240, 3, 56, 233, 1, 141, 96, 11, 104, 168, 104, 170, 169, 112,
+	32, 120, 5, 169, 0, 162, 0, 76, 120, 5, 165, 20, 197, 20, 240, 252,
+	173, 36, 2, 201, 137, 208, 174, 173, 37, 2, 201, 11, 208, 167, 173, 146,
+	11, 141, 36, 2, 173, 147, 11, 141, 37, 2, 169, 64, 76, 120, 5, 32,
+	203, 7, 144, 3, 32, 120, 11, 76, 255, 255, 178, 5, 221, 5, 168, 6,
+	59, 6, 123, 6, 148, 6, 159, 6, 82, 6, 147, 8, 153, 8, 157, 8,
+	165, 8, 173, 8, 183, 8, 205, 8, 188, 11, 253, 11, 62, 12, 128, 160,
+	32, 64, 255, 241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120,
+	114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47,
+	44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
+	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+	1, 0, 0, 0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152,
+	143, 137, 128, 122, 113, 107, 101, 95, 0, 86, 80, 103, 96, 90, 85, 81,
+	76, 72, 67, 63, 61, 57, 52, 51, 57, 45, 42, 40, 37, 36, 33, 31,
+	30, 0, 0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3,
+	2, 1, 0, 0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8,
+	239, 7, 128, 7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5,
+	246, 4, 176, 4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3,
+	34, 3, 244, 2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2,
+	245, 1, 216, 1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1,
+	56, 1, 39, 1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0,
+	195, 0, 184, 0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0,
+	120, 0, 112, 0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0,
+	10, 0, 0, 1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0,
+	2, 3, 1, 2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 3, 3,
+	3, 3, 7, 11, 15, 19 };
+static const uint8_t CiResource_cmc_obx[2019] = {
+	255, 255, 0, 5, 220, 12, 76, 15, 11, 76, 120, 5, 76, 203, 7, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 160, 227, 237, 227, 160, 240, 236, 225,
+	249, 229, 242, 160, 246, 160, 178, 174, 177, 160, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
+	255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 110,
+	5, 142, 111, 5, 140, 112, 5, 41, 112, 74, 74, 74, 170, 189, 145, 11,
+	141, 169, 5, 189, 146, 11, 141, 170, 5, 169, 3, 141, 15, 210, 216, 165,
+	254, 72, 165, 255, 72, 172, 112, 5, 174, 111, 5, 173, 110, 5, 32, 178,
+	5, 104, 133, 255, 104, 133, 254, 96, 173, 118, 5, 133, 254, 173, 119, 5,
+	133, 255, 160, 0, 138, 240, 28, 177, 254, 201, 143, 240, 4, 201, 239, 208,
+	12, 202, 208, 9, 200, 192, 84, 176, 9, 152, 170, 16, 6, 200, 192, 84,
+	144, 229, 96, 142, 104, 5, 32, 123, 6, 169, 0, 162, 9, 157, 69, 5,
+	202, 16, 250, 141, 103, 5, 169, 1, 141, 113, 5, 169, 255, 141, 106, 5,
+	173, 114, 5, 133, 254, 173, 115, 5, 133, 255, 160, 19, 177, 254, 170, 173,
+	118, 5, 133, 254, 173, 119, 5, 133, 255, 172, 104, 5, 177, 254, 201, 207,
+	208, 13, 152, 24, 105, 85, 168, 177, 254, 48, 15, 170, 76, 52, 6, 201,
+	143, 240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 108, 5, 142, 109, 5,
+	96, 41, 15, 240, 245, 142, 218, 10, 142, 240, 10, 142, 255, 10, 140, 219,
+	10, 140, 241, 10, 140, 0, 11, 96, 142, 114, 5, 134, 254, 140, 115, 5,
+	132, 255, 24, 138, 105, 20, 141, 116, 5, 152, 105, 0, 141, 117, 5, 142,
+	118, 5, 200, 200, 140, 119, 5, 160, 19, 177, 254, 141, 108, 5, 141, 109,
+	5, 162, 8, 169, 0, 141, 113, 5, 157, 0, 210, 224, 3, 176, 8, 157,
+	9, 5, 169, 255, 157, 57, 5, 202, 16, 233, 169, 128, 162, 3, 157, 75,
+	5, 202, 16, 250, 96, 169, 1, 141, 113, 5, 169, 0, 240, 238, 41, 3,
+	201, 3, 240, 240, 224, 64, 176, 236, 192, 26, 176, 232, 170, 169, 128, 157,
+	75, 5, 169, 0, 157, 57, 5, 157, 60, 5, 157, 63, 5, 173, 111, 5,
+	157, 12, 5, 173, 112, 5, 10, 10, 10, 133, 254, 24, 173, 114, 5, 105,
+	48, 72, 173, 115, 5, 105, 1, 168, 104, 24, 101, 254, 157, 97, 5, 152,
+	105, 0, 157, 100, 5, 24, 173, 114, 5, 105, 148, 133, 254, 173, 115, 5,
+	105, 0, 133, 255, 173, 112, 5, 10, 109, 112, 5, 10, 168, 177, 254, 157,
+	79, 5, 200, 177, 254, 157, 82, 5, 41, 7, 141, 110, 5, 200, 177, 254,
+	157, 85, 5, 200, 177, 254, 157, 88, 5, 200, 177, 254, 157, 91, 5, 200,
+	177, 254, 157, 94, 5, 160, 0, 173, 110, 5, 201, 3, 208, 2, 160, 2,
+	201, 7, 208, 2, 160, 4, 185, 175, 11, 133, 254, 185, 176, 11, 133, 255,
+	189, 85, 5, 74, 74, 74, 74, 24, 109, 111, 5, 141, 111, 5, 141, 194,
+	7, 168, 173, 110, 5, 201, 7, 208, 15, 152, 10, 168, 177, 254, 157, 45,
+	5, 200, 140, 111, 5, 76, 131, 7, 177, 254, 157, 45, 5, 189, 85, 5,
+	41, 15, 24, 109, 111, 5, 141, 111, 5, 172, 111, 5, 173, 110, 5, 201,
+	5, 8, 177, 254, 40, 240, 8, 221, 45, 5, 208, 3, 56, 233, 1, 157,
+	48, 5, 189, 79, 5, 72, 41, 3, 168, 185, 181, 11, 157, 54, 5, 104,
+	74, 74, 74, 74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10,
+	160, 48, 201, 13, 240, 4, 24, 105, 0, 168, 185, 185, 11, 157, 51, 5,
+	96, 216, 165, 252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 113,
+	5, 208, 3, 76, 2, 11, 173, 78, 5, 240, 3, 76, 107, 9, 173, 108,
+	5, 205, 109, 5, 240, 3, 76, 88, 9, 173, 103, 5, 240, 3, 76, 220,
+	8, 162, 2, 188, 75, 5, 48, 3, 157, 75, 5, 157, 69, 5, 202, 16,
+	242, 173, 118, 5, 133, 252, 173, 119, 5, 133, 253, 172, 104, 5, 132, 254,
+	204, 106, 5, 208, 25, 173, 107, 5, 240, 20, 173, 104, 5, 172, 105, 5,
+	140, 104, 5, 206, 107, 5, 208, 232, 141, 104, 5, 168, 16, 226, 162, 0,
+	177, 252, 201, 254, 208, 14, 172, 104, 5, 200, 196, 254, 240, 67, 140, 104,
+	5, 76, 26, 8, 157, 66, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144,
+	223, 172, 104, 5, 177, 252, 16, 122, 201, 255, 240, 118, 74, 74, 74, 41,
+	14, 170, 189, 161, 11, 141, 126, 8, 189, 162, 11, 141, 127, 8, 173, 67,
+	5, 133, 255, 32, 147, 8, 140, 104, 5, 192, 85, 176, 4, 196, 254, 208,
+	143, 164, 254, 140, 104, 5, 76, 2, 11, 32, 148, 6, 160, 255, 96, 48,
+	251, 168, 96, 48, 247, 56, 152, 229, 255, 168, 96, 48, 239, 24, 152, 101,
+	255, 168, 96, 48, 231, 141, 108, 5, 141, 109, 5, 200, 96, 48, 221, 173,
+	68, 5, 48, 216, 141, 107, 5, 200, 140, 105, 5, 24, 152, 101, 255, 141,
+	106, 5, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239, 208, 243,
+	200, 96, 162, 2, 189, 72, 5, 240, 5, 222, 72, 5, 16, 99, 189, 75,
+	5, 208, 94, 188, 66, 5, 192, 64, 176, 87, 173, 116, 5, 133, 252, 173,
+	117, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177, 252, 133,
+	255, 37, 254, 201, 255, 240, 58, 188, 69, 5, 177, 254, 41, 192, 208, 12,
+	177, 254, 41, 63, 157, 15, 5, 254, 69, 5, 16, 235, 201, 64, 208, 19,
+	177, 254, 41, 63, 141, 111, 5, 189, 15, 5, 141, 112, 5, 32, 188, 6,
+	76, 72, 9, 201, 128, 208, 10, 177, 254, 41, 63, 157, 72, 5, 254, 69,
+	5, 202, 16, 144, 174, 103, 5, 232, 138, 41, 63, 141, 103, 5, 206, 109,
+	5, 208, 14, 173, 108, 5, 141, 109, 5, 173, 103, 5, 208, 3, 238, 104,
+	5, 172, 48, 5, 173, 82, 5, 41, 7, 201, 5, 240, 4, 201, 6, 208,
+	1, 136, 140, 39, 5, 160, 0, 201, 5, 240, 4, 201, 6, 208, 2, 160,
+	2, 201, 7, 208, 2, 160, 40, 140, 44, 5, 162, 2, 189, 82, 5, 41,
+	224, 157, 40, 5, 189, 97, 5, 133, 252, 189, 100, 5, 133, 253, 189, 57,
+	5, 201, 255, 240, 54, 201, 15, 208, 32, 189, 63, 5, 240, 45, 222, 63,
+	5, 189, 63, 5, 208, 37, 188, 9, 5, 240, 1, 136, 152, 157, 9, 5,
+	189, 88, 5, 157, 63, 5, 76, 229, 9, 189, 57, 5, 74, 168, 177, 252,
+	144, 4, 74, 74, 74, 74, 41, 15, 157, 9, 5, 188, 45, 5, 189, 82,
+	5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 48, 5, 8, 169, 1,
+	40, 208, 2, 10, 10, 61, 60, 5, 240, 12, 188, 48, 5, 192, 255, 208,
+	5, 169, 0, 157, 9, 5, 152, 157, 36, 5, 169, 1, 141, 110, 5, 189,
+	57, 5, 201, 15, 240, 56, 41, 7, 168, 185, 205, 12, 133, 254, 189, 57,
+	5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 3, 168, 185, 91, 5, 37,
+	254, 240, 27, 189, 51, 5, 157, 36, 5, 142, 110, 5, 202, 16, 8, 141,
+	39, 5, 169, 0, 141, 44, 5, 232, 189, 54, 5, 157, 40, 5, 189, 57,
+	5, 41, 15, 201, 15, 240, 16, 254, 57, 5, 189, 57, 5, 201, 15, 208,
+	6, 189, 88, 5, 157, 63, 5, 189, 75, 5, 16, 10, 189, 9, 5, 208,
+	5, 169, 64, 157, 75, 5, 254, 60, 5, 160, 0, 189, 82, 5, 74, 74,
+	74, 74, 144, 1, 136, 74, 144, 1, 200, 24, 152, 125, 45, 5, 157, 45,
+	5, 189, 48, 5, 201, 255, 208, 2, 160, 0, 24, 152, 125, 48, 5, 157,
+	48, 5, 202, 48, 3, 76, 150, 9, 173, 40, 5, 141, 43, 5, 173, 82,
+	5, 41, 7, 170, 160, 3, 173, 110, 5, 240, 3, 188, 213, 12, 152, 72,
+	185, 185, 12, 8, 41, 127, 170, 152, 41, 3, 10, 168, 189, 36, 5, 153,
+	0, 210, 200, 189, 9, 5, 224, 3, 208, 3, 173, 9, 5, 29, 40, 5,
+	40, 16, 2, 169, 0, 153, 0, 210, 104, 168, 136, 41, 3, 208, 207, 160,
+	8, 173, 44, 5, 153, 0, 210, 24, 104, 133, 255, 104, 133, 254, 104, 133,
+	253, 104, 133, 252, 96, 104, 170, 240, 78, 201, 2, 240, 6, 104, 104, 202,
+	208, 251, 96, 165, 20, 197, 20, 240, 252, 173, 36, 2, 201, 134, 208, 7,
+	173, 37, 2, 201, 11, 240, 230, 173, 36, 2, 141, 143, 11, 173, 37, 2,
+	141, 144, 11, 169, 134, 141, 36, 2, 169, 11, 141, 37, 2, 104, 104, 240,
+	3, 56, 233, 1, 141, 93, 11, 104, 168, 104, 170, 169, 112, 32, 120, 5,
+	169, 0, 162, 0, 76, 120, 5, 165, 20, 197, 20, 240, 252, 173, 36, 2,
+	201, 134, 208, 174, 173, 37, 2, 201, 11, 208, 167, 173, 143, 11, 141, 36,
+	2, 173, 144, 11, 141, 37, 2, 169, 64, 76, 120, 5, 32, 203, 7, 144,
+	3, 32, 117, 11, 76, 255, 255, 178, 5, 221, 5, 168, 6, 59, 6, 123,
+	6, 148, 6, 159, 6, 82, 6, 147, 8, 153, 8, 157, 8, 165, 8, 173,
+	8, 183, 8, 205, 8, 185, 11, 250, 11, 59, 12, 128, 160, 32, 64, 255,
+	241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120, 114, 107, 101,
+	95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47, 44, 42, 39,
+	37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15,
+	14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0,
+	0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128,
+	122, 113, 107, 101, 95, 0, 86, 80, 103, 96, 90, 85, 81, 76, 72, 67,
+	63, 61, 57, 52, 51, 57, 45, 42, 40, 37, 36, 33, 31, 30, 0, 0,
+	15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8, 239, 7, 128,
+	7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5, 246, 4, 176,
+	4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3, 34, 3, 244,
+	2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2, 245, 1, 216,
+	1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1, 56, 1, 39,
+	1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0, 195, 0, 184,
+	0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0, 120, 0, 112,
+	0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0, 10, 0, 0,
+	1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0, 2, 3, 1,
+	2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 3, 3, 3, 3, 7,
+	11, 15, 19 };
+static const uint8_t CiResource_cmr_obx[2019] = {
+	255, 255, 0, 5, 220, 12, 76, 15, 11, 76, 120, 5, 76, 203, 7, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 160, 227, 237, 227, 160, 240, 236, 225,
+	249, 229, 242, 160, 246, 160, 178, 174, 177, 160, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
+	255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 110,
+	5, 142, 111, 5, 140, 112, 5, 41, 112, 74, 74, 74, 170, 189, 145, 11,
+	141, 169, 5, 189, 146, 11, 141, 170, 5, 169, 3, 141, 15, 210, 216, 165,
+	254, 72, 165, 255, 72, 172, 112, 5, 174, 111, 5, 173, 110, 5, 32, 178,
+	5, 104, 133, 255, 104, 133, 254, 96, 173, 118, 5, 133, 254, 173, 119, 5,
+	133, 255, 160, 0, 138, 240, 28, 177, 254, 201, 143, 240, 4, 201, 239, 208,
+	12, 202, 208, 9, 200, 192, 84, 176, 9, 152, 170, 16, 6, 200, 192, 84,
+	144, 229, 96, 142, 104, 5, 32, 123, 6, 169, 0, 162, 9, 157, 69, 5,
+	202, 16, 250, 141, 103, 5, 169, 1, 141, 113, 5, 169, 255, 141, 106, 5,
+	173, 114, 5, 133, 254, 173, 115, 5, 133, 255, 160, 19, 177, 254, 170, 173,
+	118, 5, 133, 254, 173, 119, 5, 133, 255, 172, 104, 5, 177, 254, 201, 207,
+	208, 13, 152, 24, 105, 85, 168, 177, 254, 48, 15, 170, 76, 52, 6, 201,
+	143, 240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 108, 5, 142, 109, 5,
+	96, 41, 15, 240, 245, 142, 218, 10, 142, 240, 10, 142, 255, 10, 140, 219,
+	10, 140, 241, 10, 140, 0, 11, 96, 142, 114, 5, 134, 254, 140, 115, 5,
+	132, 255, 24, 138, 105, 20, 141, 116, 5, 152, 105, 0, 141, 117, 5, 142,
+	118, 5, 200, 200, 140, 119, 5, 160, 19, 177, 254, 141, 108, 5, 141, 109,
+	5, 162, 8, 169, 0, 141, 113, 5, 157, 0, 210, 224, 3, 176, 8, 157,
+	9, 5, 169, 255, 157, 57, 5, 202, 16, 233, 169, 128, 162, 3, 157, 75,
+	5, 202, 16, 250, 96, 169, 1, 141, 113, 5, 169, 0, 240, 238, 41, 3,
+	201, 3, 240, 240, 224, 64, 176, 236, 192, 26, 176, 232, 170, 169, 128, 157,
+	75, 5, 169, 0, 157, 57, 5, 157, 60, 5, 157, 63, 5, 173, 111, 5,
+	157, 12, 5, 173, 112, 5, 10, 10, 10, 133, 254, 24, 173, 114, 5, 105,
+	48, 72, 173, 115, 5, 105, 1, 168, 104, 24, 101, 254, 157, 97, 5, 152,
+	105, 0, 157, 100, 5, 24, 173, 114, 5, 105, 148, 133, 254, 173, 115, 5,
+	105, 0, 133, 255, 173, 112, 5, 10, 109, 112, 5, 10, 168, 177, 254, 157,
+	79, 5, 200, 177, 254, 157, 82, 5, 41, 7, 141, 110, 5, 200, 177, 254,
+	157, 85, 5, 200, 177, 254, 157, 88, 5, 200, 177, 254, 157, 91, 5, 200,
+	177, 254, 157, 94, 5, 160, 0, 173, 110, 5, 201, 3, 208, 2, 160, 2,
+	201, 7, 208, 2, 160, 4, 185, 175, 11, 133, 254, 185, 176, 11, 133, 255,
+	189, 85, 5, 74, 74, 74, 74, 24, 109, 111, 5, 141, 111, 5, 141, 194,
+	7, 168, 173, 110, 5, 201, 7, 208, 15, 152, 10, 168, 177, 254, 157, 45,
+	5, 200, 140, 111, 5, 76, 131, 7, 177, 254, 157, 45, 5, 189, 85, 5,
+	41, 15, 24, 109, 111, 5, 141, 111, 5, 172, 111, 5, 173, 110, 5, 201,
+	5, 8, 177, 254, 40, 240, 8, 221, 45, 5, 208, 3, 56, 233, 1, 157,
+	48, 5, 189, 79, 5, 72, 41, 3, 168, 185, 181, 11, 157, 54, 5, 104,
+	74, 74, 74, 74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10,
+	160, 48, 201, 13, 240, 4, 24, 105, 0, 168, 185, 185, 11, 157, 51, 5,
+	96, 216, 165, 252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 113,
+	5, 208, 3, 76, 2, 11, 173, 78, 5, 240, 3, 76, 107, 9, 173, 108,
+	5, 205, 109, 5, 240, 3, 76, 88, 9, 173, 103, 5, 240, 3, 76, 220,
+	8, 162, 2, 188, 75, 5, 48, 3, 157, 75, 5, 157, 69, 5, 202, 16,
+	242, 173, 118, 5, 133, 252, 173, 119, 5, 133, 253, 172, 104, 5, 132, 254,
+	204, 106, 5, 208, 25, 173, 107, 5, 240, 20, 173, 104, 5, 172, 105, 5,
+	140, 104, 5, 206, 107, 5, 208, 232, 141, 104, 5, 168, 16, 226, 162, 0,
+	177, 252, 201, 254, 208, 14, 172, 104, 5, 200, 196, 254, 240, 67, 140, 104,
+	5, 76, 26, 8, 157, 66, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144,
+	223, 172, 104, 5, 177, 252, 16, 122, 201, 255, 240, 118, 74, 74, 74, 41,
+	14, 170, 189, 161, 11, 141, 126, 8, 189, 162, 11, 141, 127, 8, 173, 67,
+	5, 133, 255, 32, 147, 8, 140, 104, 5, 192, 85, 176, 4, 196, 254, 208,
+	143, 164, 254, 140, 104, 5, 76, 2, 11, 32, 148, 6, 160, 255, 96, 48,
+	251, 168, 96, 48, 247, 56, 152, 229, 255, 168, 96, 48, 239, 24, 152, 101,
+	255, 168, 96, 48, 231, 141, 108, 5, 141, 109, 5, 200, 96, 48, 221, 173,
+	68, 5, 48, 216, 141, 107, 5, 200, 140, 105, 5, 24, 152, 101, 255, 141,
+	106, 5, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239, 208, 243,
+	200, 96, 162, 2, 189, 72, 5, 240, 5, 222, 72, 5, 16, 99, 189, 75,
+	5, 208, 94, 188, 66, 5, 192, 64, 176, 87, 173, 116, 5, 133, 252, 173,
+	117, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177, 252, 133,
+	255, 37, 254, 201, 255, 240, 58, 188, 69, 5, 177, 254, 41, 192, 208, 12,
+	177, 254, 41, 63, 157, 15, 5, 254, 69, 5, 16, 235, 201, 64, 208, 19,
+	177, 254, 41, 63, 141, 111, 5, 189, 15, 5, 141, 112, 5, 32, 188, 6,
+	76, 72, 9, 201, 128, 208, 10, 177, 254, 41, 63, 157, 72, 5, 254, 69,
+	5, 202, 16, 144, 174, 103, 5, 232, 138, 41, 63, 141, 103, 5, 206, 109,
+	5, 208, 14, 173, 108, 5, 141, 109, 5, 173, 103, 5, 208, 3, 238, 104,
+	5, 172, 48, 5, 173, 82, 5, 41, 7, 201, 5, 240, 4, 201, 6, 208,
+	1, 136, 140, 39, 5, 160, 0, 201, 5, 240, 4, 201, 6, 208, 2, 160,
+	2, 201, 7, 208, 2, 160, 40, 140, 44, 5, 162, 2, 189, 82, 5, 41,
+	224, 157, 40, 5, 189, 97, 5, 133, 252, 189, 100, 5, 133, 253, 189, 57,
+	5, 201, 255, 240, 54, 201, 15, 208, 32, 189, 63, 5, 240, 45, 222, 63,
+	5, 189, 63, 5, 208, 37, 188, 9, 5, 240, 1, 136, 152, 157, 9, 5,
+	189, 88, 5, 157, 63, 5, 76, 229, 9, 189, 57, 5, 74, 168, 177, 252,
+	144, 4, 74, 74, 74, 74, 41, 15, 157, 9, 5, 188, 45, 5, 189, 82,
+	5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 48, 5, 8, 169, 1,
+	40, 208, 2, 10, 10, 61, 60, 5, 240, 12, 188, 48, 5, 192, 255, 208,
+	5, 169, 0, 157, 9, 5, 152, 157, 36, 5, 169, 1, 141, 110, 5, 189,
+	57, 5, 201, 15, 240, 56, 41, 7, 168, 185, 205, 12, 133, 254, 189, 57,
+	5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 3, 168, 185, 91, 5, 37,
+	254, 240, 27, 189, 51, 5, 157, 36, 5, 142, 110, 5, 202, 16, 8, 141,
+	39, 5, 169, 0, 141, 44, 5, 232, 189, 54, 5, 157, 40, 5, 189, 57,
+	5, 41, 15, 201, 15, 240, 16, 254, 57, 5, 189, 57, 5, 201, 15, 208,
+	6, 189, 88, 5, 157, 63, 5, 189, 75, 5, 16, 10, 189, 9, 5, 208,
+	5, 169, 64, 157, 75, 5, 254, 60, 5, 160, 0, 189, 82, 5, 74, 74,
+	74, 74, 144, 1, 136, 74, 144, 1, 200, 24, 152, 125, 45, 5, 157, 45,
+	5, 189, 48, 5, 201, 255, 208, 2, 160, 0, 24, 152, 125, 48, 5, 157,
+	48, 5, 202, 48, 3, 76, 150, 9, 173, 40, 5, 141, 43, 5, 173, 82,
+	5, 41, 7, 170, 160, 3, 173, 110, 5, 240, 3, 188, 213, 12, 152, 72,
+	185, 185, 12, 8, 41, 127, 170, 152, 41, 3, 10, 168, 189, 36, 5, 153,
+	0, 210, 200, 189, 9, 5, 224, 3, 208, 3, 173, 9, 5, 29, 40, 5,
+	40, 16, 2, 169, 0, 153, 0, 210, 104, 168, 136, 41, 3, 208, 207, 160,
+	8, 173, 44, 5, 153, 0, 210, 24, 104, 133, 255, 104, 133, 254, 104, 133,
+	253, 104, 133, 252, 96, 104, 170, 240, 78, 201, 2, 240, 6, 104, 104, 202,
+	208, 251, 96, 165, 20, 197, 20, 240, 252, 173, 36, 2, 201, 134, 208, 7,
+	173, 37, 2, 201, 11, 240, 230, 173, 36, 2, 141, 143, 11, 173, 37, 2,
+	141, 144, 11, 169, 134, 141, 36, 2, 169, 11, 141, 37, 2, 104, 104, 240,
+	3, 56, 233, 1, 141, 93, 11, 104, 168, 104, 170, 169, 112, 32, 120, 5,
+	169, 0, 162, 0, 76, 120, 5, 165, 20, 197, 20, 240, 252, 173, 36, 2,
+	201, 134, 208, 174, 173, 37, 2, 201, 11, 208, 167, 173, 143, 11, 141, 36,
+	2, 173, 144, 11, 141, 37, 2, 169, 64, 76, 120, 5, 32, 203, 7, 144,
+	3, 32, 117, 11, 76, 255, 255, 178, 5, 221, 5, 168, 6, 59, 6, 123,
+	6, 148, 6, 159, 6, 82, 6, 147, 8, 153, 8, 157, 8, 165, 8, 173,
+	8, 183, 8, 205, 8, 185, 11, 250, 11, 59, 12, 128, 160, 32, 64, 255,
+	241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120, 114, 107, 101,
+	95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47, 44, 42, 39,
+	37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15,
+	14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0,
+	0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128,
+	122, 113, 107, 101, 95, 92, 86, 80, 77, 71, 68, 65, 62, 56, 53, 136,
+	127, 121, 115, 108, 103, 96, 90, 85, 81, 76, 72, 67, 63, 61, 57, 52,
+	51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 5, 4, 3, 2, 1, 0,
+	0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8, 239, 7, 128,
+	7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5, 246, 4, 176,
+	4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3, 34, 3, 244,
+	2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2, 245, 1, 216,
+	1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1, 56, 1, 39,
+	1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0, 195, 0, 184,
+	0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0, 120, 0, 112,
+	0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0, 10, 0, 0,
+	1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0, 2, 3, 1,
+	2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 3, 3, 3, 3, 7,
+	11, 15, 19 };
+static const uint8_t CiResource_cms_obx[2757] = {
+	255, 255, 0, 5, 190, 15, 234, 234, 234, 76, 21, 8, 76, 96, 15, 35,
+	5, 169, 5, 173, 5, 184, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 128, 128, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 255,
+	255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, 0, 0, 6, 6, 0,
+	128, 20, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15,
+	15, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0,
+	1, 2, 131, 0, 1, 2, 3, 1, 0, 2, 131, 1, 0, 2, 3, 1,
+	2, 128, 3, 128, 64, 32, 16, 8, 4, 2, 1, 75, 8, 118, 8, 133,
+	9, 19, 9, 80, 9, 110, 9, 124, 9, 26, 9, 128, 160, 32, 64, 255,
+	241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120, 114, 107, 101,
+	95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47, 44, 42, 39,
+	37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15,
+	14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0,
+	0, 0, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128,
+	122, 113, 107, 101, 95, 0, 86, 80, 103, 96, 90, 85, 81, 76, 72, 67,
+	63, 61, 57, 52, 51, 57, 45, 42, 40, 37, 36, 33, 31, 30, 0, 0,
+	15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	0, 56, 11, 140, 10, 0, 10, 106, 9, 232, 8, 106, 8, 239, 7, 128,
+	7, 8, 7, 174, 6, 70, 6, 230, 5, 149, 5, 65, 5, 246, 4, 176,
+	4, 110, 4, 48, 4, 246, 3, 187, 3, 132, 3, 82, 3, 34, 3, 244,
+	2, 200, 2, 160, 2, 122, 2, 85, 2, 52, 2, 20, 2, 245, 1, 216,
+	1, 189, 1, 164, 1, 141, 1, 119, 1, 96, 1, 78, 1, 56, 1, 39,
+	1, 21, 1, 6, 1, 247, 0, 232, 0, 219, 0, 207, 0, 195, 0, 184,
+	0, 172, 0, 162, 0, 154, 0, 144, 0, 136, 0, 127, 0, 120, 0, 112,
+	0, 106, 0, 100, 0, 94, 0, 87, 0, 82, 0, 50, 0, 10, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+	0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 0,
+	0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 0,
+	0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 0,
+	0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0,
+	0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 0,
+	0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 0,
+	1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0,
+	1, 1, 2, 2, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 9, 0,
+	1, 1, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, 9, 9, 10, 0,
+	1, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11, 0,
+	1, 2, 2, 3, 4, 5, 6, 7, 8, 9, 9, 10, 11, 11, 12, 0,
+	1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 0,
+	1, 2, 3, 4, 5, 6, 7, 7, 8, 9, 10, 11, 12, 13, 14, 0,
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 6,
+	12, 12, 12, 18, 12, 28, 12, 38, 12, 50, 12, 79, 12, 233, 5, 42,
+	6, 107, 6, 161, 11, 196, 11, 185, 11, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 3, 3, 3, 3, 7, 11, 15, 19, 141, 143, 5, 142, 144,
+	5, 140, 145, 5, 41, 112, 74, 74, 74, 170, 169, 3, 141, 15, 210, 189,
+	213, 5, 141, 73, 8, 189, 214, 5, 141, 74, 8, 169, 3, 141, 31, 210,
+	169, 1, 141, 146, 5, 172, 145, 5, 174, 144, 5, 173, 143, 5, 76, 72,
+	8, 173, 147, 5, 133, 252, 173, 148, 5, 133, 253, 160, 0, 138, 240, 28,
+	177, 252, 201, 143, 240, 4, 201, 239, 208, 12, 202, 208, 9, 200, 192, 84,
+	176, 9, 152, 170, 16, 6, 200, 192, 84, 144, 229, 96, 142, 149, 5, 169,
+	0, 162, 5, 157, 17, 5, 157, 23, 5, 157, 29, 5, 202, 16, 244, 141,
+	150, 5, 141, 157, 5, 160, 255, 140, 159, 5, 173, 153, 5, 133, 252, 173,
+	154, 5, 133, 253, 160, 19, 177, 252, 170, 173, 147, 5, 133, 252, 173, 148,
+	5, 133, 253, 172, 149, 5, 152, 72, 169, 15, 141, 169, 5, 141, 170, 5,
+	177, 252, 201, 135, 208, 35, 152, 72, 24, 105, 85, 168, 177, 252, 16, 2,
+	169, 15, 41, 15, 141, 169, 5, 152, 24, 105, 85, 168, 177, 252, 16, 3,
+	173, 169, 5, 41, 15, 141, 170, 5, 104, 76, 243, 8, 177, 252, 201, 143,
+	240, 7, 201, 239, 240, 3, 136, 16, 199, 104, 168, 177, 252, 201, 207, 208,
+	13, 152, 24, 105, 85, 168, 177, 252, 48, 15, 170, 76, 19, 9, 201, 143,
+	240, 7, 201, 239, 240, 3, 136, 16, 226, 142, 151, 5, 142, 152, 5, 96,
+	142, 153, 5, 134, 252, 140, 154, 5, 132, 253, 24, 138, 105, 20, 141, 155,
+	5, 152, 105, 0, 141, 156, 5, 24, 138, 105, 0, 141, 147, 5, 152, 105,
+	2, 141, 148, 5, 160, 19, 177, 252, 141, 151, 5, 141, 152, 5, 162, 3,
+	142, 31, 210, 142, 15, 210, 169, 0, 141, 146, 5, 160, 8, 169, 0, 153,
+	0, 210, 153, 16, 210, 192, 6, 176, 8, 153, 35, 5, 169, 255, 153, 41,
+	5, 136, 16, 233, 169, 128, 162, 5, 157, 29, 5, 202, 16, 250, 141, 157,
+	5, 96, 169, 0, 240, 240, 141, 157, 5, 240, 11, 173, 143, 5, 41, 7,
+	170, 169, 128, 157, 29, 5, 172, 145, 5, 173, 144, 5, 141, 143, 5, 140,
+	145, 5, 169, 0, 157, 83, 5, 157, 41, 5, 157, 77, 5, 152, 10, 10,
+	10, 133, 254, 24, 173, 153, 5, 105, 48, 72, 173, 154, 5, 105, 1, 168,
+	104, 24, 101, 254, 157, 101, 5, 152, 105, 0, 157, 71, 5, 24, 173, 153,
+	5, 105, 148, 133, 252, 173, 154, 5, 105, 0, 133, 253, 173, 145, 5, 10,
+	109, 145, 5, 10, 168, 140, 145, 5, 200, 200, 200, 200, 200, 177, 252, 157,
+	113, 5, 136, 177, 252, 157, 107, 5, 136, 177, 252, 157, 119, 5, 136, 136,
+	177, 252, 157, 59, 5, 160, 0, 41, 7, 201, 3, 208, 2, 160, 2, 201,
+	7, 208, 2, 160, 4, 185, 247, 7, 133, 254, 185, 248, 7, 133, 255, 172,
+	145, 5, 200, 200, 177, 252, 74, 74, 74, 74, 24, 109, 143, 5, 141, 143,
+	5, 141, 159, 10, 168, 189, 59, 5, 41, 7, 201, 7, 208, 15, 152, 10,
+	168, 177, 254, 157, 125, 5, 200, 140, 143, 5, 76, 92, 10, 177, 254, 157,
+	125, 5, 172, 145, 5, 200, 200, 177, 252, 41, 15, 24, 109, 143, 5, 141,
+	143, 5, 172, 143, 5, 189, 59, 5, 41, 7, 201, 5, 8, 177, 254, 40,
+	240, 8, 221, 125, 5, 208, 3, 56, 233, 1, 157, 89, 5, 172, 145, 5,
+	177, 252, 72, 41, 3, 168, 185, 229, 5, 157, 131, 5, 104, 74, 74, 74,
+	74, 160, 62, 201, 15, 240, 16, 160, 55, 201, 14, 240, 10, 160, 48, 201,
+	13, 240, 4, 24, 105, 50, 168, 185, 233, 5, 157, 137, 5, 96, 216, 165,
+	252, 72, 165, 253, 72, 165, 254, 72, 165, 255, 72, 173, 146, 5, 208, 3,
+	76, 51, 15, 173, 157, 5, 240, 3, 76, 229, 12, 173, 152, 5, 205, 151,
+	5, 176, 3, 76, 210, 12, 173, 150, 5, 240, 3, 76, 158, 11, 162, 5,
+	169, 0, 188, 29, 5, 48, 3, 157, 29, 5, 157, 17, 5, 202, 16, 242,
+	173, 147, 5, 133, 252, 173, 148, 5, 133, 253, 172, 149, 5, 140, 161, 5,
+	204, 159, 5, 208, 25, 173, 160, 5, 240, 20, 173, 149, 5, 172, 158, 5,
+	140, 149, 5, 206, 160, 5, 208, 232, 141, 149, 5, 168, 16, 226, 162, 0,
+	177, 252, 201, 254, 240, 28, 157, 53, 5, 230, 253, 177, 252, 198, 253, 201,
+	254, 240, 15, 157, 56, 5, 24, 152, 105, 85, 168, 232, 224, 3, 144, 224,
+	176, 34, 172, 149, 5, 200, 204, 161, 5, 240, 80, 140, 149, 5, 76, 250,
+	10, 104, 41, 14, 170, 189, 253, 7, 141, 135, 11, 189, 254, 7, 141, 136,
+	11, 76, 129, 11, 172, 149, 5, 177, 252, 16, 57, 201, 255, 240, 53, 74,
+	74, 74, 72, 41, 1, 240, 218, 104, 41, 14, 170, 189, 233, 7, 141, 135,
+	11, 189, 234, 7, 141, 136, 11, 173, 54, 5, 133, 254, 32, 134, 11, 140,
+	149, 5, 192, 85, 176, 5, 204, 161, 5, 208, 179, 172, 161, 5, 140, 149,
+	5, 76, 51, 15, 76, 94, 12, 165, 254, 48, 18, 41, 15, 141, 169, 5,
+	173, 55, 5, 16, 3, 173, 169, 5, 41, 15, 141, 170, 5, 200, 96, 165,
+	254, 48, 250, 41, 1, 141, 184, 5, 200, 96, 173, 179, 5, 48, 20, 206,
+	180, 5, 208, 51, 169, 50, 141, 180, 5, 206, 179, 5, 208, 41, 206, 179,
+	5, 200, 96, 165, 254, 48, 214, 141, 180, 5, 238, 180, 5, 165, 254, 48,
+	204, 141, 180, 5, 238, 180, 5, 173, 55, 5, 141, 179, 5, 16, 5, 169,
+	0, 141, 179, 5, 238, 179, 5, 104, 104, 76, 229, 12, 32, 110, 9, 160,
+	255, 96, 165, 254, 48, 249, 168, 96, 165, 254, 48, 243, 56, 152, 229, 254,
+	168, 96, 165, 254, 48, 233, 24, 152, 101, 254, 168, 96, 165, 254, 48, 223,
+	141, 151, 5, 141, 152, 5, 200, 96, 165, 254, 48, 211, 173, 55, 5, 48,
+	206, 200, 140, 158, 5, 24, 152, 101, 254, 141, 159, 5, 173, 55, 5, 141,
+	160, 5, 192, 84, 96, 136, 48, 10, 177, 252, 201, 143, 240, 4, 201, 239,
+	208, 243, 200, 96, 162, 5, 189, 23, 5, 240, 5, 222, 23, 5, 16, 91,
+	189, 29, 5, 208, 86, 188, 53, 5, 192, 64, 176, 79, 173, 155, 5, 133,
+	252, 173, 156, 5, 133, 253, 177, 252, 133, 254, 24, 152, 105, 64, 168, 177,
+	252, 133, 255, 201, 255, 176, 52, 188, 17, 5, 177, 254, 41, 192, 208, 12,
+	177, 254, 41, 63, 157, 47, 5, 254, 17, 5, 16, 235, 201, 64, 208, 13,
+	177, 254, 41, 63, 188, 47, 5, 32, 150, 9, 76, 194, 12, 201, 128, 208,
+	10, 177, 254, 41, 63, 157, 23, 5, 254, 17, 5, 202, 16, 152, 174, 150,
+	5, 232, 138, 41, 63, 141, 150, 5, 206, 152, 5, 208, 14, 173, 151, 5,
+	141, 152, 5, 173, 150, 5, 208, 3, 238, 149, 5, 172, 89, 5, 173, 59,
+	5, 41, 7, 201, 5, 240, 4, 201, 6, 208, 1, 136, 140, 162, 5, 160,
+	0, 201, 5, 240, 4, 201, 6, 208, 2, 160, 2, 201, 7, 208, 2, 160,
+	40, 140, 164, 5, 172, 92, 5, 173, 62, 5, 41, 7, 201, 5, 240, 4,
+	201, 6, 208, 1, 136, 140, 163, 5, 160, 0, 201, 5, 240, 4, 201, 6,
+	208, 2, 160, 2, 201, 7, 208, 2, 160, 40, 140, 165, 5, 162, 5, 189,
+	59, 5, 41, 224, 157, 65, 5, 189, 101, 5, 133, 252, 189, 71, 5, 133,
+	253, 189, 41, 5, 201, 255, 240, 55, 201, 15, 208, 33, 189, 77, 5, 240,
+	46, 222, 77, 5, 189, 77, 5, 208, 38, 188, 35, 5, 240, 1, 136, 152,
+	157, 35, 5, 189, 119, 5, 157, 77, 5, 136, 76, 137, 13, 189, 41, 5,
+	74, 168, 177, 252, 144, 4, 74, 74, 74, 74, 41, 15, 157, 35, 5, 188,
+	125, 5, 189, 59, 5, 41, 7, 201, 1, 208, 31, 136, 152, 200, 221, 89,
+	5, 8, 169, 1, 40, 208, 2, 10, 10, 61, 83, 5, 240, 12, 188, 89,
+	5, 192, 255, 208, 5, 169, 0, 157, 35, 5, 152, 157, 95, 5, 169, 1,
+	141, 168, 5, 189, 41, 5, 201, 15, 240, 76, 41, 7, 168, 185, 205, 5,
+	133, 254, 189, 41, 5, 41, 8, 8, 138, 40, 24, 240, 2, 105, 6, 168,
+	185, 107, 5, 37, 254, 240, 47, 189, 137, 5, 157, 95, 5, 142, 168, 5,
+	202, 224, 2, 240, 15, 224, 255, 208, 22, 141, 162, 5, 169, 0, 141, 164,
+	5, 76, 9, 14, 173, 140, 5, 141, 163, 5, 169, 0, 141, 165, 5, 232,
+	189, 131, 5, 157, 65, 5, 189, 41, 5, 41, 15, 201, 15, 240, 18, 254,
+	41, 5, 189, 41, 5, 41, 15, 201, 15, 208, 6, 189, 119, 5, 157, 77,
+	5, 189, 29, 5, 16, 10, 189, 35, 5, 208, 5, 169, 64, 157, 29, 5,
+	254, 83, 5, 160, 0, 189, 59, 5, 74, 74, 74, 74, 144, 1, 136, 74,
+	144, 1, 200, 24, 152, 125, 125, 5, 157, 125, 5, 189, 89, 5, 201, 255,
+	208, 2, 160, 0, 24, 152, 125, 89, 5, 157, 89, 5, 202, 48, 3, 76,
+	57, 13, 32, 127, 15, 173, 65, 5, 141, 166, 5, 173, 68, 5, 141, 167,
+	5, 173, 59, 5, 41, 7, 32, 185, 15, 152, 72, 185, 185, 5, 8, 41,
+	127, 170, 152, 41, 3, 10, 168, 224, 3, 208, 3, 76, 200, 14, 189, 173,
+	5, 208, 39, 189, 95, 5, 153, 0, 210, 189, 35, 5, 29, 65, 5, 40,
+	16, 2, 169, 0, 153, 1, 210, 104, 168, 136, 41, 3, 240, 3, 76, 131,
+	14, 173, 164, 5, 141, 8, 210, 76, 232, 14, 40, 76, 177, 14, 173, 173,
+	5, 208, 23, 173, 162, 5, 153, 0, 210, 173, 35, 5, 13, 166, 5, 40,
+	16, 2, 169, 0, 153, 1, 210, 76, 177, 14, 40, 76, 177, 14, 173, 62,
+	5, 41, 7, 32, 185, 15, 152, 72, 185, 185, 5, 8, 41, 127, 170, 152,
+	41, 3, 10, 168, 224, 3, 208, 3, 76, 64, 15, 189, 176, 5, 208, 30,
+	189, 98, 5, 153, 16, 210, 189, 38, 5, 29, 68, 5, 40, 16, 2, 169,
+	0, 153, 17, 210, 104, 168, 136, 41, 3, 240, 7, 76, 240, 14, 40, 76,
+	30, 15, 173, 165, 5, 141, 24, 210, 24, 104, 133, 255, 104, 133, 254, 104,
+	133, 253, 104, 133, 252, 96, 173, 176, 5, 208, 23, 173, 163, 5, 153, 16,
+	210, 173, 38, 5, 13, 167, 5, 40, 16, 2, 169, 0, 153, 17, 210, 76,
+	30, 15, 40, 76, 30, 15, 32, 168, 10, 176, 25, 173, 184, 5, 240, 20,
+	173, 157, 5, 141, 183, 5, 169, 1, 141, 157, 5, 32, 168, 10, 173, 183,
+	5, 141, 157, 5, 96, 173, 169, 5, 10, 10, 10, 10, 141, 171, 5, 173,
+	170, 5, 10, 10, 10, 10, 141, 172, 5, 162, 2, 134, 200, 173, 171, 5,
+	29, 35, 5, 170, 189, 233, 6, 166, 200, 157, 35, 5, 173, 172, 5, 29,
+	38, 5, 170, 189, 233, 6, 166, 200, 157, 38, 5, 202, 16, 221, 96, 168,
+	185, 13, 8, 168, 96 };
+static const uint8_t CiResource_dlt_obx[2125] = {
+	255, 255, 0, 4, 70, 12, 255, 241, 228, 215, 203, 192, 181, 170, 161, 152,
+	143, 135, 127, 121, 114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60,
+	56, 53, 50, 47, 44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23,
+	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 255, 241, 228, 215, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143,
+	137, 128, 122, 113, 107, 101, 95, 92, 86, 80, 103, 96, 90, 85, 81, 76,
+	72, 67, 63, 61, 57, 52, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30,
+	28, 27, 25, 0, 22, 21, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+	1, 0, 242, 233, 218, 206, 242, 233, 218, 206, 191, 182, 170, 161, 152, 143,
+	137, 128, 122, 113, 107, 101, 95, 92, 86, 80, 103, 96, 90, 85, 81, 76,
+	72, 67, 63, 61, 57, 52, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30,
+	28, 27, 25, 0, 22, 21, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+	1, 0, 242, 233, 218, 206, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153,
+	142, 135, 127, 120, 115, 108, 102, 97, 90, 85, 81, 75, 72, 67, 63, 60,
+	57, 52, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23,
+	22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 3, 2, 1, 255, 76, 9, 5, 76, 200, 5, 76, 183, 5, 136,
+	140, 54, 3, 169, 126, 141, 53, 3, 162, 6, 142, 51, 3, 162, 1, 142,
+	52, 3, 32, 51, 5, 32, 95, 5, 32, 163, 5, 32, 139, 5, 169, 1,
+	141, 50, 3, 169, 3, 141, 15, 210, 96, 162, 0, 160, 32, 142, 48, 3,
+	140, 49, 3, 160, 0, 173, 48, 3, 153, 0, 2, 173, 49, 3, 153, 64,
+	2, 173, 48, 3, 24, 105, 128, 141, 48, 3, 144, 3, 238, 49, 3, 200,
+	192, 64, 208, 225, 96, 162, 0, 160, 68, 142, 48, 3, 140, 49, 3, 160,
+	0, 173, 48, 3, 153, 128, 2, 173, 49, 3, 153, 160, 2, 173, 48, 3,
+	24, 105, 64, 141, 48, 3, 144, 3, 238, 49, 3, 200, 192, 32, 208, 225,
+	96, 173, 0, 76, 41, 1, 74, 106, 106, 168, 162, 0, 185, 128, 4, 157,
+	64, 4, 200, 232, 224, 64, 208, 244, 96, 160, 3, 169, 0, 153, 40, 3,
+	153, 32, 3, 153, 36, 3, 153, 44, 3, 136, 16, 241, 96, 169, 0, 141,
+	50, 3, 160, 7, 169, 0, 153, 0, 210, 136, 16, 250, 96, 96, 173, 50,
+	3, 240, 250, 173, 40, 3, 13, 41, 3, 13, 42, 3, 13, 43, 3, 141,
+	8, 210, 174, 36, 3, 172, 32, 3, 142, 0, 210, 140, 1, 210, 174, 37,
+	3, 172, 33, 3, 142, 2, 210, 140, 3, 210, 174, 38, 3, 172, 34, 3,
+	142, 4, 210, 140, 5, 210, 174, 39, 3, 172, 35, 3, 142, 6, 210, 140,
+	7, 210, 206, 52, 3, 208, 74, 173, 51, 3, 141, 52, 3, 238, 53, 3,
+	238, 53, 3, 16, 28, 238, 54, 3, 169, 0, 141, 53, 3, 32, 199, 6,
+	173, 4, 3, 13, 5, 3, 13, 6, 3, 13, 7, 3, 208, 3, 76, 183,
+	5, 173, 4, 3, 240, 3, 32, 97, 7, 173, 5, 3, 240, 3, 32, 192,
+	7, 173, 6, 3, 240, 3, 32, 31, 8, 173, 7, 3, 240, 3, 32, 126,
+	8, 173, 4, 3, 240, 8, 173, 44, 3, 240, 3, 32, 221, 8, 173, 5,
+	3, 240, 8, 173, 45, 3, 240, 3, 32, 206, 9, 173, 6, 3, 240, 8,
+	173, 46, 3, 240, 3, 32, 191, 10, 173, 7, 3, 240, 8, 173, 47, 3,
+	240, 3, 32, 131, 11, 96, 192, 67, 144, 14, 169, 0, 141, 4, 3, 141,
+	32, 3, 141, 40, 3, 76, 230, 6, 192, 66, 208, 15, 189, 128, 64, 141,
+	51, 3, 141, 52, 3, 238, 54, 3, 76, 199, 6, 192, 65, 208, 9, 189,
+	128, 64, 141, 54, 3, 76, 199, 6, 104, 104, 76, 183, 5, 174, 54, 3,
+	188, 0, 64, 192, 64, 176, 191, 189, 128, 64, 141, 24, 3, 185, 0, 2,
+	133, 224, 185, 64, 2, 133, 225, 169, 1, 141, 4, 3, 188, 0, 65, 192,
+	64, 176, 78, 189, 128, 65, 141, 25, 3, 185, 0, 2, 133, 226, 185, 64,
+	2, 133, 227, 169, 1, 141, 5, 3, 188, 0, 66, 192, 64, 176, 63, 189,
+	128, 66, 141, 26, 3, 185, 0, 2, 133, 228, 185, 64, 2, 133, 229, 169,
+	1, 141, 6, 3, 188, 0, 67, 192, 64, 176, 48, 189, 128, 67, 141, 27,
+	3, 185, 0, 2, 133, 230, 185, 64, 2, 133, 231, 169, 1, 141, 7, 3,
+	96, 169, 0, 141, 5, 3, 141, 33, 3, 141, 41, 3, 240, 186, 169, 0,
+	141, 6, 3, 141, 34, 3, 141, 42, 3, 240, 201, 169, 0, 141, 7, 3,
+	141, 35, 3, 141, 43, 3, 96, 172, 53, 3, 177, 224, 48, 11, 200, 177,
+	224, 48, 1, 96, 104, 104, 76, 31, 6, 24, 109, 24, 3, 41, 127, 141,
+	8, 3, 169, 15, 141, 0, 3, 141, 44, 3, 200, 177, 224, 170, 189, 160,
+	2, 133, 233, 133, 241, 133, 249, 189, 128, 2, 133, 232, 73, 16, 133, 240,
+	73, 48, 133, 248, 160, 49, 177, 232, 141, 12, 3, 160, 51, 177, 232, 41,
+	127, 141, 16, 3, 169, 0, 141, 20, 3, 141, 28, 3, 160, 48, 177, 232,
+	41, 213, 141, 40, 3, 96, 172, 53, 3, 177, 226, 48, 11, 200, 177, 226,
+	48, 1, 96, 104, 104, 76, 31, 6, 24, 109, 25, 3, 41, 127, 141, 9,
+	3, 169, 15, 141, 1, 3, 141, 45, 3, 200, 177, 226, 170, 189, 160, 2,
+	133, 235, 133, 243, 133, 251, 189, 128, 2, 133, 234, 73, 16, 133, 242, 73,
+	48, 133, 250, 160, 49, 177, 234, 141, 13, 3, 160, 51, 177, 234, 41, 127,
+	141, 17, 3, 169, 0, 141, 21, 3, 141, 29, 3, 160, 48, 177, 234, 41,
+	131, 141, 41, 3, 96, 172, 53, 3, 177, 228, 48, 11, 200, 177, 228, 48,
+	1, 96, 104, 104, 76, 31, 6, 24, 109, 26, 3, 41, 127, 141, 10, 3,
+	169, 15, 141, 2, 3, 141, 46, 3, 200, 177, 228, 170, 189, 160, 2, 133,
+	237, 133, 245, 133, 253, 189, 128, 2, 133, 236, 73, 16, 133, 244, 73, 48,
+	133, 252, 160, 49, 177, 236, 141, 14, 3, 160, 51, 177, 236, 41, 127, 141,
+	18, 3, 169, 0, 141, 22, 3, 141, 30, 3, 160, 48, 177, 236, 41, 169,
+	141, 42, 3, 96, 172, 53, 3, 177, 230, 48, 11, 200, 177, 230, 48, 1,
+	96, 104, 104, 76, 31, 6, 24, 109, 27, 3, 41, 127, 141, 11, 3, 169,
+	15, 141, 3, 3, 141, 47, 3, 200, 177, 230, 170, 189, 160, 2, 133, 239,
+	133, 247, 133, 255, 189, 128, 2, 133, 238, 73, 16, 133, 246, 73, 48, 133,
+	254, 160, 49, 177, 238, 141, 15, 3, 160, 51, 177, 238, 41, 127, 141, 19,
+	3, 169, 0, 141, 23, 3, 141, 31, 3, 160, 48, 177, 238, 41, 129, 141,
+	43, 3, 96, 172, 0, 3, 48, 70, 177, 232, 141, 32, 3, 177, 240, 208,
+	9, 32, 108, 9, 206, 0, 3, 76, 79, 9, 201, 1, 240, 39, 201, 3,
+	208, 16, 173, 8, 3, 24, 113, 248, 170, 173, 28, 3, 141, 55, 3, 76,
+	24, 9, 173, 28, 3, 24, 113, 248, 141, 55, 3, 174, 8, 3, 32, 150,
+	9, 206, 0, 3, 96, 177, 248, 141, 36, 3, 206, 0, 3, 96, 32, 108,
+	9, 160, 49, 177, 232, 240, 30, 206, 12, 3, 240, 3, 76, 79, 9, 173,
+	32, 3, 41, 15, 240, 11, 206, 32, 3, 177, 232, 141, 12, 3, 76, 79,
+	9, 141, 44, 3, 96, 173, 28, 3, 24, 160, 50, 113, 232, 141, 28, 3,
+	206, 16, 3, 208, 12, 238, 20, 3, 160, 51, 177, 232, 41, 127, 141, 16,
+	3, 96, 173, 20, 3, 41, 3, 24, 105, 52, 168, 177, 232, 170, 160, 51,
+	177, 232, 48, 14, 138, 109, 8, 3, 170, 173, 28, 3, 141, 55, 3, 76,
+	150, 9, 138, 109, 28, 3, 141, 55, 3, 174, 8, 3, 189, 0, 4, 24,
+	109, 55, 3, 141, 36, 3, 173, 40, 3, 41, 4, 208, 1, 96, 172, 0,
+	3, 177, 240, 208, 21, 138, 24, 160, 0, 113, 248, 170, 189, 0, 4, 24,
+	109, 55, 3, 24, 105, 255, 141, 38, 3, 96, 173, 36, 3, 24, 105, 255,
+	141, 38, 3, 96, 172, 1, 3, 48, 70, 177, 234, 141, 33, 3, 177, 242,
+	208, 9, 32, 93, 10, 206, 1, 3, 76, 64, 10, 201, 1, 240, 39, 201,
+	3, 208, 16, 173, 9, 3, 24, 113, 250, 170, 173, 29, 3, 141, 55, 3,
+	76, 9, 10, 173, 29, 3, 24, 113, 250, 141, 55, 3, 174, 9, 3, 32,
+	135, 10, 206, 1, 3, 96, 177, 250, 141, 37, 3, 206, 1, 3, 96, 32,
+	93, 10, 160, 49, 177, 234, 240, 30, 206, 13, 3, 240, 3, 76, 64, 10,
+	173, 33, 3, 41, 15, 240, 11, 206, 33, 3, 177, 234, 141, 13, 3, 76,
+	64, 10, 141, 45, 3, 96, 173, 29, 3, 24, 160, 50, 113, 234, 141, 29,
+	3, 206, 17, 3, 208, 12, 238, 21, 3, 160, 51, 177, 234, 41, 127, 141,
+	17, 3, 96, 173, 21, 3, 41, 3, 24, 105, 52, 168, 177, 234, 170, 160,
+	51, 177, 234, 48, 14, 138, 109, 9, 3, 170, 173, 29, 3, 141, 55, 3,
+	76, 135, 10, 138, 109, 29, 3, 141, 55, 3, 174, 9, 3, 189, 0, 4,
+	24, 109, 55, 3, 141, 37, 3, 173, 41, 3, 41, 2, 208, 1, 96, 172,
+	1, 3, 177, 242, 208, 21, 138, 24, 160, 0, 113, 250, 170, 189, 0, 4,
+	24, 109, 55, 3, 24, 105, 255, 141, 39, 3, 96, 173, 37, 3, 24, 105,
+	255, 141, 39, 3, 96, 172, 2, 3, 48, 70, 177, 236, 141, 34, 3, 177,
+	244, 208, 9, 32, 78, 11, 206, 2, 3, 76, 49, 11, 201, 1, 240, 39,
+	201, 3, 208, 16, 173, 10, 3, 24, 113, 252, 170, 173, 30, 3, 141, 55,
+	3, 76, 250, 10, 173, 30, 3, 24, 113, 252, 141, 55, 3, 174, 10, 3,
+	32, 120, 11, 206, 2, 3, 96, 177, 252, 141, 38, 3, 206, 2, 3, 96,
+	32, 78, 11, 160, 49, 177, 236, 240, 30, 206, 14, 3, 240, 3, 76, 49,
+	11, 173, 34, 3, 41, 15, 240, 11, 206, 34, 3, 177, 236, 141, 14, 3,
+	76, 49, 11, 141, 46, 3, 96, 173, 30, 3, 24, 160, 50, 113, 236, 141,
+	30, 3, 206, 18, 3, 208, 12, 238, 22, 3, 160, 51, 177, 236, 41, 127,
+	141, 18, 3, 96, 173, 22, 3, 41, 3, 24, 105, 52, 168, 177, 236, 170,
+	160, 51, 177, 236, 48, 14, 138, 109, 10, 3, 170, 173, 30, 3, 141, 55,
+	3, 76, 120, 11, 138, 109, 30, 3, 141, 55, 3, 174, 10, 3, 189, 0,
+	4, 24, 109, 55, 3, 141, 38, 3, 96, 172, 3, 3, 48, 70, 177, 238,
+	141, 35, 3, 177, 246, 208, 9, 32, 18, 12, 206, 3, 3, 76, 245, 11,
+	201, 1, 240, 39, 201, 3, 208, 16, 173, 11, 3, 24, 113, 254, 170, 173,
+	31, 3, 141, 55, 3, 76, 190, 11, 173, 31, 3, 24, 113, 254, 141, 55,
+	3, 174, 11, 3, 32, 60, 12, 206, 3, 3, 96, 177, 254, 141, 39, 3,
+	206, 3, 3, 96, 32, 18, 12, 160, 49, 177, 238, 240, 30, 206, 15, 3,
+	240, 3, 76, 245, 11, 173, 35, 3, 41, 15, 240, 11, 206, 35, 3, 177,
+	238, 141, 15, 3, 76, 245, 11, 141, 47, 3, 96, 173, 31, 3, 24, 160,
+	50, 113, 238, 141, 31, 3, 206, 19, 3, 208, 12, 238, 23, 3, 160, 51,
+	177, 238, 41, 127, 141, 19, 3, 96, 173, 23, 3, 41, 3, 24, 105, 52,
+	168, 177, 238, 170, 160, 51, 177, 238, 48, 14, 138, 109, 11, 3, 170, 173,
+	31, 3, 141, 55, 3, 76, 60, 12, 138, 109, 31, 3, 141, 55, 3, 174,
+	11, 3, 189, 0, 4, 24, 109, 55, 3, 141, 39, 3, 96 };
+static const uint8_t CiResource_fc_obx[1220] = {
+	255, 255, 0, 4, 189, 8, 76, 9, 4, 32, 16, 4, 76, 173, 5, 162,
+	0, 160, 10, 32, 25, 5, 162, 8, 189, 172, 8, 157, 0, 210, 157, 16,
+	210, 202, 16, 244, 96, 133, 244, 162, 0, 134, 230, 134, 232, 134, 234, 169,
+	0, 133, 231, 133, 233, 133, 235, 133, 236, 133, 238, 133, 240, 133, 237, 133,
+	239, 133, 241, 138, 160, 2, 162, 4, 32, 9, 5, 136, 202, 202, 16, 248,
+	162, 4, 32, 160, 4, 202, 202, 16, 249, 169, 255, 197, 230, 240, 34, 197,
+	232, 240, 30, 197, 234, 240, 26, 169, 254, 160, 0, 209, 224, 240, 18, 209,
+	226, 240, 14, 209, 228, 240, 10, 177, 224, 49, 226, 49, 228, 201, 255, 208,
+	207, 162, 4, 32, 153, 4, 202, 202, 16, 249, 166, 230, 228, 232, 176, 2,
+	166, 232, 228, 234, 176, 2, 166, 234, 232, 198, 244, 208, 140, 138, 96, 181,
+	231, 240, 2, 246, 230, 96, 161, 224, 201, 254, 176, 29, 181, 230, 201, 255,
+	240, 23, 181, 237, 208, 17, 161, 224, 201, 64, 144, 28, 208, 3, 32, 196,
+	4, 32, 196, 4, 76, 160, 4, 214, 237, 96, 246, 224, 208, 2, 246, 225,
+	180, 230, 200, 240, 2, 246, 230, 96, 168, 185, 191, 8, 133, 242, 185, 31,
+	9, 133, 243, 180, 231, 246, 231, 177, 242, 201, 64, 144, 22, 201, 96, 144,
+	23, 201, 255, 144, 238, 169, 0, 149, 237, 149, 236, 149, 231, 32, 196, 4,
+	76, 160, 4, 181, 236, 149, 237, 96, 41, 31, 149, 236, 76, 221, 4, 72,
+	24, 121, 159, 9, 149, 224, 169, 0, 121, 162, 9, 149, 225, 104, 96, 134,
+	252, 132, 253, 72, 160, 2, 177, 252, 162, 0, 157, 127, 9, 24, 113, 252,
+	232, 224, 32, 144, 245, 165, 252, 166, 253, 24, 105, 3, 144, 1, 232, 141,
+	159, 9, 142, 162, 9, 232, 141, 160, 9, 142, 163, 9, 232, 141, 161, 9,
+	142, 164, 9, 232, 133, 254, 134, 255, 24, 105, 128, 144, 1, 232, 133, 252,
+	134, 253, 162, 0, 160, 0, 165, 252, 153, 191, 8, 165, 253, 153, 31, 9,
+	161, 252, 230, 252, 208, 2, 230, 253, 201, 255, 208, 244, 200, 192, 64, 144,
+	229, 162, 0, 165, 252, 157, 255, 8, 165, 253, 157, 95, 9, 160, 0, 177,
+	252, 200, 201, 255, 208, 249, 152, 24, 101, 252, 133, 252, 144, 2, 230, 253,
+	232, 224, 32, 144, 222, 104, 240, 3, 32, 31, 4, 141, 190, 8, 169, 64,
+	141, 170, 8, 44, 170, 8, 48, 39, 80, 53, 169, 0, 162, 11, 157, 125,
+	8, 202, 16, 250, 141, 170, 8, 162, 2, 169, 8, 157, 167, 8, 173, 190,
+	8, 157, 122, 8, 202, 16, 242, 169, 80, 141, 180, 8, 76, 233, 5, 169,
+	0, 162, 7, 157, 172, 8, 202, 16, 250, 169, 128, 141, 170, 8, 96, 238,
+	171, 8, 162, 2, 134, 30, 232, 138, 10, 168, 132, 31, 202, 189, 159, 9,
+	133, 28, 189, 162, 9, 133, 29, 189, 128, 8, 240, 3, 76, 240, 6, 188,
+	122, 8, 177, 28, 201, 64, 240, 14, 201, 255, 240, 24, 201, 254, 208, 45,
+	141, 170, 8, 76, 203, 7, 200, 177, 28, 141, 180, 8, 200, 152, 157, 122,
+	8, 76, 9, 6, 173, 190, 8, 157, 122, 8, 169, 80, 141, 180, 8, 169,
+	0, 157, 128, 8, 157, 131, 8, 157, 125, 8, 76, 9, 6, 72, 41, 128,
+	240, 11, 254, 122, 8, 104, 41, 15, 157, 167, 8, 16, 178, 104, 168, 185,
+	191, 8, 133, 28, 185, 31, 9, 133, 29, 189, 131, 8, 157, 128, 8, 169,
+	0, 157, 158, 8, 188, 125, 8, 177, 28, 48, 7, 10, 48, 36, 74, 76,
+	177, 6, 10, 10, 168, 177, 254, 157, 137, 8, 200, 177, 254, 157, 143, 8,
+	200, 177, 254, 157, 146, 8, 200, 177, 254, 157, 149, 8, 254, 125, 8, 76,
+	110, 6, 74, 41, 31, 170, 189, 127, 9, 166, 30, 157, 128, 8, 157, 131,
+	8, 254, 125, 8, 76, 110, 6, 157, 155, 8, 24, 125, 167, 8, 168, 224,
+	0, 208, 15, 185, 242, 7, 141, 172, 8, 185, 50, 8, 141, 174, 8, 76,
+	215, 6, 185, 196, 7, 157, 134, 8, 164, 31, 153, 172, 8, 169, 0, 157,
+	140, 8, 254, 125, 8, 188, 125, 8, 177, 28, 201, 255, 208, 8, 169, 0,
+	157, 125, 8, 254, 122, 8, 189, 137, 8, 168, 185, 255, 8, 141, 6, 7,
+	185, 95, 9, 141, 7, 7, 166, 30, 188, 140, 8, 185, 255, 255, 201, 255,
+	240, 39, 16, 16, 164, 31, 153, 173, 8, 169, 0, 153, 172, 8, 254, 140,
+	8, 76, 148, 7, 164, 31, 254, 140, 8, 29, 143, 8, 153, 173, 8, 224,
+	0, 240, 6, 189, 134, 8, 153, 172, 8, 189, 146, 8, 240, 35, 173, 171,
+	8, 41, 1, 208, 5, 189, 146, 8, 208, 2, 169, 0, 141, 78, 7, 24,
+	189, 155, 8, 105, 2, 125, 167, 8, 168, 185, 196, 7, 164, 31, 153, 172,
+	8, 189, 149, 8, 240, 52, 48, 32, 188, 152, 8, 254, 152, 8, 185, 181,
+	8, 201, 31, 208, 7, 169, 0, 157, 152, 8, 240, 236, 24, 125, 134, 8,
+	164, 31, 153, 172, 8, 76, 148, 7, 189, 134, 8, 201, 255, 240, 11, 254,
+	134, 8, 254, 134, 8, 164, 31, 153, 172, 8, 189, 158, 8, 240, 41, 189,
+	161, 8, 240, 6, 222, 161, 8, 76, 194, 7, 189, 158, 8, 16, 10, 24,
+	189, 134, 8, 125, 164, 8, 76, 186, 7, 56, 189, 134, 8, 253, 164, 8,
+	157, 134, 8, 164, 31, 153, 172, 8, 222, 128, 8, 202, 48, 3, 76, 238,
+	5, 96, 255, 241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120,
+	114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47,
+	44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 23, 22, 19, 15, 7, 0,
+	56, 140, 0, 106, 232, 106, 239, 128, 8, 174, 70, 230, 149, 65, 246, 176,
+	110, 48, 246, 187, 132, 82, 34, 244, 200, 160, 122, 85, 52, 20, 245, 216,
+	189, 164, 141, 119, 96, 78, 56, 39, 21, 6, 247, 232, 219, 207, 195, 184,
+	172, 162, 154, 144, 136, 127, 120, 112, 106, 100, 94, 87, 82, 50, 10, 0,
+	11, 10, 10, 9, 8, 8, 7, 7, 7, 6, 6, 5, 5, 5, 4, 4,
+	4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 0, 0, 1, 1, 0,
+	0, 255, 255, 31 };
+static const uint8_t CiResource_mpt_obx[2233] = {
+	255, 255, 0, 5, 178, 13, 76, 205, 11, 173, 46, 7, 208, 1, 96, 169,
+	0, 141, 28, 14, 238, 29, 14, 173, 23, 14, 205, 187, 13, 144, 80, 206,
+	21, 14, 240, 3, 76, 197, 5, 162, 0, 142, 23, 14, 169, 0, 157, 237,
+	13, 157, 245, 13, 189, 179, 13, 133, 236, 189, 183, 13, 133, 237, 172, 22,
+	14, 177, 236, 200, 201, 255, 240, 7, 201, 254, 208, 15, 76, 42, 12, 177,
+	236, 48, 249, 10, 168, 140, 22, 14, 76, 59, 5, 157, 233, 13, 177, 236,
+	157, 213, 13, 232, 224, 4, 208, 196, 200, 140, 22, 14, 76, 197, 5, 206,
+	21, 14, 16, 87, 173, 188, 13, 141, 21, 14, 162, 3, 222, 245, 13, 16,
+	68, 189, 233, 13, 10, 168, 185, 255, 255, 133, 236, 200, 185, 255, 255, 133,
+	237, 5, 236, 240, 48, 189, 237, 13, 141, 31, 14, 32, 62, 7, 172, 31,
+	14, 200, 152, 157, 237, 13, 189, 241, 13, 157, 245, 13, 224, 2, 208, 21,
+	189, 197, 13, 73, 15, 10, 10, 10, 10, 105, 69, 141, 161, 13, 169, 10,
+	105, 0, 141, 162, 13, 202, 16, 180, 238, 23, 14, 162, 1, 173, 27, 14,
+	201, 2, 240, 2, 162, 3, 173, 27, 14, 201, 2, 208, 5, 236, 25, 14,
+	240, 3, 76, 118, 6, 181, 240, 61, 114, 6, 240, 18, 160, 40, 177, 236,
+	24, 125, 225, 13, 32, 117, 9, 56, 125, 1, 14, 157, 203, 13, 202, 16,
+	213, 169, 3, 141, 15, 210, 165, 241, 41, 16, 240, 15, 172, 226, 13, 185,
+	198, 9, 141, 201, 13, 185, 5, 10, 141, 202, 13, 173, 201, 13, 141, 0,
+	210, 173, 202, 13, 141, 2, 210, 173, 203, 13, 141, 4, 210, 173, 204, 13,
+	141, 6, 210, 173, 193, 13, 162, 255, 172, 27, 14, 192, 1, 208, 5, 174,
+	25, 14, 240, 3, 141, 1, 210, 173, 194, 13, 224, 1, 240, 3, 141, 3,
+	210, 192, 2, 240, 20, 173, 195, 13, 224, 2, 240, 3, 141, 5, 210, 173,
+	196, 13, 224, 3, 240, 3, 141, 7, 210, 165, 240, 5, 241, 5, 242, 5,
+	243, 13, 28, 14, 141, 8, 210, 96, 4, 2, 0, 0, 189, 217, 13, 133,
+	236, 189, 221, 13, 133, 237, 5, 236, 208, 8, 157, 193, 13, 149, 240, 76,
+	248, 5, 180, 244, 192, 32, 240, 66, 177, 236, 56, 253, 197, 13, 44, 58,
+	7, 240, 2, 41, 240, 157, 193, 13, 200, 177, 236, 141, 30, 14, 200, 148,
+	244, 41, 7, 240, 60, 168, 185, 126, 9, 141, 203, 6, 185, 133, 9, 141,
+	204, 6, 173, 30, 14, 74, 74, 74, 74, 74, 9, 40, 168, 177, 236, 24,
+	32, 255, 255, 169, 0, 149, 240, 76, 248, 5, 189, 9, 14, 240, 18, 222,
+	13, 14, 208, 13, 157, 13, 14, 189, 193, 13, 41, 15, 240, 3, 222, 193,
+	13, 160, 35, 177, 236, 149, 240, 189, 17, 14, 24, 105, 37, 168, 41, 3,
+	157, 17, 14, 136, 177, 236, 125, 209, 13, 157, 225, 13, 32, 119, 9, 157,
+	201, 13, 189, 5, 14, 240, 6, 222, 5, 14, 76, 223, 5, 189, 189, 13,
+	141, 30, 7, 16, 254, 76, 194, 8, 0, 76, 229, 8, 0, 76, 251, 8,
+	0, 76, 21, 9, 0, 76, 37, 9, 0, 76, 56, 9, 0, 76, 66, 9,
+	16, 76, 72, 9, 169, 0, 157, 197, 13, 172, 31, 14, 136, 200, 177, 236,
+	201, 254, 208, 4, 140, 31, 14, 96, 201, 224, 144, 8, 173, 187, 13, 141,
+	23, 14, 208, 233, 201, 208, 144, 10, 41, 15, 141, 188, 13, 141, 21, 14,
+	16, 219, 201, 192, 144, 9, 41, 15, 73, 15, 157, 197, 13, 16, 206, 201,
+	128, 144, 7, 41, 63, 157, 241, 13, 16, 195, 201, 64, 144, 27, 200, 140,
+	31, 14, 41, 31, 157, 229, 13, 10, 168, 185, 255, 255, 157, 217, 13, 200,
+	185, 255, 255, 157, 221, 13, 76, 62, 7, 140, 31, 14, 141, 30, 14, 24,
+	125, 213, 13, 157, 209, 13, 173, 27, 14, 240, 66, 201, 2, 240, 58, 189,
+	229, 13, 201, 31, 208, 55, 173, 30, 14, 56, 233, 1, 41, 15, 168, 177,
+	254, 133, 253, 152, 9, 16, 168, 177, 254, 133, 248, 160, 1, 5, 253, 208,
+	2, 160, 0, 140, 26, 14, 169, 0, 133, 252, 157, 217, 13, 157, 221, 13,
+	138, 10, 141, 24, 14, 142, 25, 14, 96, 224, 2, 176, 99, 189, 217, 13,
+	133, 238, 189, 221, 13, 133, 239, 5, 238, 240, 74, 160, 32, 177, 238, 41,
+	15, 157, 249, 13, 177, 238, 41, 112, 74, 74, 157, 189, 13, 200, 177, 238,
+	10, 10, 72, 41, 63, 157, 5, 14, 104, 41, 192, 157, 205, 13, 200, 177,
+	238, 157, 9, 14, 157, 13, 14, 169, 0, 149, 244, 157, 17, 14, 157, 253,
+	13, 157, 1, 14, 189, 209, 13, 157, 225, 13, 32, 117, 9, 157, 201, 13,
+	236, 25, 14, 240, 1, 96, 160, 255, 140, 25, 14, 200, 140, 26, 14, 96,
+	224, 2, 208, 51, 172, 211, 13, 185, 69, 11, 141, 121, 13, 185, 129, 11,
+	141, 127, 13, 169, 0, 133, 249, 133, 250, 173, 231, 13, 41, 15, 168, 177,
+	254, 133, 251, 152, 9, 16, 168, 177, 254, 141, 137, 13, 5, 251, 208, 6,
+	141, 121, 13, 141, 127, 13, 96, 173, 232, 13, 41, 15, 168, 177, 254, 133,
+	253, 152, 9, 16, 168, 177, 254, 5, 253, 240, 15, 177, 254, 56, 229, 253,
+	133, 248, 169, 0, 133, 252, 169, 141, 208, 2, 169, 173, 141, 97, 13, 141,
+	56, 13, 169, 24, 141, 7, 210, 96, 173, 29, 14, 41, 7, 74, 74, 144,
+	18, 208, 24, 189, 249, 13, 24, 157, 1, 14, 125, 201, 13, 157, 201, 13,
+	76, 223, 5, 169, 0, 157, 1, 14, 76, 223, 5, 189, 201, 13, 56, 253,
+	249, 13, 157, 201, 13, 56, 169, 0, 253, 249, 13, 157, 1, 14, 76, 223,
+	5, 189, 253, 13, 24, 157, 1, 14, 125, 201, 13, 157, 201, 13, 24, 189,
+	253, 13, 125, 249, 13, 157, 253, 13, 76, 223, 5, 189, 225, 13, 56, 253,
+	253, 13, 157, 225, 13, 32, 117, 9, 76, 5, 9, 169, 0, 56, 253, 253,
+	13, 157, 1, 14, 189, 201, 13, 56, 253, 253, 13, 76, 5, 9, 189, 225,
+	13, 24, 125, 253, 13, 76, 28, 9, 32, 85, 9, 76, 208, 8, 32, 85,
+	9, 24, 125, 225, 13, 32, 155, 9, 76, 223, 5, 188, 253, 13, 189, 249,
+	13, 48, 2, 200, 200, 136, 152, 157, 253, 13, 221, 249, 13, 208, 8, 189,
+	249, 13, 73, 255, 157, 249, 13, 189, 253, 13, 96, 41, 63, 29, 205, 13,
+	168, 185, 255, 255, 96, 148, 145, 152, 165, 173, 180, 192, 9, 9, 9, 9,
+	9, 9, 9, 64, 0, 32, 0, 125, 201, 13, 157, 201, 13, 96, 125, 209,
+	13, 157, 225, 13, 32, 117, 9, 157, 201, 13, 96, 157, 201, 13, 189, 141,
+	9, 16, 12, 157, 201, 13, 169, 128, 208, 5, 157, 201, 13, 169, 1, 13,
+	28, 14, 141, 28, 14, 96, 45, 10, 210, 157, 201, 13, 96, 242, 51, 150,
+	226, 56, 140, 0, 106, 232, 106, 239, 128, 8, 174, 70, 230, 149, 65, 246,
+	176, 110, 48, 246, 187, 132, 82, 34, 244, 200, 160, 122, 85, 52, 20, 245,
+	216, 189, 164, 141, 119, 96, 78, 56, 39, 21, 6, 247, 232, 219, 207, 195,
+	184, 172, 162, 154, 144, 136, 127, 120, 112, 106, 100, 94, 13, 13, 12, 11,
+	11, 10, 10, 9, 8, 8, 7, 7, 7, 6, 6, 5, 5, 5, 4, 4,
+	4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 24, 24, 24, 24,
+	24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 22, 22, 23, 23, 23,
+	23, 24, 24, 24, 24, 24, 25, 25, 25, 25, 26, 21, 21, 22, 22, 22,
+	23, 23, 24, 24, 24, 25, 25, 26, 26, 26, 27, 20, 21, 21, 22, 22,
+	23, 23, 24, 24, 24, 25, 25, 26, 26, 27, 27, 20, 20, 21, 21, 22,
+	22, 23, 23, 24, 25, 25, 26, 26, 27, 27, 28, 19, 20, 20, 21, 22,
+	22, 23, 23, 24, 25, 25, 26, 26, 27, 28, 28, 19, 19, 20, 21, 21,
+	22, 23, 23, 24, 25, 25, 26, 27, 27, 28, 29, 18, 19, 20, 20, 21,
+	22, 23, 23, 24, 25, 25, 26, 27, 28, 28, 29, 18, 19, 19, 20, 21,
+	22, 22, 23, 24, 25, 26, 26, 27, 28, 29, 29, 18, 18, 19, 20, 21,
+	22, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, 17, 18, 19, 20, 21,
+	22, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, 17, 18, 19, 20, 21,
+	21, 22, 23, 24, 25, 26, 27, 27, 28, 29, 30, 17, 18, 19, 20, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 28, 29, 30, 17, 18, 19, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 29, 30, 17, 18, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 30, 16, 17, 18, 19, 20,
+	21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 34, 36, 38, 41,
+	43, 46, 48, 51, 55, 58, 61, 65, 69, 73, 77, 82, 87, 92, 97, 103,
+	110, 116, 123, 130, 138, 146, 155, 164, 174, 184, 195, 207, 220, 233, 246, 5,
+	21, 37, 55, 73, 93, 113, 135, 159, 184, 210, 237, 11, 42, 75, 110, 147,
+	186, 227, 15, 62, 112, 164, 219, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3,
+	3, 3, 3, 229, 42, 64, 89, 100, 238, 8, 166, 11, 12, 12, 12, 12,
+	12, 13, 13, 142, 50, 7, 140, 54, 7, 41, 7, 168, 185, 189, 11, 141,
+	227, 11, 185, 197, 11, 141, 228, 11, 76, 255, 255, 173, 54, 7, 174, 50,
+	7, 141, 148, 7, 141, 155, 7, 142, 149, 7, 142, 156, 7, 24, 105, 64,
+	141, 129, 5, 141, 135, 5, 144, 1, 232, 142, 130, 5, 142, 136, 5, 24,
+	105, 128, 141, 124, 9, 144, 1, 232, 142, 125, 9, 232, 141, 31, 12, 142,
+	32, 12, 162, 9, 189, 255, 255, 157, 179, 13, 202, 16, 247, 206, 188, 13,
+	169, 0, 141, 46, 7, 162, 98, 157, 189, 13, 202, 16, 250, 162, 8, 157,
+	0, 210, 202, 16, 250, 96, 32, 42, 12, 173, 50, 7, 10, 141, 22, 14,
+	173, 187, 13, 141, 23, 14, 169, 1, 141, 21, 14, 141, 46, 7, 96, 173,
+	54, 7, 133, 254, 173, 50, 7, 133, 255, 96, 173, 54, 7, 41, 3, 170,
+	173, 50, 7, 32, 198, 7, 173, 26, 14, 240, 238, 14, 54, 7, 32, 190,
+	12, 169, 1, 141, 27, 14, 173, 26, 14, 240, 222, 201, 1, 208, 5, 160,
+	0, 238, 26, 14, 177, 252, 174, 24, 14, 74, 74, 74, 74, 9, 16, 141,
+	10, 212, 141, 10, 212, 157, 1, 210, 177, 252, 9, 16, 141, 10, 212, 141,
+	10, 212, 157, 1, 210, 200, 208, 206, 230, 253, 165, 253, 197, 248, 208, 198,
+	140, 26, 14, 96, 144, 21, 169, 234, 141, 153, 12, 141, 154, 12, 141, 155,
+	12, 141, 166, 12, 141, 167, 12, 141, 168, 12, 96, 169, 141, 141, 153, 12,
+	141, 166, 12, 169, 10, 141, 154, 12, 141, 167, 12, 169, 212, 141, 155, 12,
+	141, 168, 12, 96, 169, 0, 141, 26, 14, 173, 50, 7, 74, 32, 190, 12,
+	169, 1, 141, 27, 14, 32, 128, 12, 173, 27, 14, 208, 248, 96, 169, 2,
+	141, 27, 14, 141, 25, 14, 169, 24, 141, 7, 210, 169, 17, 133, 250, 169,
+	13, 133, 251, 169, 173, 141, 97, 13, 141, 56, 13, 160, 0, 140, 121, 13,
+	140, 127, 13, 174, 11, 212, 177, 252, 74, 74, 74, 74, 9, 16, 141, 7,
+	210, 32, 117, 13, 236, 11, 212, 240, 251, 141, 5, 210, 174, 11, 212, 177,
+	252, 230, 252, 208, 16, 230, 253, 198, 248, 208, 10, 169, 173, 141, 97, 13,
+	141, 56, 13, 169, 8, 9, 16, 141, 7, 210, 32, 117, 13, 236, 11, 212,
+	240, 251, 141, 5, 210, 173, 27, 14, 208, 185, 96, 24, 165, 249, 105, 0,
+	133, 249, 165, 250, 105, 0, 133, 250, 144, 15, 230, 251, 165, 251, 201, 0,
+	208, 7, 140, 121, 13, 140, 127, 13, 96, 177, 250, 36, 249, 48, 4, 74,
+	74, 74, 74, 41, 15, 168, 185, 69, 10, 160, 0, 96, 160, 0, 140, 27,
+	14, 140, 26, 14, 136, 140, 25, 14, 96 };
+static const uint8_t CiResource_rmt4_obx[2007] = {
+	255, 255, 144, 3, 96, 11, 128, 0, 128, 32, 128, 64, 0, 192, 128, 128,
+	128, 160, 0, 192, 64, 192, 0, 1, 5, 11, 21, 0, 1, 255, 255, 1,
+	1, 0, 255, 255, 0, 1, 1, 1, 0, 255, 255, 255, 255, 0, 1, 1,
+	0, 0, 0, 0, 0, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232, 106,
+	239, 128, 8, 174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82,
+	34, 244, 200, 160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78,
+	56, 39, 21, 6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127,
+	120, 112, 106, 100, 94, 0, 191, 182, 170, 161, 152, 143, 137, 128, 242, 230,
+	218, 206, 191, 182, 170, 161, 152, 143, 137, 128, 122, 113, 107, 101, 95, 92,
+	86, 80, 77, 71, 68, 62, 60, 56, 53, 50, 47, 45, 42, 40, 37, 35,
+	33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15, 14, 13,
+	12, 11, 10, 9, 8, 7, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153,
+	142, 135, 127, 121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63, 60,
+	57, 55, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23,
+	22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 3, 2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153, 144,
+	136, 128, 121, 114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60, 57,
+	53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22,
+	20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5,
+	4, 3, 2, 1, 0, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8, 8,
+	7, 7, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3,
+	3, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+	1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
+	1, 1, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2,
+	2, 2, 2, 3, 3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+	3, 3, 3, 3, 4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
+	3, 4, 4, 4, 5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4,
+	4, 4, 5, 5, 6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4,
+	5, 5, 6, 6, 7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
+	5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5,
+	6, 7, 7, 8, 8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6,
+	7, 7, 8, 9, 9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7,
+	7, 8, 9, 10, 10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7,
+	8, 9, 10, 10, 11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8,
+	9, 10, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8,
+	9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+	10, 11, 12, 13, 14, 15, 76, 15, 6, 76, 252, 7, 76, 33, 8, 76,
+	88, 6, 76, 43, 11, 134, 211, 132, 212, 72, 160, 168, 169, 0, 153, 127,
+	2, 136, 208, 250, 160, 4, 177, 211, 141, 21, 8, 200, 177, 211, 141, 36,
+	3, 200, 177, 211, 141, 5, 8, 141, 38, 3, 160, 8, 177, 211, 153, 195,
+	0, 200, 192, 16, 208, 246, 104, 72, 10, 10, 24, 101, 209, 133, 209, 104,
+	8, 41, 192, 10, 42, 42, 40, 101, 210, 133, 210, 32, 110, 6, 169, 0,
+	141, 8, 210, 160, 3, 140, 15, 210, 160, 8, 153, 0, 210, 136, 16, 250,
+	173, 5, 8, 96, 162, 0, 142, 39, 3, 138, 168, 177, 209, 201, 254, 176,
+	45, 168, 177, 205, 157, 128, 2, 177, 207, 157, 132, 2, 169, 0, 157, 136,
+	2, 169, 1, 157, 140, 2, 169, 128, 157, 180, 2, 232, 224, 4, 208, 217,
+	165, 209, 24, 105, 4, 133, 209, 144, 27, 230, 210, 76, 190, 6, 240, 4,
+	169, 0, 240, 223, 160, 2, 177, 209, 170, 200, 177, 209, 133, 210, 134, 209,
+	162, 0, 240, 181, 173, 36, 3, 141, 22, 7, 162, 255, 232, 222, 140, 2,
+	208, 69, 189, 128, 2, 133, 211, 189, 132, 2, 133, 212, 188, 136, 2, 254,
+	136, 2, 177, 211, 133, 217, 41, 63, 201, 61, 240, 17, 176, 56, 157, 144,
+	2, 157, 16, 3, 200, 177, 211, 74, 41, 126, 157, 180, 2, 169, 1, 157,
+	140, 2, 188, 136, 2, 254, 136, 2, 177, 211, 74, 102, 217, 74, 102, 217,
+	165, 217, 41, 240, 157, 148, 2, 224, 3, 208, 177, 169, 255, 141, 36, 3,
+	141, 37, 3, 76, 101, 7, 201, 63, 240, 27, 165, 217, 41, 192, 240, 9,
+	10, 42, 42, 157, 140, 2, 76, 17, 7, 200, 177, 211, 157, 140, 2, 254,
+	136, 2, 76, 17, 7, 165, 217, 48, 12, 200, 177, 211, 141, 22, 7, 254,
+	136, 2, 76, 214, 6, 201, 255, 240, 9, 200, 177, 211, 157, 136, 2, 76,
+	214, 6, 76, 110, 6, 76, 33, 8, 202, 48, 250, 188, 180, 2, 48, 248,
+	177, 203, 157, 184, 2, 133, 215, 200, 177, 203, 157, 188, 2, 133, 216, 169,
+	1, 157, 20, 3, 168, 177, 215, 157, 4, 3, 200, 177, 215, 157, 196, 2,
+	200, 177, 215, 157, 200, 2, 200, 177, 215, 157, 240, 2, 41, 63, 157, 8,
+	3, 177, 215, 41, 64, 157, 244, 2, 200, 177, 215, 157, 32, 3, 200, 177,
+	215, 157, 208, 2, 200, 177, 215, 157, 216, 2, 200, 177, 215, 157, 220, 2,
+	200, 177, 215, 168, 185, 160, 3, 157, 224, 2, 157, 228, 2, 185, 161, 3,
+	157, 232, 2, 160, 10, 177, 215, 157, 236, 2, 169, 128, 157, 212, 2, 157,
+	180, 2, 10, 157, 204, 2, 157, 156, 2, 168, 177, 215, 157, 0, 3, 105,
+	0, 157, 192, 2, 169, 12, 157, 252, 2, 168, 177, 215, 157, 248, 2, 76,
+	98, 7, 32, 43, 11, 206, 38, 3, 208, 29, 169, 255, 141, 38, 3, 206,
+	37, 3, 208, 19, 238, 39, 3, 173, 39, 3, 201, 255, 240, 3, 76, 190,
+	6, 76, 110, 6, 76, 95, 10, 169, 4, 133, 214, 162, 3, 189, 188, 2,
+	240, 242, 133, 212, 189, 184, 2, 133, 211, 188, 192, 2, 177, 211, 133, 217,
+	200, 177, 211, 133, 218, 200, 177, 211, 133, 219, 200, 152, 221, 196, 2, 144,
+	10, 240, 8, 169, 128, 157, 204, 2, 189, 200, 2, 157, 192, 2, 165, 217,
+	41, 15, 29, 148, 2, 168, 185, 0, 5, 133, 220, 165, 218, 41, 14, 168,
+	185, 144, 3, 133, 213, 165, 220, 25, 145, 3, 157, 28, 3, 189, 220, 2,
+	240, 40, 201, 1, 208, 33, 189, 156, 2, 24, 125, 236, 2, 24, 188, 224,
+	2, 121, 165, 3, 157, 156, 2, 200, 152, 221, 232, 2, 208, 3, 189, 228,
+	2, 157, 224, 2, 76, 164, 8, 222, 220, 2, 188, 0, 3, 192, 13, 144,
+	60, 189, 8, 3, 16, 49, 152, 221, 252, 2, 208, 8, 189, 4, 3, 157,
+	252, 2, 208, 3, 254, 252, 2, 189, 184, 2, 133, 215, 189, 188, 2, 133,
+	216, 188, 252, 2, 177, 215, 188, 244, 2, 240, 4, 24, 125, 248, 2, 157,
+	248, 2, 189, 240, 2, 41, 63, 56, 233, 1, 157, 8, 3, 189, 204, 2,
+	16, 31, 189, 148, 2, 240, 26, 221, 216, 2, 240, 21, 144, 19, 168, 189,
+	212, 2, 24, 125, 208, 2, 157, 212, 2, 144, 6, 152, 233, 16, 157, 148,
+	2, 169, 0, 133, 221, 165, 218, 157, 12, 3, 41, 112, 74, 74, 141, 28,
+	9, 144, 254, 76, 210, 9, 234, 76, 60, 9, 234, 76, 65, 9, 234, 76,
+	75, 9, 234, 76, 87, 9, 234, 76, 102, 9, 234, 76, 169, 9, 234, 76,
+	184, 9, 165, 219, 76, 21, 10, 165, 219, 133, 221, 189, 144, 2, 76, 216,
+	9, 189, 144, 2, 24, 101, 219, 157, 144, 2, 76, 216, 9, 189, 156, 2,
+	24, 101, 219, 157, 156, 2, 189, 144, 2, 76, 216, 9, 189, 240, 2, 16,
+	12, 188, 144, 2, 177, 213, 24, 125, 248, 2, 76, 135, 9, 189, 144, 2,
+	24, 125, 248, 2, 201, 61, 144, 2, 169, 63, 168, 177, 213, 157, 160, 2,
+	164, 219, 208, 3, 157, 164, 2, 152, 74, 74, 74, 74, 157, 168, 2, 157,
+	172, 2, 165, 219, 41, 15, 157, 176, 2, 189, 144, 2, 76, 216, 9, 165,
+	219, 24, 125, 20, 3, 157, 20, 3, 189, 144, 2, 76, 216, 9, 165, 219,
+	201, 128, 240, 6, 157, 144, 2, 76, 216, 9, 189, 28, 3, 9, 240, 157,
+	28, 3, 189, 144, 2, 76, 216, 9, 189, 144, 2, 24, 101, 219, 188, 240,
+	2, 48, 31, 24, 125, 248, 2, 201, 61, 144, 7, 169, 0, 157, 28, 3,
+	169, 63, 157, 16, 3, 168, 177, 213, 24, 125, 156, 2, 24, 101, 221, 76,
+	21, 10, 201, 61, 144, 7, 169, 0, 157, 28, 3, 169, 63, 168, 189, 156,
+	2, 24, 125, 248, 2, 24, 113, 213, 24, 101, 221, 157, 24, 3, 189, 172,
+	2, 240, 50, 222, 172, 2, 208, 45, 189, 168, 2, 157, 172, 2, 189, 164,
+	2, 221, 160, 2, 240, 31, 176, 13, 125, 176, 2, 176, 18, 221, 160, 2,
+	176, 13, 76, 76, 10, 253, 176, 2, 144, 5, 221, 160, 2, 176, 3, 189,
+	160, 2, 157, 164, 2, 165, 218, 41, 1, 240, 10, 189, 164, 2, 24, 125,
+	156, 2, 157, 24, 3, 202, 48, 3, 76, 39, 8, 173, 32, 3, 13, 33,
+	3, 13, 34, 3, 13, 35, 3, 170, 142, 44, 11, 173, 12, 3, 16, 33,
+	173, 28, 3, 41, 15, 240, 26, 173, 24, 3, 24, 109, 20, 3, 141, 26,
+	3, 173, 30, 3, 41, 16, 208, 5, 169, 0, 141, 30, 3, 138, 9, 4,
+	170, 173, 13, 3, 16, 33, 173, 29, 3, 41, 15, 240, 26, 173, 25, 3,
+	24, 109, 21, 3, 141, 27, 3, 173, 31, 3, 41, 16, 208, 5, 169, 0,
+	141, 31, 3, 138, 9, 2, 170, 236, 44, 11, 208, 94, 173, 13, 3, 41,
+	14, 201, 6, 208, 38, 173, 29, 3, 41, 15, 240, 31, 172, 17, 3, 185,
+	192, 3, 141, 24, 3, 185, 192, 4, 141, 25, 3, 173, 28, 3, 41, 16,
+	208, 5, 169, 0, 141, 28, 3, 138, 9, 80, 170, 173, 15, 3, 41, 14,
+	201, 6, 208, 38, 173, 31, 3, 41, 15, 240, 31, 172, 19, 3, 185, 192,
+	3, 141, 26, 3, 185, 192, 4, 141, 27, 3, 173, 30, 3, 41, 16, 208,
+	5, 169, 0, 141, 30, 3, 138, 9, 40, 170, 142, 44, 11, 173, 38, 3,
+	96, 160, 255, 173, 24, 3, 174, 28, 3, 141, 0, 210, 142, 1, 210, 173,
+	25, 3, 174, 29, 3, 141, 2, 210, 142, 3, 210, 173, 26, 3, 174, 30,
+	3, 141, 4, 210, 142, 5, 210, 173, 27, 3, 174, 31, 3, 141, 6, 210,
+	142, 7, 210, 140, 8, 210, 96 };
+static const uint8_t CiResource_rmt8_obx[2275] = {
+	255, 255, 144, 3, 108, 12, 128, 0, 128, 32, 128, 64, 0, 192, 128, 128,
+	128, 160, 0, 192, 64, 192, 0, 1, 5, 11, 21, 0, 1, 255, 255, 1,
+	1, 0, 255, 255, 0, 1, 1, 1, 0, 255, 255, 255, 255, 0, 1, 1,
+	0, 0, 0, 0, 0, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232, 106,
+	239, 128, 8, 174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82,
+	34, 244, 200, 160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78,
+	56, 39, 21, 6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127,
+	120, 112, 106, 100, 94, 0, 191, 182, 170, 161, 152, 143, 137, 128, 242, 230,
+	218, 206, 191, 182, 170, 161, 152, 143, 137, 128, 122, 113, 107, 101, 95, 92,
+	86, 80, 77, 71, 68, 62, 60, 56, 53, 50, 47, 45, 42, 40, 37, 35,
+	33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15, 14, 13,
+	12, 11, 10, 9, 8, 7, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153,
+	142, 135, 127, 121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63, 60,
+	57, 55, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23,
+	22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 3, 2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153, 144,
+	136, 128, 121, 114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60, 57,
+	53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22,
+	20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5,
+	4, 3, 2, 1, 0, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8, 8,
+	7, 7, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3,
+	3, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+	1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
+	1, 1, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2,
+	2, 2, 2, 3, 3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+	3, 3, 3, 3, 4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
+	3, 4, 4, 4, 5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4,
+	4, 4, 5, 5, 6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4,
+	5, 5, 6, 6, 7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
+	5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5,
+	6, 7, 7, 8, 8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6,
+	7, 7, 8, 9, 9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7,
+	7, 8, 9, 10, 10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7,
+	8, 9, 10, 10, 11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8,
+	9, 10, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8,
+	9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+	10, 11, 12, 13, 14, 15, 76, 15, 6, 76, 9, 8, 76, 46, 8, 76,
+	92, 6, 76, 2, 12, 134, 211, 132, 212, 72, 160, 0, 152, 153, 0, 2,
+	153, 76, 2, 200, 208, 247, 160, 4, 177, 211, 141, 34, 8, 200, 177, 211,
+	141, 72, 3, 200, 177, 211, 141, 18, 8, 141, 74, 3, 160, 8, 177, 211,
+	153, 195, 0, 200, 192, 16, 208, 246, 104, 72, 10, 10, 10, 24, 101, 209,
+	133, 209, 104, 8, 41, 224, 10, 42, 42, 42, 40, 101, 210, 133, 210, 32,
+	123, 6, 169, 0, 141, 8, 210, 141, 24, 210, 160, 3, 140, 15, 210, 140,
+	31, 210, 160, 8, 153, 0, 210, 153, 16, 210, 136, 16, 247, 173, 18, 8,
+	96, 162, 0, 142, 75, 3, 138, 168, 177, 209, 201, 254, 176, 45, 168, 177,
+	205, 157, 0, 2, 177, 207, 157, 8, 2, 169, 0, 157, 16, 2, 169, 1,
+	157, 24, 2, 169, 128, 157, 104, 2, 232, 224, 8, 208, 217, 165, 209, 24,
+	105, 8, 133, 209, 144, 27, 230, 210, 76, 203, 6, 240, 4, 169, 0, 240,
+	223, 160, 2, 177, 209, 170, 200, 177, 209, 133, 210, 134, 209, 162, 0, 240,
+	181, 173, 72, 3, 141, 35, 7, 162, 255, 232, 222, 24, 2, 208, 69, 189,
+	0, 2, 133, 211, 189, 8, 2, 133, 212, 188, 16, 2, 254, 16, 2, 177,
+	211, 133, 217, 41, 63, 201, 61, 240, 17, 176, 56, 157, 32, 2, 157, 32,
+	3, 200, 177, 211, 74, 41, 126, 157, 104, 2, 169, 1, 157, 24, 2, 188,
+	16, 2, 254, 16, 2, 177, 211, 74, 102, 217, 74, 102, 217, 165, 217, 41,
+	240, 157, 40, 2, 224, 7, 208, 177, 169, 255, 141, 72, 3, 141, 73, 3,
+	76, 114, 7, 201, 63, 240, 27, 165, 217, 41, 192, 240, 9, 10, 42, 42,
+	157, 24, 2, 76, 30, 7, 200, 177, 211, 157, 24, 2, 254, 16, 2, 76,
+	30, 7, 165, 217, 48, 12, 200, 177, 211, 141, 35, 7, 254, 16, 2, 76,
+	227, 6, 201, 255, 240, 9, 200, 177, 211, 157, 16, 2, 76, 227, 6, 76,
+	123, 6, 76, 46, 8, 202, 48, 250, 188, 104, 2, 48, 248, 177, 203, 157,
+	112, 2, 133, 215, 200, 177, 203, 157, 120, 2, 133, 216, 169, 1, 157, 40,
+	3, 168, 177, 215, 157, 8, 3, 200, 177, 215, 157, 136, 2, 200, 177, 215,
+	157, 144, 2, 200, 177, 215, 157, 224, 2, 41, 63, 157, 16, 3, 177, 215,
+	41, 64, 157, 232, 2, 200, 177, 215, 157, 64, 3, 200, 177, 215, 157, 160,
+	2, 200, 177, 215, 157, 176, 2, 200, 177, 215, 157, 184, 2, 200, 177, 215,
+	168, 185, 160, 3, 157, 192, 2, 157, 200, 2, 185, 161, 3, 157, 208, 2,
+	160, 10, 177, 215, 157, 216, 2, 169, 128, 157, 168, 2, 157, 104, 2, 10,
+	157, 152, 2, 157, 56, 2, 168, 177, 215, 157, 0, 3, 105, 0, 157, 128,
+	2, 169, 12, 157, 248, 2, 168, 177, 215, 157, 240, 2, 76, 111, 7, 32,
+	2, 12, 206, 74, 3, 208, 29, 169, 255, 141, 74, 3, 206, 73, 3, 208,
+	19, 238, 75, 3, 173, 75, 3, 201, 255, 240, 3, 76, 203, 6, 76, 123,
+	6, 76, 116, 10, 169, 4, 133, 214, 162, 7, 189, 120, 2, 240, 242, 133,
+	212, 189, 112, 2, 133, 211, 188, 128, 2, 177, 211, 133, 217, 200, 177, 211,
+	133, 218, 200, 177, 211, 133, 219, 200, 152, 221, 136, 2, 144, 10, 240, 8,
+	169, 128, 157, 152, 2, 189, 144, 2, 157, 128, 2, 165, 217, 224, 4, 144,
+	4, 74, 74, 74, 74, 41, 15, 29, 40, 2, 168, 185, 0, 5, 133, 220,
+	165, 218, 41, 14, 168, 185, 144, 3, 133, 213, 165, 220, 25, 145, 3, 157,
+	56, 3, 189, 184, 2, 240, 40, 201, 1, 208, 33, 189, 56, 2, 24, 125,
+	216, 2, 24, 188, 192, 2, 121, 165, 3, 157, 56, 2, 200, 152, 221, 208,
+	2, 208, 3, 189, 200, 2, 157, 192, 2, 76, 185, 8, 222, 184, 2, 188,
+	0, 3, 192, 13, 144, 60, 189, 16, 3, 16, 49, 152, 221, 248, 2, 208,
+	8, 189, 8, 3, 157, 248, 2, 208, 3, 254, 248, 2, 189, 112, 2, 133,
+	215, 189, 120, 2, 133, 216, 188, 248, 2, 177, 215, 188, 232, 2, 240, 4,
+	24, 125, 240, 2, 157, 240, 2, 189, 224, 2, 41, 63, 56, 233, 1, 157,
+	16, 3, 189, 152, 2, 16, 31, 189, 40, 2, 240, 26, 221, 176, 2, 240,
+	21, 144, 19, 168, 189, 168, 2, 24, 125, 160, 2, 157, 168, 2, 144, 6,
+	152, 233, 16, 157, 40, 2, 169, 0, 133, 221, 165, 218, 157, 24, 3, 41,
+	112, 74, 74, 141, 49, 9, 144, 254, 76, 231, 9, 234, 76, 81, 9, 234,
+	76, 86, 9, 234, 76, 96, 9, 234, 76, 108, 9, 234, 76, 123, 9, 234,
+	76, 190, 9, 234, 76, 205, 9, 165, 219, 76, 42, 10, 165, 219, 133, 221,
+	189, 32, 2, 76, 237, 9, 189, 32, 2, 24, 101, 219, 157, 32, 2, 76,
+	237, 9, 189, 56, 2, 24, 101, 219, 157, 56, 2, 189, 32, 2, 76, 237,
+	9, 189, 224, 2, 16, 12, 188, 32, 2, 177, 213, 24, 125, 240, 2, 76,
+	156, 9, 189, 32, 2, 24, 125, 240, 2, 201, 61, 144, 2, 169, 63, 168,
+	177, 213, 157, 64, 2, 164, 219, 208, 3, 157, 72, 2, 152, 74, 74, 74,
+	74, 157, 80, 2, 157, 88, 2, 165, 219, 41, 15, 157, 96, 2, 189, 32,
+	2, 76, 237, 9, 165, 219, 24, 125, 40, 3, 157, 40, 3, 189, 32, 2,
+	76, 237, 9, 165, 219, 201, 128, 240, 6, 157, 32, 2, 76, 237, 9, 189,
+	56, 3, 9, 240, 157, 56, 3, 189, 32, 2, 76, 237, 9, 189, 32, 2,
+	24, 101, 219, 188, 224, 2, 48, 31, 24, 125, 240, 2, 201, 61, 144, 7,
+	169, 0, 157, 56, 3, 169, 63, 157, 32, 3, 168, 177, 213, 24, 125, 56,
+	2, 24, 101, 221, 76, 42, 10, 201, 61, 144, 7, 169, 0, 157, 56, 3,
+	169, 63, 168, 189, 56, 2, 24, 125, 240, 2, 24, 113, 213, 24, 101, 221,
+	157, 48, 3, 189, 88, 2, 240, 50, 222, 88, 2, 208, 45, 189, 80, 2,
+	157, 88, 2, 189, 72, 2, 221, 64, 2, 240, 31, 176, 13, 125, 96, 2,
+	176, 18, 221, 64, 2, 176, 13, 76, 97, 10, 253, 96, 2, 144, 5, 221,
+	64, 2, 176, 3, 189, 64, 2, 157, 72, 2, 165, 218, 41, 1, 240, 10,
+	189, 72, 2, 24, 125, 56, 2, 157, 48, 3, 202, 48, 3, 76, 52, 8,
+	173, 64, 3, 13, 65, 3, 13, 66, 3, 13, 67, 3, 170, 142, 101, 12,
+	173, 24, 3, 16, 33, 173, 56, 3, 41, 15, 240, 26, 173, 48, 3, 24,
+	109, 40, 3, 141, 50, 3, 173, 58, 3, 41, 16, 208, 5, 169, 0, 141,
+	58, 3, 138, 9, 4, 170, 173, 25, 3, 16, 33, 173, 57, 3, 41, 15,
+	240, 26, 173, 49, 3, 24, 109, 41, 3, 141, 51, 3, 173, 59, 3, 41,
+	16, 208, 5, 169, 0, 141, 59, 3, 138, 9, 2, 170, 236, 101, 12, 208,
+	94, 173, 25, 3, 41, 14, 201, 6, 208, 38, 173, 57, 3, 41, 15, 240,
+	31, 172, 33, 3, 185, 192, 3, 141, 48, 3, 185, 192, 4, 141, 49, 3,
+	173, 56, 3, 41, 16, 208, 5, 169, 0, 141, 56, 3, 138, 9, 80, 170,
+	173, 27, 3, 41, 14, 201, 6, 208, 38, 173, 59, 3, 41, 15, 240, 31,
+	172, 35, 3, 185, 192, 3, 141, 50, 3, 185, 192, 4, 141, 51, 3, 173,
+	58, 3, 41, 16, 208, 5, 169, 0, 141, 58, 3, 138, 9, 40, 170, 142,
+	101, 12, 173, 68, 3, 13, 69, 3, 13, 70, 3, 13, 71, 3, 170, 142,
+	3, 12, 173, 28, 3, 16, 33, 173, 60, 3, 41, 15, 240, 26, 173, 52,
+	3, 24, 109, 44, 3, 141, 54, 3, 173, 62, 3, 41, 16, 208, 5, 169,
+	0, 141, 62, 3, 138, 9, 4, 170, 173, 29, 3, 16, 33, 173, 61, 3,
+	41, 15, 240, 26, 173, 53, 3, 24, 109, 45, 3, 141, 55, 3, 173, 63,
+	3, 41, 16, 208, 5, 169, 0, 141, 63, 3, 138, 9, 2, 170, 236, 3,
+	12, 208, 94, 173, 29, 3, 41, 14, 201, 6, 208, 38, 173, 61, 3, 41,
+	15, 240, 31, 172, 37, 3, 185, 192, 3, 141, 52, 3, 185, 192, 4, 141,
+	53, 3, 173, 60, 3, 41, 16, 208, 5, 169, 0, 141, 60, 3, 138, 9,
+	80, 170, 173, 31, 3, 41, 14, 201, 6, 208, 38, 173, 63, 3, 41, 15,
+	240, 31, 172, 39, 3, 185, 192, 3, 141, 54, 3, 185, 192, 4, 141, 55,
+	3, 173, 62, 3, 41, 16, 208, 5, 169, 0, 141, 62, 3, 138, 9, 40,
+	170, 142, 3, 12, 173, 74, 3, 96, 160, 255, 173, 52, 3, 174, 48, 3,
+	141, 16, 210, 142, 0, 210, 173, 60, 3, 174, 56, 3, 141, 17, 210, 142,
+	1, 210, 173, 53, 3, 174, 49, 3, 141, 18, 210, 142, 2, 210, 173, 61,
+	3, 174, 57, 3, 141, 19, 210, 142, 3, 210, 173, 54, 3, 174, 50, 3,
+	141, 20, 210, 142, 4, 210, 173, 62, 3, 174, 58, 3, 141, 21, 210, 142,
+	5, 210, 173, 55, 3, 174, 51, 3, 141, 22, 210, 142, 6, 210, 173, 63,
+	3, 174, 59, 3, 141, 23, 210, 142, 7, 210, 169, 255, 140, 24, 210, 141,
+	8, 210, 96 };
+static const uint8_t CiResource_tm2_obx[3698] = {
+	255, 255, 0, 5, 107, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+	1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
+	1, 1, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2,
+	2, 2, 2, 3, 3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+	3, 3, 3, 3, 4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3,
+	3, 4, 4, 4, 5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4,
+	4, 4, 5, 5, 6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4,
+	5, 5, 6, 6, 7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5,
+	5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5,
+	6, 7, 7, 8, 8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6,
+	7, 7, 8, 9, 9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7,
+	7, 8, 9, 10, 10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7,
+	8, 9, 10, 10, 11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8,
+	9, 10, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8,
+	9, 10, 11, 12, 13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+	10, 11, 12, 13, 14, 15, 0, 241, 228, 215, 203, 192, 181, 170, 161, 152,
+	143, 135, 127, 120, 114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60,
+	56, 53, 50, 47, 44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23,
+	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 3, 2, 1, 0, 0, 242, 233, 218, 206, 191, 182, 170, 161, 152,
+	143, 137, 128, 122, 113, 107, 101, 95, 92, 86, 80, 77, 71, 68, 62, 60,
+	56, 53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23,
+	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 3, 2, 1, 0, 0, 255, 241, 228, 216, 202, 192, 181, 171, 162,
+	153, 142, 135, 127, 121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63,
+	60, 57, 55, 51, 48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25,
+	23, 22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7,
+	6, 5, 4, 3, 2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153,
+	144, 136, 128, 121, 114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60,
+	57, 53, 50, 47, 45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23,
+	22, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,
+	5, 4, 3, 2, 1, 0, 226, 56, 140, 0, 106, 232, 106, 239, 128, 8,
+	174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82, 34, 244, 200,
+	160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78, 56, 39, 21,
+	6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127, 120, 112, 106,
+	100, 94, 87, 82, 50, 10, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232,
+	106, 239, 128, 8, 174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132,
+	82, 34, 244, 200, 160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96,
+	78, 56, 39, 21, 6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136,
+	127, 120, 112, 106, 100, 94, 11, 11, 10, 10, 9, 8, 8, 7, 7, 7,
+	6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 2, 2,
+	2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8,
+	8, 7, 7, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3,
+	3, 3, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 76, 228, 16, 76, 227, 9, 76, 159, 11, 1,
+	16, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
+	6, 7, 0, 1, 2, 3, 4, 2, 0, 0, 4, 2, 0, 0, 0, 16,
+	0, 8, 0, 16, 0, 8, 133, 211, 129, 169, 133, 211, 129, 169, 136, 177,
+	250, 141, 23, 8, 162, 0, 134, 252, 10, 38, 252, 10, 38, 252, 10, 38,
+	252, 10, 38, 252, 109, 23, 8, 144, 2, 230, 252, 24, 105, 0, 133, 250,
+	165, 252, 105, 0, 133, 251, 76, 7, 10, 32, 181, 12, 173, 22, 8, 240,
+	5, 206, 28, 8, 48, 3, 76, 162, 11, 206, 29, 8, 208, 82, 162, 0,
+	238, 23, 8, 173, 25, 8, 133, 250, 173, 26, 8, 133, 251, 160, 16, 177,
+	250, 48, 171, 208, 3, 76, 44, 18, 141, 29, 8, 136, 177, 250, 136, 132,
+	252, 168, 185, 255, 255, 157, 80, 8, 185, 255, 255, 157, 88, 8, 169, 0,
+	157, 112, 8, 157, 96, 8, 164, 252, 177, 250, 157, 104, 8, 232, 136, 16,
+	219, 169, 17, 24, 101, 250, 141, 25, 8, 169, 0, 101, 251, 141, 26, 8,
+	173, 27, 8, 141, 28, 8, 162, 7, 222, 112, 8, 48, 6, 202, 16, 248,
+	76, 162, 11, 189, 80, 8, 133, 250, 189, 88, 8, 133, 251, 188, 96, 8,
+	177, 250, 208, 28, 200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177,
+	250, 10, 10, 10, 10, 157, 224, 8, 200, 152, 157, 96, 8, 76, 87, 10,
+	201, 64, 176, 79, 125, 104, 8, 157, 152, 8, 200, 177, 250, 16, 37, 41,
+	127, 133, 252, 200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177, 250,
+	10, 10, 10, 10, 157, 224, 8, 200, 152, 157, 96, 8, 164, 252, 32, 156,
+	18, 76, 87, 10, 168, 254, 96, 8, 254, 96, 8, 189, 208, 8, 41, 240,
+	157, 216, 8, 189, 208, 8, 10, 10, 10, 10, 157, 224, 8, 32, 156, 18,
+	76, 87, 10, 201, 128, 176, 37, 41, 63, 24, 125, 104, 8, 157, 152, 8,
+	200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177, 250, 10, 10, 10,
+	10, 157, 224, 8, 200, 152, 157, 96, 8, 76, 87, 10, 208, 14, 200, 177,
+	250, 157, 112, 8, 200, 152, 157, 96, 8, 76, 87, 10, 201, 192, 176, 15,
+	41, 63, 24, 125, 104, 8, 157, 152, 8, 254, 96, 8, 76, 87, 10, 201,
+	208, 176, 15, 200, 254, 96, 8, 41, 15, 141, 27, 8, 141, 28, 8, 76,
+	106, 10, 201, 224, 176, 22, 177, 250, 133, 252, 200, 177, 250, 133, 253, 200,
+	152, 157, 96, 8, 165, 252, 32, 14, 17, 76, 87, 10, 201, 240, 176, 46,
+	177, 250, 133, 252, 200, 177, 250, 133, 253, 165, 252, 32, 14, 17, 188, 96,
+	8, 200, 200, 177, 250, 157, 208, 8, 41, 240, 157, 216, 8, 177, 250, 10,
+	10, 10, 10, 157, 224, 8, 200, 152, 157, 96, 8, 76, 87, 10, 201, 255,
+	176, 11, 233, 239, 157, 112, 8, 254, 96, 8, 76, 87, 10, 169, 64, 157,
+	112, 8, 76, 87, 10, 32, 181, 12, 162, 7, 189, 120, 8, 240, 115, 76,
+	217, 13, 189, 14, 8, 240, 14, 169, 0, 157, 32, 8, 157, 40, 8, 202,
+	16, 232, 76, 31, 12, 164, 253, 185, 0, 6, 24, 101, 252, 157, 56, 8,
+	152, 157, 160, 8, 189, 176, 8, 61, 168, 9, 240, 40, 165, 253, 41, 127,
+	168, 185, 0, 7, 24, 101, 252, 157, 55, 8, 185, 128, 7, 105, 0, 157,
+	56, 8, 169, 0, 157, 31, 8, 188, 152, 9, 153, 39, 8, 202, 202, 16,
+	169, 76, 31, 12, 189, 176, 8, 61, 160, 9, 240, 22, 189, 104, 9, 24,
+	101, 253, 157, 162, 8, 168, 185, 0, 6, 24, 101, 252, 56, 101, 254, 157,
+	58, 8, 202, 16, 133, 232, 134, 252, 162, 3, 173, 9, 8, 240, 6, 41,
+	64, 208, 60, 162, 7, 138, 168, 185, 32, 8, 208, 12, 188, 152, 9, 185,
+	40, 8, 208, 4, 138, 168, 169, 0, 25, 168, 8, 157, 48, 8, 185, 56,
+	8, 157, 72, 8, 185, 160, 8, 157, 64, 8, 185, 176, 8, 5, 252, 133,
+	252, 224, 4, 208, 3, 141, 31, 8, 202, 16, 202, 141, 30, 8, 96, 189,
+	32, 8, 29, 168, 8, 157, 48, 8, 189, 44, 8, 29, 172, 8, 157, 52,
+	8, 189, 56, 8, 157, 72, 8, 189, 60, 8, 157, 76, 8, 189, 160, 8,
+	157, 64, 8, 189, 164, 8, 157, 68, 8, 202, 16, 211, 173, 176, 8, 13,
+	177, 8, 13, 178, 8, 13, 179, 8, 141, 30, 8, 173, 180, 8, 13, 181,
+	8, 13, 182, 8, 13, 183, 8, 141, 31, 8, 96, 173, 9, 8, 208, 3,
+	76, 144, 13, 48, 3, 76, 72, 13, 173, 13, 8, 170, 74, 74, 41, 1,
+	168, 185, 30, 8, 141, 56, 210, 138, 41, 4, 168, 185, 56, 8, 141, 48,
+	210, 189, 32, 8, 141, 49, 210, 185, 57, 8, 141, 50, 210, 189, 33, 8,
+	141, 51, 210, 185, 58, 8, 141, 52, 210, 189, 34, 8, 141, 53, 210, 185,
+	59, 8, 141, 54, 210, 189, 35, 8, 141, 55, 210, 173, 12, 8, 170, 74,
+	74, 41, 1, 168, 185, 30, 8, 141, 40, 210, 138, 41, 4, 168, 185, 56,
+	8, 141, 32, 210, 189, 32, 8, 141, 33, 210, 185, 57, 8, 141, 34, 210,
+	189, 33, 8, 141, 35, 210, 185, 58, 8, 141, 36, 210, 189, 34, 8, 141,
+	37, 210, 185, 59, 8, 141, 38, 210, 189, 35, 8, 141, 39, 210, 173, 11,
+	8, 170, 74, 74, 41, 1, 168, 185, 30, 8, 141, 24, 210, 138, 172, 9,
+	8, 16, 2, 41, 4, 168, 185, 56, 8, 141, 16, 210, 189, 32, 8, 141,
+	17, 210, 185, 57, 8, 141, 18, 210, 189, 33, 8, 141, 19, 210, 185, 58,
+	8, 141, 20, 210, 189, 34, 8, 141, 21, 210, 185, 59, 8, 141, 22, 210,
+	189, 35, 8, 141, 23, 210, 173, 10, 8, 170, 74, 74, 41, 1, 168, 185,
+	30, 8, 141, 8, 210, 138, 172, 9, 8, 16, 2, 41, 4, 168, 185, 56,
+	8, 141, 0, 210, 189, 32, 8, 141, 1, 210, 185, 57, 8, 141, 2, 210,
+	189, 33, 8, 141, 3, 210, 185, 58, 8, 141, 4, 210, 189, 34, 8, 141,
+	5, 210, 185, 59, 8, 141, 6, 210, 189, 35, 8, 141, 7, 210, 96, 189,
+	128, 8, 133, 250, 189, 136, 8, 133, 251, 189, 128, 9, 133, 252, 189, 136,
+	9, 133, 253, 189, 144, 9, 133, 254, 189, 184, 8, 221, 192, 8, 144, 12,
+	157, 8, 9, 189, 200, 8, 157, 184, 8, 76, 11, 14, 189, 8, 9, 240,
+	48, 189, 232, 8, 240, 19, 222, 248, 8, 208, 14, 157, 248, 8, 189, 216,
+	8, 240, 6, 56, 233, 16, 157, 216, 8, 189, 240, 8, 240, 19, 222, 0,
+	9, 208, 14, 157, 0, 9, 189, 224, 8, 240, 6, 56, 233, 16, 157, 224,
+	8, 188, 72, 9, 177, 250, 24, 125, 152, 8, 24, 101, 253, 133, 253, 222,
+	88, 9, 16, 57, 189, 80, 9, 157, 88, 9, 189, 96, 9, 240, 30, 24,
+	125, 72, 9, 157, 72, 9, 240, 13, 221, 64, 9, 144, 32, 169, 255, 157,
+	96, 9, 76, 135, 14, 169, 1, 157, 96, 9, 76, 135, 14, 254, 72, 9,
+	189, 64, 9, 221, 72, 9, 176, 5, 169, 0, 157, 72, 9, 169, 19, 24,
+	101, 250, 133, 250, 144, 2, 230, 251, 188, 184, 8, 177, 250, 41, 240, 157,
+	168, 8, 177, 250, 41, 15, 29, 216, 8, 168, 185, 0, 5, 5, 255, 168,
+	185, 0, 5, 157, 32, 8, 188, 184, 8, 200, 177, 250, 41, 15, 29, 224,
+	8, 168, 185, 0, 5, 5, 255, 168, 185, 0, 5, 157, 40, 8, 189, 40,
+	9, 208, 39, 189, 16, 9, 141, 212, 14, 16, 254, 76, 209, 15, 234, 76,
+	108, 15, 234, 76, 167, 15, 234, 76, 212, 15, 234, 76, 1, 16, 234, 76,
+	33, 16, 234, 76, 65, 16, 234, 76, 73, 16, 222, 40, 9, 188, 184, 8,
+	200, 177, 250, 41, 112, 74, 74, 74, 141, 34, 15, 177, 250, 48, 6, 189,
+	112, 9, 76, 18, 15, 189, 120, 9, 61, 176, 9, 157, 176, 8, 200, 200,
+	152, 157, 184, 8, 136, 177, 250, 144, 254, 144, 22, 144, 12, 144, 34, 144,
+	24, 144, 46, 144, 36, 144, 50, 144, 52, 125, 128, 9, 157, 128, 9, 177,
+	250, 24, 101, 252, 133, 252, 76, 172, 11, 125, 136, 9, 157, 136, 9, 177,
+	250, 24, 101, 253, 133, 253, 76, 172, 11, 125, 144, 9, 157, 144, 9, 177,
+	250, 24, 101, 254, 133, 254, 76, 172, 11, 133, 252, 169, 0, 133, 253, 76,
+	172, 11, 189, 32, 9, 41, 3, 74, 144, 10, 208, 25, 189, 24, 9, 24,
+	101, 252, 133, 252, 222, 56, 9, 16, 78, 254, 32, 9, 189, 48, 9, 157,
+	56, 9, 76, 247, 14, 165, 252, 253, 24, 9, 133, 252, 222, 56, 9, 16,
+	54, 254, 32, 9, 189, 48, 9, 157, 56, 9, 76, 247, 14, 188, 32, 9,
+	189, 24, 9, 48, 2, 200, 200, 136, 152, 24, 101, 252, 133, 252, 222, 56,
+	9, 16, 20, 152, 157, 32, 9, 221, 24, 9, 208, 5, 73, 255, 157, 24,
+	9, 189, 48, 9, 157, 56, 9, 76, 247, 14, 188, 32, 9, 189, 24, 9,
+	48, 2, 200, 200, 136, 152, 24, 101, 253, 133, 253, 222, 56, 9, 16, 231,
+	152, 157, 32, 9, 221, 24, 9, 208, 216, 73, 255, 157, 24, 9, 189, 48,
+	9, 157, 56, 9, 76, 247, 14, 189, 32, 9, 24, 101, 252, 133, 252, 222,
+	56, 9, 16, 195, 189, 24, 9, 24, 125, 32, 9, 157, 32, 9, 189, 48,
+	9, 157, 56, 9, 76, 247, 14, 165, 253, 56, 253, 32, 9, 133, 253, 222,
+	56, 9, 16, 163, 189, 24, 9, 24, 125, 32, 9, 157, 32, 9, 189, 48,
+	9, 157, 56, 9, 76, 247, 14, 189, 24, 9, 24, 101, 252, 133, 252, 76,
+	247, 14, 160, 16, 169, 0, 133, 250, 169, 0, 133, 251, 169, 0, 141, 23,
+	8, 138, 240, 63, 177, 250, 240, 2, 16, 1, 202, 169, 17, 24, 101, 250,
+	133, 250, 144, 2, 230, 251, 238, 23, 8, 208, 230, 162, 0, 169, 0, 133,
+	252, 138, 141, 23, 8, 10, 38, 252, 10, 38, 252, 10, 38, 252, 10, 38,
+	252, 109, 23, 8, 144, 2, 230, 252, 24, 105, 0, 133, 250, 165, 252, 105,
+	0, 133, 251, 32, 44, 18, 165, 250, 141, 25, 8, 165, 251, 141, 26, 8,
+	162, 7, 169, 255, 157, 208, 8, 169, 240, 157, 216, 8, 157, 224, 8, 202,
+	16, 240, 169, 3, 141, 15, 210, 141, 31, 210, 141, 47, 210, 141, 63, 210,
+	206, 23, 8, 232, 142, 28, 8, 232, 142, 29, 8, 142, 22, 8, 96, 138,
+	41, 15, 141, 27, 8, 96, 142, 22, 8, 96, 201, 16, 176, 3, 76, 76,
+	16, 201, 32, 144, 136, 201, 48, 176, 3, 76, 133, 18, 201, 64, 144, 223,
+	201, 80, 176, 3, 76, 44, 18, 201, 96, 144, 219, 201, 112, 144, 3, 76,
+	180, 17, 132, 253, 41, 15, 10, 141, 23, 17, 165, 253, 144, 254, 144, 30,
+	144, 56, 144, 89, 144, 96, 144, 26, 144, 28, 144, 30, 144, 32, 144, 34,
+	144, 36, 144, 13, 144, 11, 144, 9, 144, 7, 144, 5, 144, 3, 141, 24,
+	8, 96, 157, 104, 9, 96, 157, 112, 9, 96, 157, 120, 9, 96, 157, 144,
+	9, 96, 157, 128, 9, 96, 157, 136, 9, 96, 41, 112, 74, 74, 157, 16,
+	9, 41, 48, 208, 3, 157, 32, 9, 165, 253, 48, 6, 41, 15, 157, 24,
+	9, 96, 41, 15, 73, 255, 24, 105, 1, 157, 24, 9, 96, 41, 63, 157,
+	48, 9, 157, 56, 9, 96, 41, 128, 10, 42, 157, 96, 9, 165, 253, 41,
+	112, 74, 74, 74, 74, 157, 64, 9, 208, 3, 157, 96, 9, 165, 253, 41,
+	15, 157, 80, 9, 157, 88, 9, 189, 72, 9, 221, 64, 9, 144, 143, 189,
+	64, 9, 240, 2, 233, 1, 157, 72, 9, 96, 132, 250, 134, 251, 160, 25,
+	177, 250, 200, 141, 9, 8, 177, 250, 200, 141, 10, 8, 177, 250, 200, 141,
+	11, 8, 177, 250, 200, 141, 12, 8, 177, 250, 200, 141, 13, 8, 177, 250,
+	141, 27, 8, 165, 250, 73, 128, 48, 1, 232, 141, 172, 18, 142, 173, 18,
+	73, 128, 48, 1, 232, 141, 29, 10, 142, 30, 10, 232, 141, 35, 10, 142,
+	36, 10, 232, 141, 162, 18, 142, 163, 18, 73, 128, 48, 1, 232, 141, 25,
+	8, 141, 215, 9, 141, 79, 16, 141, 148, 16, 142, 26, 8, 142, 221, 9,
+	142, 83, 16, 142, 154, 16, 169, 240, 133, 255, 169, 0, 141, 22, 8, 141,
+	24, 8, 162, 7, 169, 0, 141, 22, 8, 157, 120, 8, 157, 176, 8, 157,
+	32, 8, 157, 40, 8, 157, 48, 8, 157, 48, 210, 157, 32, 210, 157, 16,
+	210, 157, 0, 210, 202, 16, 226, 141, 24, 210, 141, 8, 210, 141, 56, 210,
+	141, 40, 210, 141, 30, 8, 141, 31, 8, 96, 157, 32, 8, 157, 40, 8,
+	157, 48, 8, 157, 176, 8, 96, 152, 157, 208, 8, 41, 240, 157, 216, 8,
+	189, 208, 8, 10, 10, 10, 10, 157, 224, 8, 96, 41, 7, 133, 250, 138,
+	166, 250, 41, 63, 240, 225, 157, 152, 8, 152, 48, 238, 189, 208, 8, 32,
+	117, 18, 169, 0, 157, 120, 8, 185, 255, 255, 240, 190, 157, 136, 8, 133,
+	251, 185, 255, 255, 157, 128, 8, 133, 250, 152, 157, 144, 8, 160, 8, 177,
+	250, 200, 157, 192, 8, 177, 250, 200, 157, 200, 8, 177, 250, 200, 157, 104,
+	9, 177, 250, 200, 157, 112, 9, 177, 250, 200, 157, 120, 9, 177, 250, 200,
+	157, 232, 8, 157, 248, 8, 177, 250, 200, 157, 240, 8, 157, 0, 9, 177,
+	250, 41, 112, 74, 74, 157, 16, 9, 177, 250, 200, 48, 8, 41, 15, 157,
+	24, 9, 76, 9, 19, 41, 15, 73, 255, 24, 105, 1, 157, 24, 9, 177,
+	250, 200, 157, 40, 9, 177, 250, 200, 41, 63, 157, 48, 9, 157, 56, 9,
+	177, 250, 41, 128, 10, 42, 157, 96, 9, 177, 250, 41, 112, 74, 74, 74,
+	74, 157, 64, 9, 208, 3, 157, 96, 9, 177, 250, 136, 41, 15, 157, 80,
+	9, 157, 88, 9, 177, 250, 41, 192, 29, 152, 8, 157, 152, 8, 168, 185,
+	0, 6, 157, 56, 8, 169, 0, 157, 184, 8, 157, 32, 9, 157, 8, 9,
+	157, 72, 9, 157, 128, 9, 157, 136, 9, 157, 144, 9, 169, 1, 157, 120,
+	8, 96 };
+static const uint8_t CiResource_tmc_obx[2671] = {
+	255, 255, 0, 5, 104, 15, 76, 206, 13, 76, 208, 8, 76, 239, 9, 15,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
+	1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
+	2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3,
+	3, 3, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
+	4, 4, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4,
+	5, 5, 0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5,
+	6, 6, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+	7, 7, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7,
+	7, 8, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5, 6, 7, 7, 8,
+	8, 9, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, 9,
+	9, 10, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10,
+	10, 11, 0, 1, 2, 2, 3, 4, 5, 6, 6, 7, 8, 9, 10, 10,
+	11, 12, 0, 1, 2, 3, 3, 4, 5, 6, 7, 8, 9, 10, 10, 11,
+	12, 13, 0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9, 10, 11, 12,
+	13, 14, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+	14, 15, 0, 241, 228, 215, 203, 192, 181, 170, 161, 152, 143, 135, 127, 120,
+	114, 107, 101, 95, 90, 85, 80, 75, 71, 67, 63, 60, 56, 53, 50, 47,
+	44, 42, 39, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
+	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+	1, 0, 0, 242, 230, 218, 206, 191, 182, 170, 161, 152, 143, 137, 128, 122,
+	113, 107, 101, 95, 92, 86, 80, 77, 71, 68, 62, 60, 56, 53, 50, 47,
+	45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
+	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+	1, 0, 0, 255, 241, 228, 216, 202, 192, 181, 171, 162, 153, 142, 135, 127,
+	121, 115, 112, 102, 97, 90, 85, 82, 75, 72, 67, 63, 60, 57, 55, 51,
+	48, 45, 42, 40, 37, 36, 33, 31, 30, 28, 27, 25, 23, 22, 21, 19,
+	18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3,
+	2, 1, 0, 243, 230, 217, 204, 193, 181, 173, 162, 153, 144, 136, 128, 121,
+	114, 108, 102, 96, 91, 85, 81, 76, 72, 68, 64, 60, 57, 53, 50, 47,
+	45, 42, 40, 37, 35, 33, 31, 29, 28, 26, 24, 23, 22, 20, 19, 18,
+	17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+	1, 0, 0, 242, 51, 150, 226, 56, 140, 0, 106, 232, 106, 239, 128, 8,
+	174, 70, 230, 149, 65, 246, 176, 110, 48, 246, 187, 132, 82, 34, 244, 200,
+	160, 122, 85, 52, 20, 245, 216, 189, 164, 141, 119, 96, 78, 56, 39, 21,
+	6, 247, 232, 219, 207, 195, 184, 172, 162, 154, 144, 136, 127, 120, 112, 106,
+	100, 94, 0, 13, 13, 12, 11, 11, 10, 10, 9, 8, 8, 7, 7, 7,
+	6, 6, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 2, 2,
+	2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
+	6, 7, 0, 1, 2, 3, 4, 2, 0, 0, 4, 2, 0, 0, 0, 16,
+	0, 8, 0, 16, 0, 8, 173, 183, 8, 240, 94, 173, 182, 8, 201, 64,
+	144, 90, 206, 181, 8, 240, 3, 76, 239, 9, 162, 7, 169, 0, 157, 196,
+	7, 157, 204, 7, 202, 16, 247, 141, 182, 8, 170, 160, 15, 177, 254, 16,
+	32, 136, 177, 254, 16, 3, 76, 95, 14, 134, 252, 10, 10, 38, 252, 10,
+	38, 252, 10, 38, 252, 105, 0, 133, 254, 165, 252, 105, 0, 133, 255, 144,
+	218, 157, 212, 7, 136, 177, 254, 157, 220, 7, 232, 136, 16, 207, 24, 165,
+	254, 105, 16, 133, 254, 144, 2, 230, 255, 76, 239, 9, 206, 181, 8, 16,
+	248, 238, 182, 8, 173, 180, 8, 141, 181, 8, 162, 7, 222, 204, 7, 48,
+	3, 76, 233, 9, 188, 212, 7, 185, 255, 255, 133, 252, 185, 255, 255, 133,
+	253, 188, 196, 7, 177, 252, 208, 6, 32, 109, 13, 76, 230, 9, 201, 64,
+	176, 18, 125, 220, 7, 157, 228, 7, 32, 109, 13, 188, 42, 5, 32, 188,
+	14, 76, 230, 9, 208, 34, 200, 254, 196, 7, 177, 252, 16, 7, 133, 251,
+	32, 109, 13, 165, 251, 41, 127, 208, 7, 169, 64, 141, 182, 8, 208, 76,
+	141, 180, 8, 141, 181, 8, 208, 68, 201, 128, 176, 43, 41, 63, 125, 220,
+	7, 157, 228, 7, 200, 254, 196, 7, 177, 252, 41, 127, 208, 7, 169, 64,
+	141, 182, 8, 208, 6, 141, 180, 8, 141, 181, 8, 32, 109, 13, 188, 42,
+	5, 32, 188, 14, 76, 230, 9, 201, 192, 176, 12, 41, 63, 157, 42, 5,
+	200, 254, 196, 7, 76, 94, 9, 41, 63, 157, 204, 7, 254, 196, 7, 202,
+	48, 3, 76, 70, 9, 162, 7, 189, 188, 7, 240, 33, 32, 46, 11, 189,
+	50, 5, 61, 192, 8, 240, 22, 160, 71, 177, 252, 24, 125, 34, 5, 157,
+	36, 5, 168, 185, 60, 6, 56, 125, 100, 8, 157, 246, 7, 202, 16, 215,
+	14, 9, 5, 14, 9, 5, 14, 9, 5, 14, 9, 5, 232, 134, 252, 134,
+	253, 162, 7, 138, 168, 185, 252, 7, 208, 12, 188, 184, 8, 185, 4, 8,
+	208, 4, 138, 168, 169, 0, 133, 250, 152, 157, 26, 5, 185, 244, 7, 157,
+	18, 5, 185, 50, 5, 133, 251, 5, 253, 133, 253, 165, 251, 61, 192, 8,
+	240, 6, 185, 246, 7, 157, 20, 5, 165, 251, 61, 200, 8, 240, 18, 185,
+	34, 5, 41, 63, 168, 200, 132, 252, 185, 123, 7, 157, 18, 5, 76, 137,
+	10, 164, 252, 240, 10, 185, 59, 7, 157, 18, 5, 169, 0, 133, 252, 165,
+	250, 13, 9, 5, 168, 185, 60, 5, 188, 26, 5, 25, 236, 7, 157, 10,
+	5, 224, 4, 208, 9, 165, 253, 141, 59, 5, 169, 0, 133, 253, 202, 16,
+	130, 78, 9, 5, 78, 9, 5, 78, 9, 5, 78, 9, 5, 165, 253, 162,
+	3, 142, 31, 210, 142, 15, 210, 174, 22, 5, 172, 18, 5, 142, 16, 210,
+	140, 0, 210, 174, 14, 5, 172, 10, 5, 142, 17, 210, 140, 1, 210, 174,
+	23, 5, 172, 19, 5, 142, 18, 210, 140, 2, 210, 174, 15, 5, 172, 11,
+	5, 142, 19, 210, 140, 3, 210, 174, 24, 5, 172, 20, 5, 142, 20, 210,
+	140, 4, 210, 174, 16, 5, 172, 12, 5, 142, 21, 210, 140, 5, 210, 174,
+	25, 5, 172, 21, 5, 142, 22, 210, 140, 6, 210, 174, 17, 5, 172, 13,
+	5, 142, 23, 210, 140, 7, 210, 141, 58, 5, 174, 59, 5, 142, 24, 210,
+	141, 8, 210, 96, 189, 28, 8, 133, 252, 189, 36, 8, 133, 253, 188, 44,
+	8, 192, 63, 240, 123, 254, 44, 8, 254, 44, 8, 254, 44, 8, 177, 252,
+	41, 240, 157, 236, 7, 177, 252, 41, 15, 56, 253, 12, 8, 16, 2, 169,
+	0, 157, 252, 7, 200, 177, 252, 41, 15, 56, 253, 20, 8, 16, 2, 169,
+	0, 157, 4, 8, 177, 252, 41, 240, 240, 116, 16, 11, 160, 73, 177, 252,
+	188, 44, 8, 136, 136, 16, 2, 169, 0, 157, 50, 5, 177, 252, 41, 112,
+	240, 99, 74, 74, 141, 154, 11, 169, 0, 157, 100, 8, 200, 177, 252, 144,
+	254, 234, 234, 234, 234, 76, 56, 13, 234, 76, 53, 13, 234, 76, 60, 13,
+	234, 76, 74, 13, 234, 76, 84, 13, 234, 76, 95, 13, 234, 76, 81, 13,
+	189, 52, 8, 240, 18, 222, 68, 8, 208, 13, 157, 68, 8, 189, 252, 7,
+	41, 15, 240, 3, 222, 252, 7, 189, 60, 8, 240, 18, 222, 76, 8, 208,
+	13, 157, 76, 8, 189, 4, 8, 41, 15, 240, 3, 222, 4, 8, 160, 72,
+	177, 252, 157, 50, 5, 189, 148, 8, 24, 105, 63, 168, 177, 252, 125, 228,
+	7, 157, 34, 5, 168, 185, 60, 6, 157, 244, 7, 222, 164, 8, 16, 51,
+	189, 156, 8, 157, 164, 8, 189, 172, 8, 240, 24, 24, 125, 148, 8, 157,
+	148, 8, 240, 7, 221, 140, 8, 208, 26, 169, 254, 24, 105, 1, 157, 172,
+	8, 208, 16, 254, 148, 8, 189, 140, 8, 221, 148, 8, 176, 5, 169, 0,
+	157, 148, 8, 189, 116, 8, 240, 4, 222, 116, 8, 96, 189, 108, 8, 133,
+	250, 189, 92, 8, 133, 251, 32, 105, 12, 222, 132, 8, 16, 16, 165, 250,
+	157, 108, 8, 165, 251, 157, 92, 8, 189, 124, 8, 157, 132, 8, 96, 189,
+	84, 8, 141, 112, 12, 16, 254, 76, 167, 12, 234, 76, 144, 12, 234, 76,
+	174, 12, 234, 76, 180, 12, 234, 76, 190, 12, 234, 76, 210, 12, 234, 76,
+	226, 12, 234, 76, 244, 12, 165, 250, 230, 250, 41, 3, 74, 144, 15, 208,
+	71, 165, 251, 157, 100, 8, 24, 125, 244, 7, 157, 244, 7, 96, 169, 0,
+	157, 100, 8, 96, 32, 29, 13, 76, 157, 12, 32, 29, 13, 24, 125, 34,
+	5, 76, 84, 13, 165, 250, 157, 100, 8, 24, 125, 244, 7, 157, 244, 7,
+	165, 250, 24, 101, 251, 133, 250, 96, 189, 34, 5, 56, 229, 250, 157, 34,
+	5, 168, 185, 60, 6, 76, 199, 12, 189, 244, 7, 56, 229, 251, 157, 244,
+	7, 56, 169, 0, 229, 251, 157, 100, 8, 96, 189, 132, 8, 208, 174, 165,
+	251, 16, 16, 189, 4, 8, 240, 165, 189, 252, 7, 201, 15, 240, 158, 254,
+	252, 7, 96, 189, 252, 7, 240, 149, 189, 4, 8, 201, 15, 240, 142, 254,
+	4, 8, 96, 164, 250, 165, 251, 48, 2, 200, 200, 136, 152, 133, 250, 197,
+	251, 208, 6, 165, 251, 73, 255, 133, 251, 152, 96, 125, 244, 7, 157, 244,
+	7, 96, 188, 228, 7, 121, 60, 6, 157, 244, 7, 152, 157, 34, 5, 96,
+	45, 10, 210, 157, 244, 7, 96, 125, 228, 7, 157, 34, 5, 168, 185, 60,
+	6, 157, 244, 7, 96, 157, 34, 5, 168, 189, 244, 7, 121, 60, 6, 157,
+	244, 7, 96, 200, 254, 196, 7, 177, 252, 74, 74, 74, 74, 157, 12, 8,
+	177, 252, 41, 15, 157, 20, 8, 96, 32, 95, 14, 160, 15, 169, 0, 133,
+	254, 169, 0, 133, 255, 138, 240, 46, 177, 254, 16, 1, 202, 24, 165, 254,
+	105, 16, 133, 254, 144, 239, 230, 255, 176, 235, 32, 95, 14, 169, 0, 133,
+	252, 138, 10, 10, 38, 252, 10, 38, 252, 10, 38, 252, 105, 0, 133, 254,
+	165, 252, 105, 0, 133, 255, 169, 64, 141, 182, 8, 169, 1, 141, 181, 8,
+	141, 183, 8, 96, 201, 16, 144, 176, 201, 32, 144, 206, 201, 48, 176, 3,
+	76, 174, 14, 201, 64, 176, 9, 138, 41, 15, 240, 3, 141, 180, 8, 96,
+	201, 80, 144, 113, 201, 96, 176, 6, 169, 0, 141, 183, 8, 96, 201, 112,
+	144, 248, 169, 1, 141, 181, 8, 169, 64, 141, 182, 8, 132, 252, 134, 253,
+	160, 30, 177, 252, 141, 180, 8, 165, 252, 24, 105, 32, 141, 194, 14, 144,
+	1, 232, 142, 195, 14, 24, 105, 64, 141, 202, 14, 144, 1, 232, 142, 203,
+	14, 24, 105, 64, 141, 82, 9, 144, 1, 232, 142, 83, 9, 24, 105, 128,
+	141, 87, 9, 144, 1, 232, 142, 88, 9, 24, 105, 128, 133, 254, 141, 16,
+	9, 141, 136, 13, 141, 183, 13, 144, 1, 232, 134, 255, 142, 22, 9, 142,
+	140, 13, 142, 189, 13, 160, 7, 169, 0, 141, 183, 8, 153, 0, 210, 153,
+	16, 210, 153, 10, 5, 153, 252, 7, 153, 4, 8, 153, 50, 5, 153, 188,
+	7, 136, 16, 232, 141, 8, 210, 141, 24, 210, 141, 58, 5, 141, 59, 5,
+	96, 157, 252, 7, 157, 4, 8, 157, 50, 5, 189, 228, 7, 157, 34, 5,
+	96, 152, 73, 240, 74, 74, 74, 74, 157, 12, 8, 152, 41, 15, 73, 15,
+	157, 20, 8, 96, 41, 7, 133, 252, 138, 166, 252, 41, 63, 240, 226, 157,
+	228, 7, 169, 0, 157, 188, 7, 185, 255, 255, 157, 28, 8, 133, 252, 185,
+	255, 255, 157, 36, 8, 133, 253, 5, 252, 240, 182, 160, 74, 177, 252, 157,
+	52, 8, 157, 68, 8, 200, 177, 252, 157, 60, 8, 157, 76, 8, 200, 177,
+	252, 41, 112, 74, 74, 157, 84, 8, 177, 252, 41, 15, 157, 92, 8, 177,
+	252, 16, 11, 189, 92, 8, 73, 255, 24, 105, 1, 157, 92, 8, 200, 177,
+	252, 157, 116, 8, 200, 177, 252, 41, 63, 157, 124, 8, 157, 132, 8, 200,
+	177, 252, 41, 128, 240, 2, 169, 1, 157, 172, 8, 177, 252, 41, 112, 74,
+	74, 74, 74, 157, 140, 8, 208, 3, 157, 172, 8, 177, 252, 41, 15, 157,
+	156, 8, 157, 164, 8, 136, 177, 252, 41, 192, 24, 125, 228, 7, 157, 228,
+	7, 157, 34, 5, 168, 185, 60, 6, 157, 244, 7, 169, 0, 157, 44, 8,
+	157, 100, 8, 157, 108, 8, 157, 148, 8, 169, 1, 157, 188, 7, 96 };
+static const uint8_t CiResource_xexb_obx[183] = {
+	255, 255, 36, 1, 223, 1, 120, 160, 0, 140, 14, 212, 173, 11, 212, 208,
+	251, 141, 0, 212, 162, 29, 157, 0, 208, 202, 16, 250, 162, 8, 157, 16,
+	210, 157, 0, 210, 202, 16, 247, 169, 3, 141, 31, 210, 141, 0, 210, 169,
+	130, 205, 11, 212, 208, 251, 141, 10, 212, 141, 10, 212, 141, 10, 212, 173,
+	11, 212, 208, 3, 238, 145, 1, 173, 218, 1, 32, 212, 1, 169, 254, 141,
+	1, 211, 169, 206, 174, 53, 1, 240, 2, 169, 194, 141, 250, 255, 169, 1,
+	141, 251, 255, 169, 64, 141, 14, 212, 169, 125, 205, 11, 212, 208, 251, 32,
+	215, 1, 162, 0, 173, 219, 1, 74, 144, 6, 169, 0, 238, 153, 1, 74,
+	189, 220, 1, 105, 125, 176, 5, 221, 210, 1, 144, 4, 253, 210, 1, 56,
+	141, 162, 1, 189, 222, 1, 105, 0, 141, 181, 1, 201, 0, 208, 252, 173,
+	162, 1, 176, 198, 72, 138, 72, 174, 145, 1, 32, 152, 252, 104, 170, 104,
+	238, 186, 1, 64, 156, 131, 76 };
+static const uint8_t CiResource_xexd_obx[117] = {
+	255, 255, 36, 1, 152, 1, 120, 160, 0, 140, 14, 212, 173, 11, 212, 208,
+	251, 141, 0, 212, 162, 29, 157, 0, 208, 202, 16, 250, 141, 14, 210, 162,
+	8, 157, 16, 210, 157, 0, 210, 202, 16, 247, 169, 3, 141, 31, 210, 141,
+	0, 210, 169, 254, 141, 1, 211, 173, 149, 1, 201, 96, 240, 15, 169, 114,
+	141, 250, 255, 169, 1, 141, 251, 255, 169, 64, 141, 14, 212, 173, 152, 1,
+	88, 76, 146, 1, 40, 8, 72, 138, 72, 152, 72, 32, 149, 1, 174, 53,
+	1, 240, 11, 174, 20, 208, 202, 240, 2, 162, 1, 32, 152, 252, 104, 168,
+	104, 170, 104, 64, 76 };
+static const uint8_t CiResource_xexinfo_obx[178] = {
+	255, 255, 112, 252, 221, 252, 65, 80, 252, 173, 11, 212, 208, 251, 141, 5,
+	212, 162, 38, 142, 22, 208, 162, 10, 142, 23, 208, 162, 33, 142, 0, 212,
+	162, 80, 142, 2, 212, 162, 252, 142, 3, 212, 142, 9, 212, 96, 216, 189,
+	218, 252, 24, 105, 0, 141, 158, 252, 189, 220, 252, 105, 0, 141, 166, 252,
+	144, 18, 173, 75, 252, 13, 76, 252, 13, 78, 252, 13, 79, 252, 201, 49,
+	162, 4, 176, 13, 96, 169, 57, 224, 3, 208, 2, 169, 53, 157, 75, 252,
+	202, 189, 75, 252, 201, 49, 144, 237, 201, 58, 240, 244, 222, 75, 252, 96,
+	34, 69, 5, 4, 0, 1, 57, 1, 120, 160, 0, 140, 14, 212, 173, 11,
+	212, 208, 251, 141, 0, 212, 162, 29, 157, 0, 208, 202, 16, 250, 142, 1,
+	211, 185, 0, 224, 72, 185, 0, 225, 72, 185, 0, 227, 202, 142, 1, 211,
+	232, 153, 0, 255, 104, 153, 0, 254, 104, 153, 0, 253, 200, 208, 223, 32,
+	115, 252 };
+
+static void ASAP_Construct(ASAP *self)
+{
+	PokeyPair_Construct(&self->pokeys);
+	ASAPInfo_Construct(&self->moduleInfo);
+	self->silenceCycles = 0;
+	self->cpu.asap = self;
+}
+
+static void ASAP_Destruct(ASAP *self)
+{
+	ASAPInfo_Destruct(&self->moduleInfo);
+}
+
+ASAP *ASAP_New(void)
+{
+	ASAP *self = (ASAP *) malloc(sizeof(ASAP));
+	if (self != NULL)
+		ASAP_Construct(self);
+	return self;
+}
+
+void ASAP_Delete(ASAP *self)
+{
+	if (self == NULL)
+		return;
+	ASAP_Destruct(self);
+	free(self);
+}
+
+void ASAP_DetectSilence(ASAP *self, int seconds)
+{
+	self->silenceCyclesCounter = self->silenceCycles = seconds * 1773447;
+}
+
+static int ASAP_PeekHardware(const ASAP *self, int addr)
+{
+	switch (addr & 65311) {
+	case 53268:
+		return ASAPInfo_IsNtsc(&self->moduleInfo) ? 15 : 1;
+	case 53279:
+		return ~self->consol & 15;
+	case 53770:
+	case 53786:
+	case 53774:
+	case 53790:
+		return PokeyPair_Peek(&self->pokeys, addr, self->cpu.cycle);
+	case 53772:
+	case 53788:
+	case 53775:
+	case 53791:
+		return 255;
+	case 54283:
+	case 54299:
+		;
+		int cycle = self->cpu.cycle;
+		if (cycle > (ASAPInfo_IsNtsc(&self->moduleInfo) ? 29868 : 35568))
+			return 0;
+		return cycle / 228;
+	case 54287:
+	case 54303:
+		switch (self->nmist) {
+		case NmiStatus_RESET:
+			return 31;
+		case NmiStatus_WAS_V_BLANK:
+			return 95;
+		default:
+			return self->cpu.cycle < 28291 ? 31 : 95;
+		}
+	default:
+		return self->cpu.memory[addr];
+	}
+}
+
+static void ASAP_PokeHardware(ASAP *self, int addr, int data)
+{
+	if (addr >> 8 == 210) {
+		int t = PokeyPair_Poke(&self->pokeys, addr, data, self->cpu.cycle);
+		if (self->nextEventCycle > t)
+			self->nextEventCycle = t;
+	}
+	else if ((addr & 65295) == 54282) {
+		int x = self->cpu.cycle % 114;
+		self->cpu.cycle += (x <= 106 ? 106 : 220) - x;
+	}
+	else if ((addr & 65295) == 54287) {
+		self->nmist = self->cpu.cycle < 28292 ? NmiStatus_ON_V_BLANK : NmiStatus_RESET;
+	}
+	else if ((addr & 65280) == ASAPInfo_GetCovoxAddress(&self->moduleInfo)) {
+		Pokey *pokey;
+		addr &= 3;
+		if (addr == 0 || addr == 3)
+			pokey = &self->pokeys.basePokey;
+		else
+			pokey = &self->pokeys.extraPokey;
+		int delta = data - self->covox[addr];
+		if (delta != 0) {
+			Pokey_AddDelta(pokey, &self->pokeys, self->cpu.cycle, delta << 17);
+			self->covox[addr] = (uint8_t) data;
+			self->gtiaOrCovoxPlayedThisFrame = true;
+		}
+	}
+	else if ((addr & 65311) == 53279) {
+		int delta = ((self->consol & 8) - (data & 8)) << 20;
+		if (delta != 0) {
+			int cycle = self->cpu.cycle;
+			Pokey_AddDelta(&self->pokeys.basePokey, &self->pokeys, cycle, delta);
+			Pokey_AddDelta(&self->pokeys.extraPokey, &self->pokeys, cycle, delta);
+			self->gtiaOrCovoxPlayedThisFrame = true;
+		}
+		self->consol = data;
+	}
+	else
+		self->cpu.memory[addr] = (uint8_t) data;
+}
+
+static void ASAP_Call6502(ASAP *self, int addr)
+{
+	self->cpu.memory[53760] = 32;
+	self->cpu.memory[53761] = (uint8_t) (addr & 255);
+	self->cpu.memory[53762] = (uint8_t) (addr >> 8);
+	self->cpu.memory[53763] = 210;
+	self->cpu.pc = 53760;
+}
+
+static void ASAP_Call6502Player(ASAP *self)
+{
+	int player = self->moduleInfo.player;
+	switch (self->moduleInfo.type) {
+	case ASAPModuleType_SAP_B:
+		ASAP_Call6502(self, player);
+		break;
+	case ASAPModuleType_SAP_C:
+	case ASAPModuleType_CMC:
+	case ASAPModuleType_CM3:
+	case ASAPModuleType_CMR:
+	case ASAPModuleType_CMS:
+		ASAP_Call6502(self, player + 6);
+		break;
+	case ASAPModuleType_SAP_D:
+		if (player >= 0) {
+			Cpu6502_PushPc(&self->cpu);
+			self->cpu.memory[53760] = 8;
+			self->cpu.memory[53761] = 72;
+			self->cpu.memory[53762] = 138;
+			self->cpu.memory[53763] = 72;
+			self->cpu.memory[53764] = 152;
+			self->cpu.memory[53765] = 72;
+			self->cpu.memory[53766] = 32;
+			self->cpu.memory[53767] = (uint8_t) (player & 255);
+			self->cpu.memory[53768] = (uint8_t) (player >> 8);
+			self->cpu.memory[53769] = 104;
+			self->cpu.memory[53770] = 168;
+			self->cpu.memory[53771] = 104;
+			self->cpu.memory[53772] = 170;
+			self->cpu.memory[53773] = 104;
+			self->cpu.memory[53774] = 64;
+			self->cpu.pc = 53760;
+		}
+		break;
+	case ASAPModuleType_SAP_S:
+		;
+		int i = self->cpu.memory[69] - 1;
+		self->cpu.memory[69] = (uint8_t) (i & 255);
+		if (i == 0)
+			self->cpu.memory[45179] = (uint8_t) ((self->cpu.memory[45179] + 1) & 255);
+		break;
+	case ASAPModuleType_DLT:
+		ASAP_Call6502(self, player + 259);
+		break;
+	case ASAPModuleType_MPT:
+	case ASAPModuleType_RMT:
+	case ASAPModuleType_TM2:
+	case ASAPModuleType_FC:
+		ASAP_Call6502(self, player + 3);
+		break;
+	case ASAPModuleType_TMC:
+		if (--self->tmcPerFrameCounter <= 0) {
+			self->tmcPerFrameCounter = self->cpu.memory[ASAPInfo_GetMusicAddress(&self->moduleInfo) + 31];
+			ASAP_Call6502(self, player + 3);
+		}
+		else
+			ASAP_Call6502(self, player + 6);
+		break;
+	}
+}
+
+static bool ASAP_IsIrq(const ASAP *self)
+{
+	return self->pokeys.basePokey.irqst != 255;
+}
+
+static void ASAP_HandleEvent(ASAP *self)
+{
+	int cycle = self->cpu.cycle;
+	if (cycle >= self->nextScanlineCycle) {
+		if (cycle - self->nextScanlineCycle < 50)
+			self->cpu.cycle = cycle += 9;
+		self->nextScanlineCycle += 114;
+		if (cycle >= self->nextPlayerCycle) {
+			ASAP_Call6502Player(self);
+			self->nextPlayerCycle += 114 * ASAPInfo_GetPlayerRateScanlines(&self->moduleInfo);
+		}
+	}
+	int nextEventCycle = self->nextScanlineCycle;
+	nextEventCycle = Pokey_CheckIrq(&self->pokeys.basePokey, cycle, nextEventCycle);
+	nextEventCycle = Pokey_CheckIrq(&self->pokeys.extraPokey, cycle, nextEventCycle);
+	self->nextEventCycle = nextEventCycle;
+}
+
+static int ASAP_Do6502Frame(ASAP *self)
+{
+	self->nextEventCycle = 0;
+	self->nextScanlineCycle = 0;
+	self->nmist = self->nmist == NmiStatus_RESET ? NmiStatus_ON_V_BLANK : NmiStatus_WAS_V_BLANK;
+	int cycles = ASAPInfo_IsNtsc(&self->moduleInfo) ? 29868 : 35568;
+	Cpu6502_DoFrame(&self->cpu, cycles);
+	self->cpu.cycle -= cycles;
+	if (self->nextPlayerCycle != 8388608)
+		self->nextPlayerCycle -= cycles;
+	for (int i = 3;; i >>= 1) {
+		PokeyChannel_EndFrame(&self->pokeys.basePokey.channels[i], cycles);
+		PokeyChannel_EndFrame(&self->pokeys.extraPokey.channels[i], cycles);
+		if (i == 0)
+			break;
+	}
+	return cycles;
+}
+
+static int ASAP_DoFrame(ASAP *self)
+{
+	self->gtiaOrCovoxPlayedThisFrame = false;
+	PokeyPair_StartFrame(&self->pokeys);
+	int cycles = ASAP_Do6502Frame(self);
+	PokeyPair_EndFrame(&self->pokeys, cycles);
+	return cycles;
+}
+
+bool ASAP_Load(ASAP *self, const char *filename, uint8_t const *module, int moduleLen)
+{
+	if (!ASAPInfo_Load(&self->moduleInfo, filename, module, moduleLen))
+		return false;
+	uint8_t const *playerRoutine = ASAP6502_GetPlayerRoutine(&self->moduleInfo);
+	if (playerRoutine != NULL) {
+		int player = ASAPInfo_GetWord(playerRoutine, 2);
+		int playerLastByte = ASAPInfo_GetWord(playerRoutine, 4);
+		int music = ASAPInfo_GetMusicAddress(&self->moduleInfo);
+		if (music <= playerLastByte)
+			return false;
+		self->cpu.memory[19456] = 0;
+		if (self->moduleInfo.type == ASAPModuleType_FC)
+			memcpy(self->cpu.memory + music, module, moduleLen);
+		else
+			memcpy(self->cpu.memory + music, module + 6, moduleLen - 6);
+		memcpy(self->cpu.memory + player, playerRoutine + 6, playerLastByte + 1 - player);
+		if (self->moduleInfo.player < 0)
+			self->moduleInfo.player = player;
+		return true;
+	}
+	memset(self->cpu.memory, 0, sizeof(self->cpu.memory));
+	int moduleIndex = self->moduleInfo.headerLen + 2;
+	while (moduleIndex + 5 <= moduleLen) {
+		int startAddr = ASAPInfo_GetWord(module, moduleIndex);
+		int blockLen = ASAPInfo_GetWord(module, moduleIndex + 2) + 1 - startAddr;
+		if (blockLen <= 0 || moduleIndex + blockLen > moduleLen)
+			return false;
+		moduleIndex += 4;
+		memcpy(self->cpu.memory + startAddr, module + moduleIndex, blockLen);
+		moduleIndex += blockLen;
+		if (moduleIndex == moduleLen)
+			return true;
+		if (moduleIndex + 7 <= moduleLen && module[moduleIndex] == 255 && module[moduleIndex + 1] == 255)
+			moduleIndex += 2;
+	}
+	return false;
+}
+
+const ASAPInfo *ASAP_GetInfo(const ASAP *self)
+{
+	return &self->moduleInfo;
+}
+
+static bool ASAP_Do6502Init(ASAP *self, int pc, int a, int x, int y)
+{
+	self->cpu.pc = pc;
+	self->cpu.a = a & 255;
+	self->cpu.x = x & 255;
+	self->cpu.y = y & 255;
+	self->cpu.memory[53760] = 210;
+	self->cpu.memory[510] = 255;
+	self->cpu.memory[511] = 209;
+	self->cpu.s = 253;
+	for (int frame = 0; frame < 50; frame++) {
+		ASAP_Do6502Frame(self);
+		if (self->cpu.pc == 53760)
+			return true;
+	}
+	return false;
+}
+
+void ASAP_MutePokeyChannels(ASAP *self, int mask)
+{
+	Pokey_Mute(&self->pokeys.basePokey, mask);
+	Pokey_Mute(&self->pokeys.extraPokey, mask >> 4);
+}
+
+bool ASAP_PlaySong(ASAP *self, int song, int duration)
+{
+	if (song < 0 || song >= ASAPInfo_GetSongs(&self->moduleInfo))
+		return false;
+	self->currentSong = song;
+	self->currentDuration = duration;
+	self->nextPlayerCycle = 8388608;
+	self->blocksPlayed = 0;
+	self->silenceCyclesCounter = self->silenceCycles;
+	Cpu6502_Reset(&self->cpu);
+	self->nmist = NmiStatus_ON_V_BLANK;
+	self->consol = 8;
+	self->covox[0] = 128;
+	self->covox[1] = 128;
+	self->covox[2] = 128;
+	self->covox[3] = 128;
+	PokeyPair_Initialize(&self->pokeys, ASAPInfo_IsNtsc(&self->moduleInfo), ASAPInfo_GetChannels(&self->moduleInfo) > 1);
+	ASAP_MutePokeyChannels(self, 255);
+	int player = self->moduleInfo.player;
+	int music = ASAPInfo_GetMusicAddress(&self->moduleInfo);
+	switch (self->moduleInfo.type) {
+	case ASAPModuleType_SAP_B:
+		if (!ASAP_Do6502Init(self, ASAPInfo_GetInitAddress(&self->moduleInfo), song, 0, 0))
+			return false;
+		break;
+	case ASAPModuleType_SAP_C:
+	case ASAPModuleType_CMC:
+	case ASAPModuleType_CM3:
+	case ASAPModuleType_CMR:
+	case ASAPModuleType_CMS:
+		if (!ASAP_Do6502Init(self, player + 3, 112, music, music >> 8))
+			return false;
+		if (!ASAP_Do6502Init(self, player + 3, 0, song, 0))
+			return false;
+		break;
+	case ASAPModuleType_SAP_D:
+	case ASAPModuleType_SAP_S:
+		self->cpu.pc = ASAPInfo_GetInitAddress(&self->moduleInfo);
+		self->cpu.a = song;
+		self->cpu.x = 0;
+		self->cpu.y = 0;
+		self->cpu.s = 255;
+		break;
+	case ASAPModuleType_DLT:
+		if (!ASAP_Do6502Init(self, player + 256, 0, 0, self->moduleInfo.songPos[song]))
+			return false;
+		break;
+	case ASAPModuleType_MPT:
+		if (!ASAP_Do6502Init(self, player, 0, music >> 8, music))
+			return false;
+		if (!ASAP_Do6502Init(self, player, 2, self->moduleInfo.songPos[song], 0))
+			return false;
+		break;
+	case ASAPModuleType_RMT:
+		if (!ASAP_Do6502Init(self, player, self->moduleInfo.songPos[song], music, music >> 8))
+			return false;
+		break;
+	case ASAPModuleType_TMC:
+	case ASAPModuleType_TM2:
+		if (!ASAP_Do6502Init(self, player, 112, music >> 8, music))
+			return false;
+		if (!ASAP_Do6502Init(self, player, 0, song, 0))
+			return false;
+		self->tmcPerFrameCounter = 1;
+		break;
+	case ASAPModuleType_FC:
+		if (!ASAP_Do6502Init(self, player, song, 0, 0))
+			return false;
+		break;
+	}
+	ASAP_MutePokeyChannels(self, 0);
+	self->nextPlayerCycle = 0;
+	return true;
+}
+
+int ASAP_GetBlocksPlayed(const ASAP *self)
+{
+	return self->blocksPlayed;
+}
+
+int ASAP_GetPosition(const ASAP *self)
+{
+	return self->blocksPlayed * 10 / 441;
+}
+
+static int ASAP_MillisecondsToBlocks(int milliseconds)
+{
+	return milliseconds * 441 / 10;
+}
+
+bool ASAP_SeekSample(ASAP *self, int block)
+{
+	if (block < self->blocksPlayed) {
+		if (!ASAP_PlaySong(self, self->currentSong, self->currentDuration))
+			return false;
+	}
+	while (self->blocksPlayed + self->pokeys.readySamplesEnd < block) {
+		self->blocksPlayed += self->pokeys.readySamplesEnd;
+		ASAP_DoFrame(self);
+	}
+	self->pokeys.readySamplesStart = block - self->blocksPlayed;
+	self->blocksPlayed = block;
+	return true;
+}
+
+bool ASAP_Seek(ASAP *self, int position)
+{
+	return ASAP_SeekSample(self, ASAP_MillisecondsToBlocks(position));
+}
+
+static void ASAP_PutLittleEndian(uint8_t *buffer, int offset, int value)
+{
+	buffer[offset] = (uint8_t) (value & 255);
+	buffer[offset + 1] = (uint8_t) (value >> 8 & 255);
+	buffer[offset + 2] = (uint8_t) (value >> 16 & 255);
+	buffer[offset + 3] = (uint8_t) (value >> 24 & 255);
+}
+
+static void ASAP_PutLittleEndians(uint8_t *buffer, int offset, int value1, int value2)
+{
+	ASAP_PutLittleEndian(buffer, offset, value1);
+	ASAP_PutLittleEndian(buffer, offset + 4, value2);
+}
+
+static int ASAP_PutWavMetadata(uint8_t *buffer, int offset, int fourCC, const char *value)
+{
+	int len = (int) strlen(value);
+	if (len > 0) {
+		ASAP_PutLittleEndians(buffer, offset, fourCC, (len | 1) + 1);
+		offset += 8;
+		for (int i = 0; i < len; i++)
+			buffer[offset++] = (uint8_t) value[i];
+		buffer[offset++] = 0;
+		if ((len & 1) == 0)
+			buffer[offset++] = 0;
+	}
+	return offset;
+}
+
+int ASAP_GetWavHeader(const ASAP *self, uint8_t *buffer, ASAPSampleFormat format, bool metadata)
+{
+	int use16bit = format != ASAPSampleFormat_U8 ? 1 : 0;
+	int blockSize = ASAPInfo_GetChannels(&self->moduleInfo) << use16bit;
+	int bytesPerSecond = 44100 * blockSize;
+	int totalBlocks = ASAP_MillisecondsToBlocks(self->currentDuration);
+	int nBytes = (totalBlocks - self->blocksPlayed) * blockSize;
+	ASAP_PutLittleEndian(buffer, 8, 1163280727);
+	ASAP_PutLittleEndians(buffer, 12, 544501094, 16);
+	buffer[20] = 1;
+	buffer[21] = 0;
+	buffer[22] = (uint8_t) ASAPInfo_GetChannels(&self->moduleInfo);
+	buffer[23] = 0;
+	ASAP_PutLittleEndians(buffer, 24, 44100, bytesPerSecond);
+	buffer[32] = (uint8_t) blockSize;
+	buffer[33] = 0;
+	buffer[34] = (uint8_t) (8 << use16bit);
+	buffer[35] = 0;
+	int i = 36;
+	if (metadata) {
+		int year = ASAPInfo_GetYear(&self->moduleInfo);
+		if (ASAPInfo_GetTitle(&self->moduleInfo)[0] != '\0' || ASAPInfo_GetAuthor(&self->moduleInfo)[0] != '\0' || year > 0) {
+			ASAP_PutLittleEndian(buffer, 44, 1330007625);
+			i = ASAP_PutWavMetadata(buffer, 48, 1296125513, ASAPInfo_GetTitle(&self->moduleInfo));
+			i = ASAP_PutWavMetadata(buffer, i, 1414676809, ASAPInfo_GetAuthor(&self->moduleInfo));
+			if (year > 0) {
+				ASAP_PutLittleEndians(buffer, i, 1146241865, 6);
+				for (int j = 3; j >= 0; j--) {
+					buffer[i + 8 + j] = (uint8_t) (48 + year % 10);
+					year /= 10;
+				}
+				buffer[i + 12] = 0;
+				buffer[i + 13] = 0;
+				i += 14;
+			}
+			ASAP_PutLittleEndians(buffer, 36, 1414744396, i - 44);
+		}
+	}
+	ASAP_PutLittleEndians(buffer, 0, 1179011410, i + nBytes);
+	ASAP_PutLittleEndians(buffer, i, 1635017060, nBytes);
+	return i + 8;
+}
+
+static int ASAP_GenerateAt(ASAP *self, uint8_t *buffer, int bufferOffset, int bufferLen, ASAPSampleFormat format)
+{
+	if (self->silenceCycles > 0 && self->silenceCyclesCounter <= 0)
+		return 0;
+	int blockShift = ASAPInfo_GetChannels(&self->moduleInfo) - 1 + (format != ASAPSampleFormat_U8 ? 1 : 0);
+	int bufferBlocks = bufferLen >> blockShift;
+	if (self->currentDuration > 0) {
+		int totalBlocks = ASAP_MillisecondsToBlocks(self->currentDuration);
+		if (bufferBlocks > totalBlocks - self->blocksPlayed)
+			bufferBlocks = totalBlocks - self->blocksPlayed;
+	}
+	int block = 0;
+	for (;;) {
+		int blocks = PokeyPair_Generate(&self->pokeys, buffer, bufferOffset + (block << blockShift), bufferBlocks - block, format);
+		self->blocksPlayed += blocks;
+		block += blocks;
+		if (block >= bufferBlocks)
+			break;
+		int cycles = ASAP_DoFrame(self);
+		if (self->silenceCycles > 0) {
+			if (PokeyPair_IsSilent(&self->pokeys) && !self->gtiaOrCovoxPlayedThisFrame) {
+				self->silenceCyclesCounter -= cycles;
+				if (self->silenceCyclesCounter <= 0)
+					break;
+			}
+			else
+				self->silenceCyclesCounter = self->silenceCycles;
+		}
+	}
+	return block << blockShift;
+}
+
+int ASAP_Generate(ASAP *self, uint8_t *buffer, int bufferLen, ASAPSampleFormat format)
+{
+	return ASAP_GenerateAt(self, buffer, 0, bufferLen, format);
+}
+
+int ASAP_GetPokeyChannelVolume(const ASAP *self, int channel)
+{
+	const Pokey *pokey = (channel & 4) == 0 ? &self->pokeys.basePokey : &self->pokeys.extraPokey;
+	return pokey->channels[channel & 3].audc & 15;
+}
+
+static uint8_t const *ASAP6502_GetPlayerRoutine(const ASAPInfo *info)
+{
+	switch (info->type) {
+	case ASAPModuleType_CMC:
+		return CiResource_cmc_obx;
+	case ASAPModuleType_CM3:
+		return CiResource_cm3_obx;
+	case ASAPModuleType_CMR:
+		return CiResource_cmr_obx;
+	case ASAPModuleType_CMS:
+		return CiResource_cms_obx;
+	case ASAPModuleType_DLT:
+		return CiResource_dlt_obx;
+	case ASAPModuleType_MPT:
+		return CiResource_mpt_obx;
+	case ASAPModuleType_RMT:
+		return ASAPInfo_GetChannels(info) == 1 ? CiResource_rmt4_obx : CiResource_rmt8_obx;
+	case ASAPModuleType_TMC:
+		return CiResource_tmc_obx;
+	case ASAPModuleType_TM2:
+		return CiResource_tm2_obx;
+	case ASAPModuleType_FC:
+		return CiResource_fc_obx;
+	default:
+		return NULL;
+	}
+}
+
+static int DurationParser_ParseDigit(DurationParser *self, int max)
+{
+	if (self->position >= self->length)
+		return -1;
+	int digit = self->source[self->position++] - 48;
+	if (digit < 0 || digit > max)
+		return -1;
+	return digit;
+}
+
+static int DurationParser_Parse(DurationParser *self, const char *s)
+{
+	self->source = s;
+	self->position = 0;
+	self->length = (int) strlen(s);
+	int result = DurationParser_ParseDigit(self, 9);
+	if (result == -1)
+		return -1;
+	int digit;
+	if (self->position < self->length) {
+		digit = s[self->position] - 48;
+		if (digit >= 0 && digit <= 9) {
+			self->position++;
+			result = result * 10 + digit;
+		}
+		if (self->position < self->length && s[self->position] == ':') {
+			self->position++;
+			if ((digit = DurationParser_ParseDigit(self, 5)) == -1)
+				return -1;
+			result = result * 60 + digit * 10;
+			if ((digit = DurationParser_ParseDigit(self, 9)) == -1)
+				return -1;
+			result += digit;
+		}
+	}
+	result *= 1000;
+	if (self->position >= self->length)
+		return result;
+	if (s[self->position++] != '.')
+		return -1;
+	if ((digit = DurationParser_ParseDigit(self, 9)) == -1)
+		return -1;
+	result += digit * 100;
+	if (self->position >= self->length)
+		return result;
+	if ((digit = DurationParser_ParseDigit(self, 9)) == -1)
+		return -1;
+	result += digit * 10;
+	if (self->position >= self->length)
+		return result;
+	if ((digit = DurationParser_ParseDigit(self, 9)) == -1)
+		return -1;
+	result += digit;
+	return result;
+}
+
+static void ASAPInfo_Construct(ASAPInfo *self)
+{
+	self->filename = NULL;
+	self->author = NULL;
+	self->title = NULL;
+	self->date = NULL;
+}
+
+static void ASAPInfo_Destruct(ASAPInfo *self)
+{
+	free(self->date);
+	free(self->title);
+	free(self->author);
+	free(self->filename);
+}
+
+ASAPInfo *ASAPInfo_New(void)
+{
+	ASAPInfo *self = (ASAPInfo *) malloc(sizeof(ASAPInfo));
+	if (self != NULL)
+		ASAPInfo_Construct(self);
+	return self;
+}
+
+void ASAPInfo_Delete(ASAPInfo *self)
+{
+	if (self == NULL)
+		return;
+	ASAPInfo_Destruct(self);
+	free(self);
+}
+
+static bool ASAPInfo_IsValidChar(int c)
+{
+	return c >= 32 && c <= 124 && c != 96 && c != 123;
+}
+
+static bool ASAPInfo_CheckValidChar(int c)
+{
+	if (!ASAPInfo_IsValidChar(c))
+		return false;
+	return true;
+}
+
+static bool ASAPInfo_CheckValidText(const char *s)
+{
+	int n = (int) strlen(s);
+	if (n > 127)
+		return false;
+	for (int i = 0; i < n; i++) {
+		if (!ASAPInfo_CheckValidChar(s[i]))
+			return false;
+	}
+	return true;
+}
+
+const char *ASAPInfo_GetAuthor(const ASAPInfo *self)
+{
+	return self->author;
+}
+
+bool ASAPInfo_SetAuthor(ASAPInfo *self, const char *value)
+{
+	if (!ASAPInfo_CheckValidText(value))
+		return false;
+	CiString_Assign(&self->author, strdup(value));
+	return true;
+}
+
+const char *ASAPInfo_GetTitle(const ASAPInfo *self)
+{
+	return self->title;
+}
+
+bool ASAPInfo_SetTitle(ASAPInfo *self, const char *value)
+{
+	if (!ASAPInfo_CheckValidText(value))
+		return false;
+	CiString_Assign(&self->title, strdup(value));
+	return true;
+}
+
+const char *ASAPInfo_GetTitleOrFilename(const ASAPInfo *self)
+{
+	return self->title[0] != '\0' ? self->title : self->filename;
+}
+
+const char *ASAPInfo_GetDate(const ASAPInfo *self)
+{
+	return self->date;
+}
+
+bool ASAPInfo_SetDate(ASAPInfo *self, const char *value)
+{
+	if (!ASAPInfo_CheckValidText(value))
+		return false;
+	CiString_Assign(&self->date, strdup(value));
+	return true;
+}
+
+static bool ASAPInfo_CheckTwoDateDigits(const ASAPInfo *self, int i)
+{
+	int d1 = self->date[i];
+	int d2 = self->date[i + 1];
+	return d1 >= 48 && d1 <= 57 && d2 >= 48 && d2 <= 57;
+}
+
+static int ASAPInfo_CheckDate(const ASAPInfo *self)
+{
+	int n = (int) strlen(self->date);
+	switch (n) {
+	case 10:
+		if (!ASAPInfo_CheckTwoDateDigits(self, 0) || self->date[2] != '/')
+			return -1;
+	case 7:
+		if (!ASAPInfo_CheckTwoDateDigits(self, n - 7) || self->date[n - 5] != '/')
+			return -1;
+	case 4:
+		if (!ASAPInfo_CheckTwoDateDigits(self, n - 4) || !ASAPInfo_CheckTwoDateDigits(self, n - 2))
+			return -1;
+		return n;
+	default:
+		return -1;
+	}
+}
+
+static int ASAPInfo_GetTwoDateDigits(const ASAPInfo *self, int i)
+{
+	return (self->date[i] - 48) * 10 + self->date[i + 1] - 48;
+}
+
+int ASAPInfo_GetYear(const ASAPInfo *self)
+{
+	int n = ASAPInfo_CheckDate(self);
+	if (n < 0)
+		return -1;
+	return ASAPInfo_GetTwoDateDigits(self, n - 4) * 100 + ASAPInfo_GetTwoDateDigits(self, n - 2);
+}
+
+int ASAPInfo_GetMonth(const ASAPInfo *self)
+{
+	int n = ASAPInfo_CheckDate(self);
+	if (n < 7)
+		return -1;
+	return ASAPInfo_GetTwoDateDigits(self, n - 7);
+}
+
+int ASAPInfo_GetDayOfMonth(const ASAPInfo *self)
+{
+	int n = ASAPInfo_CheckDate(self);
+	if (n != 10)
+		return -1;
+	return ASAPInfo_GetTwoDateDigits(self, 0);
+}
+
+int ASAPInfo_GetChannels(const ASAPInfo *self)
+{
+	return self->channels;
+}
+
+int ASAPInfo_GetSongs(const ASAPInfo *self)
+{
+	return self->songs;
+}
+
+int ASAPInfo_GetDefaultSong(const ASAPInfo *self)
+{
+	return self->defaultSong;
+}
+
+bool ASAPInfo_SetDefaultSong(ASAPInfo *self, int song)
+{
+	if (song < 0 || song >= self->songs)
+		return false;
+	self->defaultSong = song;
+	return true;
+}
+
+int ASAPInfo_GetDuration(const ASAPInfo *self, int song)
+{
+	return self->durations[song];
+}
+
+bool ASAPInfo_SetDuration(ASAPInfo *self, int song, int duration)
+{
+	if (song < 0 || song >= self->songs)
+		return false;
+	self->durations[song] = duration;
+	return true;
+}
+
+bool ASAPInfo_GetLoop(const ASAPInfo *self, int song)
+{
+	return self->loops[song];
+}
+
+bool ASAPInfo_SetLoop(ASAPInfo *self, int song, bool loop)
+{
+	if (song < 0 || song >= self->songs)
+		return false;
+	self->loops[song] = loop;
+	return true;
+}
+
+bool ASAPInfo_IsNtsc(const ASAPInfo *self)
+{
+	return self->ntsc;
+}
+
+int ASAPInfo_GetTypeLetter(const ASAPInfo *self)
+{
+	switch (self->type) {
+	case ASAPModuleType_SAP_B:
+		return 66;
+	case ASAPModuleType_SAP_C:
+		return 67;
+	case ASAPModuleType_SAP_D:
+		return 68;
+	case ASAPModuleType_SAP_S:
+		return 83;
+	default:
+		return 0;
+	}
+}
+
+int ASAPInfo_GetPlayerRateScanlines(const ASAPInfo *self)
+{
+	return self->fastplay;
+}
+
+int ASAPInfo_GetPlayerRateHz(const ASAPInfo *self)
+{
+	int scanlineClock = self->ntsc ? 15699 : 15556;
+	return (scanlineClock + (self->fastplay >> 1)) / self->fastplay;
+}
+
+int ASAPInfo_GetMusicAddress(const ASAPInfo *self)
+{
+	return self->music;
+}
+
+bool ASAPInfo_SetMusicAddress(ASAPInfo *self, int address)
+{
+	if (address < 0 || address >= 65535)
+		return false;
+	self->music = address;
+	return true;
+}
+
+int ASAPInfo_GetInitAddress(const ASAPInfo *self)
+{
+	return self->init;
+}
+
+int ASAPInfo_GetPlayerAddress(const ASAPInfo *self)
+{
+	return self->player;
+}
+
+int ASAPInfo_GetCovoxAddress(const ASAPInfo *self)
+{
+	return self->covoxAddr;
+}
+
+int ASAPInfo_GetSapHeaderLength(const ASAPInfo *self)
+{
+	return self->headerLen;
+}
+
+int ASAPInfo_GetInstrumentNamesOffset(const ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (self->type != ASAPModuleType_RMT)
+		return -1;
+	for (int offset = ASAPInfo_GetWord(module, 4) - ASAPInfo_GetWord(module, 2) + 12; offset < moduleLen; offset++) {
+		if (module[offset - 1] == 0)
+			return offset;
+	}
+	return -1;
+}
+
+static int ASAPInfo_GetWord(uint8_t const *array, int i)
+{
+	return array[i] + (array[i + 1] << 8);
+}
+
+static bool ASAPInfo_ParseModule(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if ((module[0] != 255 || module[1] != 255) && (module[0] != 0 || module[1] != 0))
+		return false;
+	self->music = ASAPInfo_GetWord(module, 2);
+	int musicLastByte = ASAPInfo_GetWord(module, 4);
+	if (self->music <= 55295 && musicLastByte >= 53248)
+		return false;
+	int blockLen = musicLastByte + 1 - self->music;
+	if (6 + blockLen != moduleLen) {
+		if (self->type != ASAPModuleType_RMT || 11 + blockLen > moduleLen)
+			return false;
+		int infoAddr = ASAPInfo_GetWord(module, 6 + blockLen);
+		if (infoAddr != self->music + blockLen)
+			return false;
+		int infoLen = ASAPInfo_GetWord(module, 8 + blockLen) + 1 - infoAddr;
+		if (10 + blockLen + infoLen != moduleLen)
+			return false;
+	}
+	return true;
+}
+
+static void ASAPInfo_AddSong(ASAPInfo *self, int playerCalls)
+{
+	int64_t scanlines = playerCalls * self->fastplay;
+	self->durations[self->songs++] = (int) (scanlines * 38000 / 591149);
+}
+
+static void ASAPInfo_ParseCmcSong(ASAPInfo *self, uint8_t const *module, int pos)
+{
+	int tempo = module[25];
+	int playerCalls = 0;
+	int repStartPos = 0;
+	int repEndPos = 0;
+	int repTimes = 0;
+	uint8_t seen[85] = { 0 };
+	while (pos >= 0 && pos < 85) {
+		if (pos == repEndPos && repTimes > 0) {
+			for (int i = 0; i < 85; i++)
+				if (seen[i] == 1 || seen[i] == 3)
+					seen[i] = 0;
+			repTimes--;
+			pos = repStartPos;
+		}
+		if (seen[pos] != 0) {
+			if (seen[pos] != 1)
+				self->loops[self->songs] = true;
+			break;
+		}
+		seen[pos] = 1;
+		int p1 = module[518 + pos];
+		int p2 = module[603 + pos];
+		int p3 = module[688 + pos];
+		if (p1 == 254 || p2 == 254 || p3 == 254) {
+			pos++;
+			continue;
+		}
+		p1 |= self->type == ASAPModuleType_CMS ? 7 : 15;
+		switch (p1) {
+		case 135:
+		case 167:
+			pos++;
+			break;
+		case 143:
+			pos = -1;
+			break;
+		case 151:
+			if (p2 < 128) {
+				playerCalls += p2;
+				if (p3 < 128)
+					playerCalls += p3 * 50;
+			}
+			pos++;
+			break;
+		case 159:
+			pos = p2;
+			break;
+		case 175:
+			pos -= p2;
+			break;
+		case 191:
+			pos += p2;
+			break;
+		case 207:
+			if (p2 < 128) {
+				tempo = p2;
+				pos++;
+			}
+			else
+				pos = -1;
+			break;
+		case 223:
+			pos++;
+			repStartPos = pos;
+			repEndPos = pos + p2;
+			repTimes = p3 - 1;
+			break;
+		case 239:
+			self->loops[self->songs] = true;
+			pos = -1;
+			break;
+		default:
+			p2 = repTimes > 0 ? 3 : 2;
+			for (p1 = 0; p1 < 85; p1++)
+				if (seen[p1] == 1)
+					seen[p1] = (uint8_t) p2;
+			playerCalls += tempo * (self->type == ASAPModuleType_CM3 ? 48 : 64);
+			pos++;
+			break;
+		}
+	}
+	ASAPInfo_AddSong(self, playerCalls);
+}
+
+static bool ASAPInfo_ParseCmc(ASAPInfo *self, uint8_t const *module, int moduleLen, ASAPModuleType type)
+{
+	if (moduleLen < 774)
+		return false;
+	self->type = type;
+	if (!ASAPInfo_ParseModule(self, module, moduleLen))
+		return false;
+	int lastPos = 84;
+	while (--lastPos >= 0) {
+		if (module[518 + lastPos] < 176 || module[603 + lastPos] < 64 || module[688 + lastPos] < 64)
+			break;
+		if (self->channels == 2) {
+			if (module[774 + lastPos] < 176 || module[859 + lastPos] < 64 || module[944 + lastPos] < 64)
+				break;
+		}
+	}
+	self->songs = 0;
+	ASAPInfo_ParseCmcSong(self, module, 0);
+	for (int pos = 0; pos < lastPos && self->songs < 32; pos++)
+		if (module[518 + pos] == 143 || module[518 + pos] == 239)
+			ASAPInfo_ParseCmcSong(self, module, pos + 1);
+	return true;
+}
+
+static bool ASAPInfo_IsDltTrackEmpty(uint8_t const *module, int pos)
+{
+	return module[8198 + pos] >= 67 && module[8454 + pos] >= 64 && module[8710 + pos] >= 64 && module[8966 + pos] >= 64;
+}
+
+static bool ASAPInfo_IsDltPatternEnd(uint8_t const *module, int pos, int i)
+{
+	for (int ch = 0; ch < 4; ch++) {
+		int pattern = module[8198 + (ch << 8) + pos];
+		if (pattern < 64) {
+			int offset = 6 + (pattern << 7) + (i << 1);
+			if ((module[offset] & 128) == 0 && (module[offset + 1] & 128) != 0)
+				return true;
+		}
+	}
+	return false;
+}
+
+static void ASAPInfo_ParseDltSong(ASAPInfo *self, uint8_t const *module, bool *seen, int pos)
+{
+	while (pos < 128 && !seen[pos] && ASAPInfo_IsDltTrackEmpty(module, pos))
+		seen[pos++] = true;
+	self->songPos[self->songs] = (uint8_t) 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[8198 + pos];
+		if (p1 == 64 || ASAPInfo_IsDltTrackEmpty(module, pos))
+			break;
+		if (p1 == 65)
+			pos = module[8326 + pos];
+		else if (p1 == 66)
+			tempo = module[8326 + pos++];
+		else {
+			for (int i = 0; i < 64 && !ASAPInfo_IsDltPatternEnd(module, pos, i); i++)
+				playerCalls += tempo;
+			pos++;
+		}
+	}
+	if (playerCalls > 0) {
+		self->loops[self->songs] = loop;
+		ASAPInfo_AddSong(self, playerCalls);
+	}
+}
+
+static bool ASAPInfo_ParseDlt(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (moduleLen != 11270 && moduleLen != 11271)
+		return false;
+	self->type = ASAPModuleType_DLT;
+	if (!ASAPInfo_ParseModule(self, module, moduleLen))
+		return false;
+	if (self->music != 8192)
+		return false;
+	bool seen[128] = { false };
+	self->songs = 0;
+	for (int pos = 0; pos < 128 && self->songs < 32; pos++) {
+		if (!seen[pos])
+			ASAPInfo_ParseDltSong(self, module, seen, pos);
+	}
+	if (self->songs == 0)
+		return false;
+	return true;
+}
+
+static void ASAPInfo_ParseMptSong(ASAPInfo *self, uint8_t const *module, bool *globalSeen, int songLen, int pos)
+{
+	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
+	int tempo = module[463];
+	int playerCalls = 0;
+	uint8_t seen[256] = { 0 };
+	int patternOffset[4];
+	int blankRows[4] = { 0 };
+	int blankRowsCounter[4];
+	while (pos < songLen) {
+		if (seen[pos] != 0) {
+			if (seen[pos] != 1)
+				self->loops[self->songs] = true;
+			break;
+		}
+		seen[pos] = 1;
+		globalSeen[pos] = true;
+		int i = module[464 + pos * 2];
+		if (i == 255) {
+			pos = module[465 + pos * 2];
+			continue;
+		}
+		int ch;
+		for (ch = 3; ch >= 0; ch--) {
+			i = module[454 + ch] + (module[458 + ch] << 8) - addrToOffset;
+			i = module[i + pos * 2];
+			if (i >= 64)
+				break;
+			i <<= 1;
+			i = ASAPInfo_GetWord(module, 70 + i);
+			patternOffset[ch] = i == 0 ? 0 : i - addrToOffset;
+			blankRowsCounter[ch] = 0;
+		}
+		if (ch >= 0)
+			break;
+		for (i = 0; i < songLen; i++)
+			if (seen[i] == 1)
+				seen[i] = 2;
+		for (int patternRows = module[462]; --patternRows >= 0;) {
+			for (ch = 3; ch >= 0; ch--) {
+				if (patternOffset[ch] == 0 || --blankRowsCounter[ch] >= 0)
+					continue;
+				for (;;) {
+					i = module[patternOffset[ch]++];
+					if (i < 64 || i == 254)
+						break;
+					if (i < 128)
+						continue;
+					if (i < 192) {
+						blankRows[ch] = i - 128;
+						continue;
+					}
+					if (i < 208)
+						continue;
+					if (i < 224) {
+						tempo = i - 207;
+						continue;
+					}
+					patternRows = 0;
+				}
+				blankRowsCounter[ch] = blankRows[ch];
+			}
+			playerCalls += tempo;
+		}
+		pos++;
+	}
+	if (playerCalls > 0)
+		ASAPInfo_AddSong(self, playerCalls);
+}
+
+static bool ASAPInfo_ParseMpt(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (moduleLen < 464)
+		return false;
+	self->type = ASAPModuleType_MPT;
+	if (!ASAPInfo_ParseModule(self, module, moduleLen))
+		return false;
+	int track0Addr = ASAPInfo_GetWord(module, 2) + 458;
+	if (module[454] + (module[458] << 8) != track0Addr)
+		return false;
+	int songLen = (module[455] + (module[459] << 8) - track0Addr) >> 1;
+	if (songLen > 254)
+		return false;
+	bool globalSeen[256] = { false };
+	self->songs = 0;
+	for (int pos = 0; pos < songLen && self->songs < 32; pos++) {
+		if (!globalSeen[pos]) {
+			self->songPos[self->songs] = (uint8_t) pos;
+			ASAPInfo_ParseMptSong(self, module, globalSeen, songLen, pos);
+		}
+	}
+	if (self->songs == 0)
+		return false;
+	return true;
+}
+
+static int ASAPInfo_GetRmtInstrumentFrames(uint8_t const *module, int instrument, int volume, int volumeFrame, bool onExtraPokey)
+{
+	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
+	instrument = ASAPInfo_GetWord(module, 14) - addrToOffset + (instrument << 1);
+	if (module[instrument + 1] == 0)
+		return 0;
+	instrument = ASAPInfo_GetWord(module, instrument) - addrToOffset;
+	int perFrame = module[12];
+	int playerCall = volumeFrame * perFrame;
+	int playerCalls = playerCall;
+	int index = module[instrument] + 1 + playerCall * 3;
+	int indexEnd = module[instrument + 2] + 3;
+	int indexLoop = module[instrument + 3];
+	if (indexLoop >= indexEnd)
+		return 0;
+	int volumeSlideDepth = module[instrument + 6];
+	int volumeMin = module[instrument + 7];
+	static const uint8_t RMT_VOLUME_SILENT[16] = { 16, 8, 4, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1 };
+	if (index >= indexEnd)
+		index = (index - indexEnd) % (indexEnd - indexLoop) + indexLoop;
+	else {
+		do {
+			int vol = module[instrument + index];
+			if (onExtraPokey)
+				vol >>= 4;
+			if ((vol & 15) >= RMT_VOLUME_SILENT[volume])
+				playerCalls = playerCall + 1;
+			playerCall++;
+			index += 3;
+		}
+		while (index < indexEnd);
+	}
+	if (volumeSlideDepth == 0)
+		return playerCalls / perFrame;
+	int volumeSlide = 128;
+	bool silentLoop = false;
+	for (;;) {
+		if (index >= indexEnd) {
+			if (silentLoop)
+				break;
+			silentLoop = true;
+			index = indexLoop;
+		}
+		int vol = module[instrument + index];
+		if (onExtraPokey)
+			vol >>= 4;
+		if ((vol & 15) >= RMT_VOLUME_SILENT[volume]) {
+			playerCalls = playerCall + 1;
+			silentLoop = false;
+		}
+		playerCall++;
+		index += 3;
+		volumeSlide -= volumeSlideDepth;
+		if (volumeSlide < 0) {
+			volumeSlide += 256;
+			if (--volume <= volumeMin)
+				break;
+		}
+	}
+	return playerCalls / perFrame;
+}
+
+static void ASAPInfo_ParseRmtSong(ASAPInfo *self, uint8_t const *module, bool *globalSeen, int songLen, int posShift, int pos)
+{
+	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
+	int tempo = module[11];
+	int frames = 0;
+	int songOffset = ASAPInfo_GetWord(module, 20) - addrToOffset;
+	int patternLoOffset = ASAPInfo_GetWord(module, 16) - addrToOffset;
+	int patternHiOffset = ASAPInfo_GetWord(module, 18) - addrToOffset;
+	uint8_t seen[256] = { 0 };
+	int patternBegin[8];
+	int patternOffset[8];
+	int blankRows[8];
+	int instrumentNo[8] = { 0 };
+	int instrumentFrame[8] = { 0 };
+	int volumeValue[8] = { 0 };
+	int volumeFrame[8] = { 0 };
+	while (pos < songLen) {
+		if (seen[pos] != 0) {
+			if (seen[pos] != 1)
+				self->loops[self->songs] = true;
+			break;
+		}
+		seen[pos] = 1;
+		globalSeen[pos] = true;
+		if (module[songOffset + (pos << posShift)] == 254) {
+			pos = module[songOffset + (pos << posShift) + 1];
+			continue;
+		}
+		for (int ch = 0; ch < 1 << posShift; ch++) {
+			int p = module[songOffset + (pos << posShift) + ch];
+			if (p == 255)
+				blankRows[ch] = 256;
+			else {
+				patternOffset[ch] = patternBegin[ch] = module[patternLoOffset + p] + (module[patternHiOffset + p] << 8) - addrToOffset;
+				if (patternOffset[ch] < 0)
+					return;
+				blankRows[ch] = 0;
+			}
+		}
+		for (int i = 0; i < songLen; i++)
+			if (seen[i] == 1)
+				seen[i] = 2;
+		for (int patternRows = module[10]; --patternRows >= 0;) {
+			for (int ch = 0; ch < 1 << posShift; ch++) {
+				if (--blankRows[ch] > 0)
+					continue;
+				for (;;) {
+					int i = module[patternOffset[ch]++];
+					if ((i & 63) < 62) {
+						i += module[patternOffset[ch]++] << 8;
+						if ((i & 63) != 61) {
+							instrumentNo[ch] = i >> 10;
+							instrumentFrame[ch] = frames;
+						}
+						volumeValue[ch] = i >> 6 & 15;
+						volumeFrame[ch] = frames;
+						break;
+					}
+					if (i == 62) {
+						blankRows[ch] = module[patternOffset[ch]++];
+						break;
+					}
+					if ((i & 63) == 62) {
+						blankRows[ch] = i >> 6;
+						break;
+					}
+					if ((i & 191) == 63) {
+						tempo = module[patternOffset[ch]++];
+						continue;
+					}
+					if (i == 191) {
+						patternOffset[ch] = patternBegin[ch] + module[patternOffset[ch]];
+						continue;
+					}
+					patternRows = -1;
+					break;
+				}
+				if (patternRows < 0)
+					break;
+			}
+			if (patternRows >= 0)
+				frames += tempo;
+		}
+		pos++;
+	}
+	int instrumentFrames = 0;
+	for (int ch = 0; ch < 1 << posShift; ch++) {
+		int frame = instrumentFrame[ch];
+		frame += ASAPInfo_GetRmtInstrumentFrames(module, instrumentNo[ch], volumeValue[ch], volumeFrame[ch] - frame, ch >= 4);
+		if (instrumentFrames < frame)
+			instrumentFrames = frame;
+	}
+	if (frames > instrumentFrames) {
+		if (frames - instrumentFrames > 100)
+			self->loops[self->songs] = false;
+		frames = instrumentFrames;
+	}
+	if (frames > 0)
+		ASAPInfo_AddSong(self, frames);
+}
+
+static bool ASAPInfo_ValidateRmt(uint8_t const *module, int moduleLen)
+{
+	if (moduleLen < 48)
+		return false;
+	if (module[6] != 82 || module[7] != 77 || module[8] != 84 || module[13] != 1)
+		return false;
+	return true;
+}
+
+static bool ASAPInfo_ParseRmt(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (!ASAPInfo_ValidateRmt(module, moduleLen))
+		return false;
+	int posShift;
+	switch (module[9]) {
+	case 52:
+		posShift = 2;
+		break;
+	case 56:
+		self->channels = 2;
+		posShift = 3;
+		break;
+	default:
+		return false;
+	}
+	int perFrame = module[12];
+	if (perFrame < 1 || perFrame > 4)
+		return false;
+	self->type = ASAPModuleType_RMT;
+	if (!ASAPInfo_ParseModule(self, module, moduleLen))
+		return false;
+	int blockLen = ASAPInfo_GetWord(module, 4) + 1 - self->music;
+	int songLen = ASAPInfo_GetWord(module, 4) + 1 - ASAPInfo_GetWord(module, 20);
+	if (posShift == 3 && (songLen & 4) != 0 && module[6 + blockLen - 4] == 254)
+		songLen += 4;
+	songLen >>= posShift;
+	if (songLen >= 256)
+		return false;
+	bool globalSeen[256] = { false };
+	self->songs = 0;
+	for (int pos = 0; pos < songLen && self->songs < 32; pos++) {
+		if (!globalSeen[pos]) {
+			self->songPos[self->songs] = (uint8_t) pos;
+			ASAPInfo_ParseRmtSong(self, module, globalSeen, songLen, posShift, pos);
+		}
+	}
+	self->fastplay = 312 / perFrame;
+	self->player = 1536;
+	if (self->songs == 0)
+		return false;
+	uint8_t title[127];
+	int titleLen;
+	for (titleLen = 0; titleLen < 127 && 10 + blockLen + titleLen < moduleLen; titleLen++) {
+		int c = module[10 + blockLen + titleLen];
+		if (c == 0)
+			break;
+		title[titleLen] = (uint8_t) (ASAPInfo_IsValidChar(c) ? c : 32);
+	}
+	CiString_Assign(&self->title, CiString_Substring((const char *) title, titleLen));
+	return true;
+}
+
+static void ASAPInfo_ParseTmcSong(ASAPInfo *self, uint8_t const *module, int pos)
+{
+	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
+	int tempo = module[36] + 1;
+	int frames = 0;
+	int patternOffset[8];
+	int blankRows[8];
+	while (module[437 + pos] < 128) {
+		for (int ch = 7; ch >= 0; ch--) {
+			int pat = module[437 + pos - 2 * ch];
+			patternOffset[ch] = module[166 + pat] + (module[294 + pat] << 8) - addrToOffset;
+			blankRows[ch] = 0;
+		}
+		for (int patternRows = 64; --patternRows >= 0;) {
+			for (int ch = 7; ch >= 0; ch--) {
+				if (--blankRows[ch] >= 0)
+					continue;
+				for (;;) {
+					int i = module[patternOffset[ch]++];
+					if (i < 64) {
+						patternOffset[ch]++;
+						break;
+					}
+					if (i == 64) {
+						i = module[patternOffset[ch]++];
+						if ((i & 127) == 0)
+							patternRows = 0;
+						else
+							tempo = (i & 127) + 1;
+						if (i >= 128)
+							patternOffset[ch]++;
+						break;
+					}
+					if (i < 128) {
+						i = module[patternOffset[ch]++] & 127;
+						if (i == 0)
+							patternRows = 0;
+						else
+							tempo = i + 1;
+						patternOffset[ch]++;
+						break;
+					}
+					if (i < 192)
+						continue;
+					blankRows[ch] = i - 191;
+					break;
+				}
+			}
+			frames += tempo;
+		}
+		pos += 16;
+	}
+	if (module[436 + pos] < 128)
+		self->loops[self->songs] = true;
+	ASAPInfo_AddSong(self, frames);
+}
+
+static int ASAPInfo_ParseTmcTitle(uint8_t *title, int titleLen, uint8_t const *module, int moduleOffset)
+{
+	int lastOffset = moduleOffset + 29;
+	while (module[lastOffset] == 32) {
+		if (--lastOffset < moduleOffset)
+			return titleLen;
+	}
+	if (titleLen > 0) {
+		title[titleLen++] = 32;
+		title[titleLen++] = 124;
+		title[titleLen++] = 32;
+	}
+	while (moduleOffset <= lastOffset) {
+		int c = module[moduleOffset++] & 127;
+		switch (c) {
+		case 20:
+			c = 42;
+			break;
+		case 1:
+		case 3:
+		case 5:
+		case 12:
+		case 14:
+		case 15:
+		case 19:
+			c += 96;
+			break;
+		case 24:
+		case 26:
+			c = 122;
+			break;
+		default:
+			if (!ASAPInfo_IsValidChar(c))
+				c = 32;
+			break;
+		}
+		title[titleLen++] = (uint8_t) c;
+	}
+	return titleLen;
+}
+
+static bool ASAPInfo_ParseTmc(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (moduleLen < 464)
+		return false;
+	self->type = ASAPModuleType_TMC;
+	if (!ASAPInfo_ParseModule(self, module, moduleLen))
+		return false;
+	self->channels = 2;
+	int i = 0;
+	while (module[102 + i] == 0) {
+		if (++i >= 64)
+			return false;
+	}
+	int lastPos = (module[102 + i] << 8) + module[38 + i] - ASAPInfo_GetWord(module, 2) - 432;
+	if (437 + lastPos >= moduleLen)
+		return false;
+	do {
+		if (lastPos <= 0)
+			return false;
+		lastPos -= 16;
+	}
+	while (module[437 + lastPos] >= 128);
+	self->songs = 0;
+	ASAPInfo_ParseTmcSong(self, module, 0);
+	for (i = 0; i < lastPos && self->songs < 32; i += 16)
+		if (module[437 + i] >= 128)
+			ASAPInfo_ParseTmcSong(self, module, i + 16);
+	i = module[37];
+	if (i < 1 || i > 4)
+		return false;
+	self->fastplay = 312 / i;
+	uint8_t title[127];
+	int titleLen = ASAPInfo_ParseTmcTitle(title, 0, module, 6);
+	CiString_Assign(&self->title, CiString_Substring((const char *) title, titleLen));
+	return true;
+}
+
+static void ASAPInfo_ParseTm2Song(ASAPInfo *self, uint8_t const *module, int pos)
+{
+	int addrToOffset = ASAPInfo_GetWord(module, 2) - 6;
+	int tempo = module[36] + 1;
+	int playerCalls = 0;
+	int patternOffset[8];
+	int blankRows[8];
+	for (;;) {
+		int patternRows = module[918 + pos];
+		if (patternRows == 0)
+			break;
+		if (patternRows >= 128) {
+			self->loops[self->songs] = true;
+			break;
+		}
+		for (int ch = 7; ch >= 0; ch--) {
+			int pat = module[917 + pos - 2 * ch];
+			patternOffset[ch] = module[262 + pat] + (module[518 + pat] << 8) - addrToOffset;
+			blankRows[ch] = 0;
+		}
+		while (--patternRows >= 0) {
+			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 < 64) {
+						if (module[patternOffset[ch]++] >= 128)
+							patternOffset[ch]++;
+						break;
+					}
+					if (i < 128) {
+						patternOffset[ch]++;
+						break;
+					}
+					if (i == 128) {
+						blankRows[ch] = module[patternOffset[ch]++];
+						break;
+					}
+					if (i < 192)
+						break;
+					if (i < 208) {
+						tempo = i - 191;
+						continue;
+					}
+					if (i < 224) {
+						patternOffset[ch]++;
+						break;
+					}
+					if (i < 240) {
+						patternOffset[ch] += 2;
+						break;
+					}
+					if (i < 255) {
+						blankRows[ch] = i - 240;
+						break;
+					}
+					blankRows[ch] = 64;
+					break;
+				}
+			}
+			playerCalls += tempo;
+		}
+		pos += 17;
+	}
+	ASAPInfo_AddSong(self, playerCalls);
+}
+
+static bool ASAPInfo_ParseTm2(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (moduleLen < 932)
+		return false;
+	self->type = ASAPModuleType_TM2;
+	if (!ASAPInfo_ParseModule(self, module, moduleLen))
+		return false;
+	int i = module[37];
+	if (i < 1 || i > 4)
+		return false;
+	self->fastplay = 312 / i;
+	self->player = 2048;
+	if (module[31] != 0)
+		self->channels = 2;
+	int lastPos = 65535;
+	for (i = 0; i < 128; i++) {
+		int instrAddr = module[134 + i] + (module[774 + i] << 8);
+		if (instrAddr != 0 && instrAddr < lastPos)
+			lastPos = instrAddr;
+	}
+	for (i = 0; i < 256; i++) {
+		int patternAddr = module[262 + i] + (module[518 + i] << 8);
+		if (patternAddr != 0 && patternAddr < lastPos)
+			lastPos = patternAddr;
+	}
+	lastPos -= ASAPInfo_GetWord(module, 2) + 896;
+	if (902 + lastPos >= moduleLen)
+		return false;
+	int c;
+	do {
+		if (lastPos <= 0)
+			return false;
+		lastPos -= 17;
+		c = module[918 + lastPos];
+	}
+	while (c == 0 || c >= 128);
+	self->songs = 0;
+	ASAPInfo_ParseTm2Song(self, module, 0);
+	for (i = 0; i < lastPos && self->songs < 32; i += 17) {
+		c = module[918 + i];
+		if (c == 0 || c >= 128)
+			ASAPInfo_ParseTm2Song(self, module, i + 17);
+	}
+	uint8_t title[127];
+	int titleLen = ASAPInfo_ParseTmcTitle(title, 0, module, 39);
+	titleLen = ASAPInfo_ParseTmcTitle(title, titleLen, module, 71);
+	titleLen = ASAPInfo_ParseTmcTitle(title, titleLen, module, 103);
+	CiString_Assign(&self->title, CiString_Substring((const char *) title, titleLen));
+	return true;
+}
+
+static int ASAPInfo_AfterFF(uint8_t const *module, int moduleLen, int currentOffset)
+{
+	while (currentOffset < moduleLen) {
+		if (module[currentOffset++] == 255)
+			return currentOffset;
+	}
+	return -1;
+}
+
+static int ASAPInfo_GetFcTrackCommand(uint8_t const *module, int const *trackPos, int n)
+{
+	return module[3 + (n << 8) + trackPos[n]];
+}
+
+static bool ASAPInfo_IsFcSongEnd(uint8_t const *module, int const *trackPos)
+{
+	bool allLoop = true;
+	for (int n = 0; n < 3; n++) {
+		if (trackPos[n] >= 256)
+			return true;
+		switch (ASAPInfo_GetFcTrackCommand(module, trackPos, n)) {
+		case 254:
+			return true;
+		case 255:
+			break;
+		default:
+			allLoop = false;
+			break;
+		}
+	}
+	return allLoop;
+}
+
+static bool ASAPInfo_ValidateFc(uint8_t const *module, int moduleLen)
+{
+	if (moduleLen < 899)
+		return false;
+	if (module[0] != 38 || module[1] != 35)
+		return false;
+	return true;
+}
+
+static bool ASAPInfo_ParseFc(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (!ASAPInfo_ValidateFc(module, moduleLen))
+		return false;
+	self->type = ASAPModuleType_FC;
+	self->player = 1024;
+	self->music = 2560;
+	self->songs = 0;
+	self->headerLen = -1;
+	int patternOffsets[64];
+	int currentOffset = 899;
+	for (int i = 0; i < 64; i++) {
+		patternOffsets[i] = currentOffset;
+		if ((currentOffset = ASAPInfo_AfterFF(module, moduleLen, currentOffset)) == -1)
+			return false;
+	}
+	for (int i = 0; i < 32; i++) {
+		if ((currentOffset = ASAPInfo_AfterFF(module, moduleLen, currentOffset)) == -1)
+			return false;
+	}
+	for (int pos = 0; pos < 256 && self->songs < 32;) {
+		int trackPos[3];
+		for (int n = 0; n < 3; n++)
+			trackPos[n] = pos;
+		int patternDelay[3] = { 0 };
+		int noteDuration[3] = { 0 };
+		int patternPos[3] = { 0 };
+		int playerCalls = 0;
+		self->loops[self->songs] = true;
+		while (!ASAPInfo_IsFcSongEnd(module, trackPos)) {
+			for (int n = 0; n < 3; n++) {
+				int trackCmd = ASAPInfo_GetFcTrackCommand(module, trackPos, n);
+				if (trackCmd != 255 && patternDelay[n]-- <= 0) {
+					while (trackPos[n] < 256) {
+						trackCmd = ASAPInfo_GetFcTrackCommand(module, trackPos, n);
+						if (trackCmd < 64) {
+							int patternCmd = module[patternOffsets[trackCmd] + patternPos[n]++];
+							if (patternCmd < 64) {
+								patternDelay[n] = noteDuration[n];
+								break;
+							}
+							else if (patternCmd < 96)
+								noteDuration[n] = patternCmd - 64;
+							else if (patternCmd == 255) {
+								patternDelay[n] = 0;
+								noteDuration[n] = 0;
+								patternPos[n] = 0;
+								trackPos[n]++;
+							}
+						}
+						else if (trackCmd == 64)
+							trackPos[n] += 2;
+						else if (trackCmd == 254) {
+							self->loops[self->songs] = false;
+							break;
+						}
+						else if (trackCmd == 255)
+							break;
+						else
+							trackPos[n]++;
+					}
+				}
+			}
+			if (ASAPInfo_IsFcSongEnd(module, trackPos))
+				break;
+			playerCalls += module[2];
+		}
+		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 <= 256)
+			ASAPInfo_AddSong(self, playerCalls);
+	}
+	return true;
+}
+
+static bool ASAPInfo_HasStringAt(uint8_t const *module, int moduleIndex, const char *s)
+{
+	int n = (int) strlen(s);
+	for (int i = 0; i < n; i++)
+		if (module[moduleIndex + i] != s[i])
+			return false;
+	return true;
+}
+
+static int ASAPInfo_ParseDec(const char *s, int minVal, int maxVal)
+{
+	int r = 0;
+	int len = (int) strlen(s);
+	for (int i = 0; i < len; i++) {
+		int c = s[i];
+		if (c < 48 || c > 57)
+			return -1;
+		r = r * 10 + c - 48;
+		if (r > maxVal)
+			return -1;
+	}
+	if (r < minVal)
+		return -1;
+	return r;
+}
+
+static int ASAPInfo_ParseHex(const char *s)
+{
+	int r = 0;
+	int len = (int) strlen(s);
+	for (int i = 0; i < len; i++) {
+		if (r > 4095)
+			return -1;
+		int c = s[i];
+		r <<= 4;
+		if (c >= 48 && c <= 57)
+			r += c - 48;
+		else if (c >= 65 && c <= 70)
+			r += c - 65 + 10;
+		else if (c >= 97 && c <= 102)
+			r += c - 97 + 10;
+		else
+			return -1;
+	}
+	return r;
+}
+
+int ASAPInfo_ParseDuration(const char *s)
+{
+	DurationParser parser;
+	return DurationParser_Parse(&parser, s);
+}
+
+static bool ASAPInfo_ValidateSap(uint8_t const *module, int moduleLen)
+{
+	return moduleLen >= 30 && ASAPInfo_HasStringAt(module, 0, "SAP\r\n");
+}
+
+static bool ASAPInfo_ParseSap(ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (!ASAPInfo_ValidateSap(module, moduleLen))
+		return false;
+	self->fastplay = -1;
+	int type = 0;
+	int moduleIndex = 5;
+	int durationIndex = 0;
+	while (module[moduleIndex] != 255) {
+		int lineStart = moduleIndex;
+		while (module[moduleIndex] > 32) {
+			if (++moduleIndex >= moduleLen)
+				return false;
+		}
+		int tagLen = moduleIndex - lineStart;
+		int argStart = -1;
+		int argLen = -1;
+		for (;;) {
+			int c = module[moduleIndex];
+			if (c > 32) {
+				if (!ASAPInfo_CheckValidChar(c))
+					return false;
+				if (argStart < 0)
+					argStart = moduleIndex;
+				argLen = -1;
+			}
+			else {
+				if (argLen < 0)
+					argLen = moduleIndex - argStart;
+				if (c == 10)
+					break;
+			}
+			if (++moduleIndex >= moduleLen)
+				return false;
+		}
+		if (++moduleIndex + 6 >= moduleLen)
+			return false;
+		if (tagLen <= 8) {
+			char *tag = CiString_Substring((const char *) module + lineStart, tagLen);
+			if (argStart >= 0 && argLen <= 129) {
+				char *arg = CiString_Substring((const char *) module + argStart, argLen);
+				if (argLen >= 3 && arg[0] == '\"' && arg[argLen - 1] == '\"' && strcmp(arg, "\"<?>\"") != 0) {
+					if (strcmp(tag, "AUTHOR") == 0)
+						CiString_Assign(&self->author, CiString_Substring(arg + 1, argLen - 2));
+					else if (strcmp(tag, "NAME") == 0)
+						CiString_Assign(&self->title, CiString_Substring(arg + 1, argLen - 2));
+					else if (strcmp(tag, "DATE") == 0)
+						CiString_Assign(&self->date, CiString_Substring(arg + 1, argLen - 2));
+				}
+				else if (strcmp(tag, "SONGS") == 0) {
+					if ((self->songs = ASAPInfo_ParseDec(arg, 1, 32)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "DEFSONG") == 0) {
+					if ((self->defaultSong = ASAPInfo_ParseDec(arg, 0, 31)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "TIME") == 0) {
+					if (durationIndex >= 32) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+					if (argLen > 5 && ASAPInfo_HasStringAt(module, argStart + argLen - 5, " LOOP")) {
+						self->loops[durationIndex] = true;
+						arg[argLen - 5] = '\0';
+					}
+					if ((self->durations[durationIndex++] = ASAPInfo_ParseDuration(arg)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "TYPE") == 0)
+					type = arg[0];
+				else if (strcmp(tag, "FASTPLAY") == 0) {
+					if ((self->fastplay = ASAPInfo_ParseDec(arg, 1, 32767)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "MUSIC") == 0) {
+					if ((self->music = ASAPInfo_ParseHex(arg)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "INIT") == 0) {
+					if ((self->init = ASAPInfo_ParseHex(arg)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "PLAYER") == 0) {
+					if ((self->player = ASAPInfo_ParseHex(arg)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+				}
+				else if (strcmp(tag, "COVOX") == 0) {
+					if ((self->covoxAddr = ASAPInfo_ParseHex(arg)) == -1) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+					if (self->covoxAddr != 54784) {
+						free(arg);
+						free(tag);
+						return false;
+					}
+					self->channels = 2;
+				}
+				free(arg);
+			}
+			else if (strcmp(tag, "STEREO") == 0)
+				self->channels = 2;
+			else if (strcmp(tag, "NTSC") == 0)
+				self->ntsc = true;
+			free(tag);
+		}
+	}
+	if (self->defaultSong >= self->songs)
+		return false;
+	switch (type) {
+	case 66:
+		if (self->player < 0)
+			return false;
+		if (self->init < 0)
+			return false;
+		self->type = ASAPModuleType_SAP_B;
+		break;
+	case 67:
+		if (self->player < 0)
+			return false;
+		if (self->music < 0)
+			return false;
+		self->type = ASAPModuleType_SAP_C;
+		break;
+	case 68:
+		if (self->init < 0)
+			return false;
+		self->type = ASAPModuleType_SAP_D;
+		break;
+	case 83:
+		if (self->init < 0)
+			return false;
+		self->type = ASAPModuleType_SAP_S;
+		if (self->fastplay < 0)
+			self->fastplay = 78;
+		break;
+	default:
+		return false;
+	}
+	if (self->fastplay < 0)
+		self->fastplay = self->ntsc ? 262 : 312;
+	if (module[moduleIndex + 1] != 255)
+		return false;
+	self->headerLen = moduleIndex;
+	return true;
+}
+
+static int ASAPInfo_PackExt(const char *ext)
+{
+	return (int) strlen(ext) == 2 && ext[0] <= 'z' && ext[1] <= 'z' ? ext[0] | ext[1] << 8 | 2105376 : (int) strlen(ext) == 3 && ext[0] <= 'z' && ext[1] <= 'z' && ext[2] <= 'z' ? ext[0] | ext[1] << 8 | ext[2] << 16 | 2105376 : 0;
+}
+
+static int ASAPInfo_GetPackedExt(const char *filename)
+{
+	int ext = 0;
+	for (int i = (int) strlen(filename); --i > 0;) {
+		int c = filename[i];
+		if (c <= 32 || c > 122)
+			return 0;
+		if (c == 46)
+			return ext | 2105376;
+		ext = (ext << 8) + c;
+	}
+	return 0;
+}
+
+static bool ASAPInfo_IsOurPackedExt(int ext)
+{
+	switch (ext) {
+	case 7364979:
+	case 6516067:
+	case 3370339:
+	case 7499107:
+	case 7564643:
+	case 6516068:
+	case 7629924:
+	case 7630957:
+	case 6582381:
+	case 7630194:
+	case 6516084:
+	case 3698036:
+	case 3304820:
+	case 2122598:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool ASAPInfo_IsOurFile(const char *filename)
+{
+	return ASAPInfo_IsOurPackedExt(ASAPInfo_GetPackedExt(filename));
+}
+
+bool ASAPInfo_IsOurExt(const char *ext)
+{
+	return ASAPInfo_IsOurPackedExt(ASAPInfo_PackExt(ext));
+}
+
+static int ASAPInfo_GuessPackedExt(uint8_t const *module, int moduleLen)
+{
+	if (ASAPInfo_ValidateSap(module, moduleLen))
+		return 7364979;
+	if (ASAPInfo_ValidateFc(module, moduleLen))
+		return 2122598;
+	if (ASAPInfo_ValidateRmt(module, moduleLen))
+		return 7630194;
+	return -1;
+}
+
+bool ASAPInfo_Load(ASAPInfo *self, const char *filename, uint8_t const *module, int moduleLen)
+{
+	int ext;
+	if (filename != NULL) {
+		int len = (int) strlen(filename);
+		int basename = 0;
+		ext = -1;
+		for (int i = len; --i >= 0;) {
+			int c = filename[i];
+			if (c == 47 || c == 92) {
+				basename = i + 1;
+				break;
+			}
+			if (c == 46)
+				ext = i;
+		}
+		if (ext < 0)
+			return false;
+		ext -= basename;
+		if (ext > 127)
+			ext = 127;
+		CiString_Assign(&self->filename, CiString_Substring(filename + basename, ext));
+		ext = ASAPInfo_GetPackedExt(filename);
+	}
+	else {
+		CiString_Assign(&self->filename, strdup(""));
+		if ((ext = ASAPInfo_GuessPackedExt(module, moduleLen)) == -1)
+			return false;
+	}
+	CiString_Assign(&self->author, strdup(""));
+	CiString_Assign(&self->title, strdup(""));
+	CiString_Assign(&self->date, strdup(""));
+	self->channels = 1;
+	self->songs = 1;
+	self->defaultSong = 0;
+	for (int i = 0; i < 32; i++) {
+		self->durations[i] = -1;
+		self->loops[i] = false;
+	}
+	self->ntsc = false;
+	self->fastplay = 312;
+	self->music = -1;
+	self->init = -1;
+	self->player = -1;
+	self->covoxAddr = -1;
+	self->headerLen = 0;
+	switch (ext) {
+	case 7364979:
+		return ASAPInfo_ParseSap(self, module, moduleLen);
+	case 6516067:
+		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMC);
+	case 3370339:
+		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CM3);
+	case 7499107:
+		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMR);
+	case 7564643:
+		self->channels = 2;
+		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMS);
+	case 6516068:
+		self->fastplay = 156;
+		return ASAPInfo_ParseCmc(self, module, moduleLen, ASAPModuleType_CMC);
+	case 7629924:
+		return ASAPInfo_ParseDlt(self, module, moduleLen);
+	case 7630957:
+		return ASAPInfo_ParseMpt(self, module, moduleLen);
+	case 6582381:
+		self->fastplay = 156;
+		return ASAPInfo_ParseMpt(self, module, moduleLen);
+	case 7630194:
+		return ASAPInfo_ParseRmt(self, module, moduleLen);
+	case 6516084:
+	case 3698036:
+		return ASAPInfo_ParseTmc(self, module, moduleLen);
+	case 3304820:
+		return ASAPInfo_ParseTm2(self, module, moduleLen);
+	case 2122598:
+		return ASAPInfo_ParseFc(self, module, moduleLen);
+	default:
+		return false;
+	}
+}
+
+const char *ASAPInfo_GetExtDescription(const char *ext)
+{
+	switch (ASAPInfo_PackExt(ext)) {
+	case 7364979:
+		return "Slight Atari Player";
+	case 6516067:
+		return "Chaos Music Composer";
+	case 3370339:
+		return "CMC \"3/4\"";
+	case 7499107:
+		return "CMC \"Rzog\"";
+	case 7564643:
+		return "Stereo Double CMC";
+	case 6516068:
+		return "DoublePlay CMC";
+	case 7629924:
+		return "Delta Music Composer";
+	case 7630957:
+		return "Music ProTracker";
+	case 6582381:
+		return "MPT DoublePlay";
+	case 7630194:
+		return "Raster Music Tracker";
+	case 6516084:
+	case 3698036:
+		return "Theta Music Composer 1.x";
+	case 3304820:
+		return "Theta Music Composer 2.x";
+	case 2122598:
+		return "Future Composer";
+	case 7890296:
+		return "Atari 8-bit executable";
+	default:
+		return NULL;
+	}
+}
+
+static int ASAPInfo_GetRmtSapOffset(const ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	if (self->player != 13315)
+		return -1;
+	int offset = self->headerLen + ASAPInfo_GetWord(module, self->headerLen + 4) - ASAPInfo_GetWord(module, self->headerLen + 2) + 7;
+	if (offset + 6 >= moduleLen || module[offset + 4] != 82 || module[offset + 5] != 77 || module[offset + 6] != 84)
+		return -1;
+	return offset;
+}
+
+static ASAPModuleType ASAPInfo_GetOriginalModuleType(const ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	switch (self->type) {
+	case ASAPModuleType_SAP_B:
+		if ((self->init == 1019 || self->init == 1017) && self->player == 1283)
+			return ASAPModuleType_DLT;
+		if (((self->init == 1267 || self->init == 1263) && self->player == 1283) || (self->init == 62707 && self->player == 62723))
+			return ASAPModuleType_MPT;
+		if (self->init == 3200 || ASAPInfo_GetRmtSapOffset(self, module, moduleLen) > 0)
+			return ASAPModuleType_RMT;
+		if (self->init == 1269 || self->init == 62709 || self->init == 1266 || ((self->init == 1255 || self->init == 62695 || self->init == 1252) && self->fastplay == 156) || ((self->init == 1253 || self->init == 62693 || self->init == 1250) && (self->fastplay == 104 || self->fastplay == 78)))
+			return ASAPModuleType_TMC;
+		if ((self->init == 4224 && self->player == 1283) || (self->init == 4992 && self->player == 2051))
+			return ASAPModuleType_TM2;
+		if (self->init == 1024 && self->player == 1027)
+			return ASAPModuleType_FC;
+		return self->type;
+	case ASAPModuleType_SAP_C:
+		if ((self->player == 1280 || self->player == 62720) && moduleLen >= 1024) {
+			if (self->channels > 1)
+				return ASAPModuleType_CMS;
+			if (module[moduleLen - 170] == 30)
+				return ASAPModuleType_CMR;
+			if (module[moduleLen - 909] == 48)
+				return ASAPModuleType_CM3;
+			return ASAPModuleType_CMC;
+		}
+		return self->type;
+	default:
+		return self->type;
+	}
+}
+
+const char *ASAPInfo_GetOriginalModuleExt(const ASAPInfo *self, uint8_t const *module, int moduleLen)
+{
+	switch (ASAPInfo_GetOriginalModuleType(self, module, moduleLen)) {
+	case ASAPModuleType_CMC:
+		return self->fastplay == 156 ? "dmc" : "cmc";
+	case ASAPModuleType_CM3:
+		return "cm3";
+	case ASAPModuleType_CMR:
+		return "cmr";
+	case ASAPModuleType_CMS:
+		return "cms";
+	case ASAPModuleType_DLT:
+		return "dlt";
+	case ASAPModuleType_MPT:
+		return self->fastplay == 156 ? "mpd" : "mpt";
+	case ASAPModuleType_RMT:
+		return "rmt";
+	case ASAPModuleType_TMC:
+		return "tmc";
+	case ASAPModuleType_TM2:
+		return "tm2";
+	case ASAPModuleType_FC:
+		return "fc";
+	default:
+		return NULL;
+	}
+}
+
+static int ASAPNativeModuleWriter_GetByte(const ASAPNativeModuleWriter *self, int offset)
+{
+	return self->sourceModule[self->sourceOffset + offset];
+}
+
+static int ASAPNativeModuleWriter_GetWord(const ASAPNativeModuleWriter *self, int offset)
+{
+	return ASAPInfo_GetWord(self->sourceModule, self->sourceOffset + offset);
+}
+
+static bool ASAPNativeModuleWriter_Copy(const ASAPNativeModuleWriter *self, int endOffset)
+{
+	return ASAPWriter_WriteBytes(self->writer, self->sourceModule, self->sourceOffset + self->writer->outputOffset, self->sourceOffset + endOffset);
+}
+
+static bool ASAPNativeModuleWriter_RelocateBytes(const ASAPNativeModuleWriter *self, int lowOffset, int highOffset, int count, int shift)
+{
+	lowOffset += self->sourceOffset;
+	highOffset += self->sourceOffset;
+	for (int i = 0; i < count; i++) {
+		int address = self->sourceModule[lowOffset + i] + (self->sourceModule[highOffset + i] << 8);
+		if (address != 0 && address != 65535)
+			address += self->addressDiff;
+		if (!ASAPWriter_WriteByte(self->writer, address >> shift & 255))
+			return false;
+	}
+	return true;
+}
+
+static bool ASAPNativeModuleWriter_RelocateLowHigh(const ASAPNativeModuleWriter *self, int count)
+{
+	int lowOffset = self->writer->outputOffset;
+	if (!ASAPNativeModuleWriter_RelocateBytes(self, lowOffset, lowOffset + count, count, 0))
+		return false;
+	return ASAPNativeModuleWriter_RelocateBytes(self, lowOffset, lowOffset + count, count, 8);
+}
+
+static bool ASAPNativeModuleWriter_RelocateWords(const ASAPNativeModuleWriter *self, int count)
+{
+	while (--count >= 0) {
+		int address = ASAPNativeModuleWriter_GetWord(self, self->writer->outputOffset);
+		if (address != 0 && address != 65535)
+			address += self->addressDiff;
+		if (!ASAPWriter_WriteWord(self->writer, address))
+			return false;
+	}
+	return true;
+}
+
+static bool ASAPNativeModuleWriter_Write(ASAPNativeModuleWriter *self, const ASAPInfo *info, ASAPModuleType type, int moduleLen)
+{
+	int startAddr = ASAPNativeModuleWriter_GetWord(self, 2);
+	self->addressDiff = ASAPInfo_GetMusicAddress(info) < 0 ? 0 : ASAPInfo_GetMusicAddress(info) - startAddr;
+	if (ASAPNativeModuleWriter_GetWord(self, 4) + self->addressDiff > 65535)
+		return false;
+	switch (type) {
+	case ASAPModuleType_CMC:
+	case ASAPModuleType_CM3:
+	case ASAPModuleType_CMR:
+	case ASAPModuleType_CMS:
+		if (!ASAPNativeModuleWriter_RelocateWords(self, 3))
+			return false;
+		if (!ASAPNativeModuleWriter_Copy(self, 26))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateLowHigh(self, 64))
+			return false;
+		break;
+	case ASAPModuleType_DLT:
+		if (!ASAPNativeModuleWriter_RelocateWords(self, 3))
+			return false;
+		break;
+	case ASAPModuleType_MPT:
+		if (!ASAPNativeModuleWriter_RelocateWords(self, 99))
+			return false;
+		if (!ASAPNativeModuleWriter_Copy(self, 454))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateLowHigh(self, 4))
+			return false;
+		break;
+	case ASAPModuleType_RMT:
+		if (!ASAPWriter_WriteWord(self->writer, 65535))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateWords(self, 2))
+			return false;
+		if (!ASAPNativeModuleWriter_Copy(self, 14))
+			return false;
+		int patternLowAddress = ASAPNativeModuleWriter_GetWord(self, 16);
+		if (!ASAPNativeModuleWriter_RelocateWords(self, (patternLowAddress - startAddr - 8) >> 1))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateLowHigh(self, ASAPNativeModuleWriter_GetWord(self, 18) - patternLowAddress))
+			return false;
+		int songOffset = 6 + ASAPNativeModuleWriter_GetWord(self, 20) - startAddr;
+		if (!ASAPNativeModuleWriter_Copy(self, songOffset))
+			return false;
+		int songEnd = 7 + ASAPNativeModuleWriter_GetWord(self, 4) - startAddr;
+		while (songOffset + 3 < songEnd) {
+			int nextSongOffset = songOffset + ASAPNativeModuleWriter_GetByte(self, 9) - 48;
+			if (ASAPNativeModuleWriter_GetByte(self, songOffset) == 254) {
+				if (!ASAPNativeModuleWriter_Copy(self, songOffset + 2))
+					return false;
+				if (!ASAPNativeModuleWriter_RelocateWords(self, 1))
+					return false;
+			}
+			if (nextSongOffset > songEnd)
+				nextSongOffset = songEnd;
+			if (!ASAPNativeModuleWriter_Copy(self, nextSongOffset))
+				return false;
+			songOffset = nextSongOffset;
+		}
+		if (!ASAPNativeModuleWriter_Copy(self, songEnd))
+			return false;
+		if (moduleLen >= songEnd + 5) {
+			if (!ASAPNativeModuleWriter_RelocateWords(self, 2))
+				return false;
+		}
+		break;
+	case ASAPModuleType_TMC:
+		if (!ASAPNativeModuleWriter_RelocateWords(self, 3))
+			return false;
+		if (!ASAPNativeModuleWriter_Copy(self, 38))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateLowHigh(self, 64))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateLowHigh(self, 128))
+			return false;
+		break;
+	case ASAPModuleType_TM2:
+		if (!ASAPNativeModuleWriter_RelocateWords(self, 3))
+			return false;
+		if (!ASAPNativeModuleWriter_Copy(self, 134))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateBytes(self, 134, 774, 128, 0))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateLowHigh(self, 256))
+			return false;
+		if (!ASAPNativeModuleWriter_RelocateBytes(self, 134, 774, 128, 8))
+			return false;
+		break;
+	default:
+		return false;
+	}
+	return ASAPNativeModuleWriter_Copy(self, moduleLen);
+}
+
+static void ASAPWriter_Construct(ASAPWriter *self)
+{
+}
+
+ASAPWriter *ASAPWriter_New(void)
+{
+	ASAPWriter *self = (ASAPWriter *) malloc(sizeof(ASAPWriter));
+	if (self != NULL)
+		ASAPWriter_Construct(self);
+	return self;
+}
+
+void ASAPWriter_Delete(ASAPWriter *self)
+{
+	free(self);
+}
+
+int ASAPWriter_GetSaveExts(const char **exts, const ASAPInfo *info, uint8_t const *module, int moduleLen)
+{
+	int i = 0;
+	switch (info->type) {
+	case ASAPModuleType_SAP_B:
+	case ASAPModuleType_SAP_C:
+		exts[i++] = "sap";
+		const char *ext = ASAPInfo_GetOriginalModuleExt(info, module, moduleLen);
+		if (ext != NULL)
+			exts[i++] = ext;
+		exts[i++] = "xex";
+		break;
+	case ASAPModuleType_SAP_D:
+		exts[i++] = "sap";
+		if (ASAPInfo_GetPlayerRateScanlines(info) == 312)
+			exts[i++] = "xex";
+		break;
+	case ASAPModuleType_SAP_S:
+		exts[i++] = "sap";
+		break;
+	default:
+		exts[i++] = ASAPInfo_GetOriginalModuleExt(info, module, moduleLen);
+		exts[i++] = "sap";
+		exts[i++] = "xex";
+		break;
+	}
+	return i;
+}
+
+static void ASAPWriter_TwoDigitsToString(uint8_t *result, int offset, int value)
+{
+	result[offset] = (uint8_t) (48 + value / 10);
+	result[offset + 1] = (uint8_t) (48 + value % 10);
+}
+
+static bool ASAPWriter_SecondsToString(uint8_t *result, int offset, int value)
+{
+	if (value < 0 || value >= 6000000)
+		return false;
+	value /= 1000;
+	ASAPWriter_TwoDigitsToString(result, offset, value / 60);
+	result[offset + 2] = 58;
+	ASAPWriter_TwoDigitsToString(result, offset + 3, value % 60);
+	return true;
+}
+
+int ASAPWriter_DurationToString(uint8_t *result, int value)
+{
+	if (!ASAPWriter_SecondsToString(result, 0, value))
+		return 0;
+	value %= 1000;
+	if (value == 0)
+		return 5;
+	result[5] = 46;
+	ASAPWriter_TwoDigitsToString(result, 6, value / 10);
+	value %= 10;
+	if (value == 0)
+		return 8;
+	result[8] = (uint8_t) (48 + value);
+	return 9;
+}
+
+void ASAPWriter_SetOutput(ASAPWriter *self, uint8_t *output, int startIndex, int endIndex)
+{
+	self->output = output;
+	self->outputOffset = startIndex;
+	self->outputEnd = endIndex;
+}
+
+static bool ASAPWriter_WriteByte(ASAPWriter *self, int value)
+{
+	if (self->outputOffset >= self->outputEnd)
+		return false;
+	self->output[self->outputOffset++] = (uint8_t) value;
+	return true;
+}
+
+static bool ASAPWriter_WriteWord(ASAPWriter *self, int value)
+{
+	if (!ASAPWriter_WriteByte(self, value & 255))
+		return false;
+	return ASAPWriter_WriteByte(self, value >> 8);
+}
+
+static bool ASAPWriter_WriteBytes(ASAPWriter *self, uint8_t const *array, int startIndex, int endIndex)
+{
+	int length = endIndex - startIndex;
+	if (self->outputOffset + length > self->outputEnd)
+		return false;
+	memcpy(self->output + self->outputOffset, array + startIndex, length);
+	self->outputOffset += length;
+	return true;
+}
+
+static bool ASAPWriter_WriteString(ASAPWriter *self, const char *s)
+{
+	int n = (int) strlen(s);
+	for (int i = 0; i < n; i++) {
+		if (!ASAPWriter_WriteByte(self, s[i]))
+			return false;
+	}
+	return true;
+}
+
+static bool ASAPWriter_WriteDec(ASAPWriter *self, int value)
+{
+	if (value >= 10) {
+		if (!ASAPWriter_WriteDec(self, value / 10))
+			return false;
+		value %= 10;
+	}
+	return ASAPWriter_WriteByte(self, 48 + value);
+}
+
+static bool ASAPWriter_WriteTextSapTag(ASAPWriter *self, const char *tag, const char *value)
+{
+	if (!ASAPWriter_WriteString(self, tag))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 34))
+		return false;
+	if (value[0] == '\0')
+		value = "<?>";
+	if (!ASAPWriter_WriteString(self, value))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 34))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 13))
+		return false;
+	return ASAPWriter_WriteByte(self, 10);
+}
+
+static bool ASAPWriter_WriteDecSapTag(ASAPWriter *self, const char *tag, int value)
+{
+	if (!ASAPWriter_WriteString(self, tag))
+		return false;
+	if (!ASAPWriter_WriteDec(self, value))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 13))
+		return false;
+	return ASAPWriter_WriteByte(self, 10);
+}
+
+static bool ASAPWriter_WriteHexSapTag(ASAPWriter *self, const char *tag, int value)
+{
+	if (value < 0)
+		return true;
+	if (!ASAPWriter_WriteString(self, tag))
+		return false;
+	for (int i = 12; i >= 0; i -= 4) {
+		int digit = value >> i & 15;
+		if (!ASAPWriter_WriteByte(self, digit + (digit < 10 ? 48 : 55)))
+			return false;
+	}
+	if (!ASAPWriter_WriteByte(self, 13))
+		return false;
+	return ASAPWriter_WriteByte(self, 10);
+}
+
+static bool ASAPWriter_WriteSapHeader(ASAPWriter *self, const ASAPInfo *info, int type, int init, int player)
+{
+	if (!ASAPWriter_WriteString(self, "SAP\r\n"))
+		return false;
+	if (!ASAPWriter_WriteTextSapTag(self, "AUTHOR ", ASAPInfo_GetAuthor(info)))
+		return false;
+	if (!ASAPWriter_WriteTextSapTag(self, "NAME ", ASAPInfo_GetTitle(info)))
+		return false;
+	if (!ASAPWriter_WriteTextSapTag(self, "DATE ", ASAPInfo_GetDate(info)))
+		return false;
+	if (ASAPInfo_GetSongs(info) > 1) {
+		if (!ASAPWriter_WriteDecSapTag(self, "SONGS ", ASAPInfo_GetSongs(info)))
+			return false;
+		if (ASAPInfo_GetDefaultSong(info) > 0) {
+			if (!ASAPWriter_WriteDecSapTag(self, "DEFSONG ", ASAPInfo_GetDefaultSong(info)))
+				return false;
+		}
+	}
+	if (ASAPInfo_GetChannels(info) > 1) {
+		if (!ASAPWriter_WriteString(self, "STEREO\r\n"))
+			return false;
+	}
+	if (ASAPInfo_IsNtsc(info)) {
+		if (!ASAPWriter_WriteString(self, "NTSC\r\n"))
+			return false;
+	}
+	if (!ASAPWriter_WriteString(self, "TYPE "))
+		return false;
+	if (!ASAPWriter_WriteByte(self, type))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 13))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 10))
+		return false;
+	if (ASAPInfo_GetPlayerRateScanlines(info) != 312 || ASAPInfo_IsNtsc(info)) {
+		if (!ASAPWriter_WriteDecSapTag(self, "FASTPLAY ", ASAPInfo_GetPlayerRateScanlines(info)))
+			return false;
+	}
+	if (type == 67) {
+		if (!ASAPWriter_WriteHexSapTag(self, "MUSIC ", ASAPInfo_GetMusicAddress(info)))
+			return false;
+	}
+	if (!ASAPWriter_WriteHexSapTag(self, "INIT ", init))
+		return false;
+	if (!ASAPWriter_WriteHexSapTag(self, "PLAYER ", player))
+		return false;
+	if (!ASAPWriter_WriteHexSapTag(self, "COVOX ", ASAPInfo_GetCovoxAddress(info)))
+		return false;
+	for (int song = 0; song < ASAPInfo_GetSongs(info); song++) {
+		if (ASAPInfo_GetDuration(info, song) < 0)
+			break;
+		if (!ASAPWriter_WriteString(self, "TIME "))
+			return false;
+		uint8_t s[9];
+		if (!ASAPWriter_WriteBytes(self, s, 0, ASAPWriter_DurationToString(s, ASAPInfo_GetDuration(info, song))))
+			return false;
+		if (ASAPInfo_GetLoop(info, song)) {
+			if (!ASAPWriter_WriteString(self, " LOOP"))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 13))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 10))
+			return false;
+	}
+	return true;
+}
+
+static bool ASAPWriter_WriteExecutableHeader(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, int type, int init, int player)
+{
+	if (initAndPlayer == NULL) {
+		if (!ASAPWriter_WriteSapHeader(self, info, type, init, player))
+			return false;
+	}
+	else {
+		initAndPlayer[0] = init;
+		initAndPlayer[1] = player;
+	}
+	return true;
+}
+
+static bool ASAPWriter_WritePlaTaxLda0(ASAPWriter *self)
+{
+	if (!ASAPWriter_WriteByte(self, 104))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 170))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 169))
+		return false;
+	return ASAPWriter_WriteByte(self, 0);
+}
+
+static bool ASAPWriter_WriteCmcInit(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info)
+{
+	if (initAndPlayer == NULL)
+		return true;
+	if (!ASAPWriter_WriteWord(self, 4064))
+		return false;
+	if (!ASAPWriter_WriteWord(self, 4080))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 72))
+		return false;
+	int music = ASAPInfo_GetMusicAddress(info);
+	if (!ASAPWriter_WriteByte(self, 162))
+		return false;
+	if (!ASAPWriter_WriteByte(self, music & 255))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 160))
+		return false;
+	if (!ASAPWriter_WriteByte(self, music >> 8))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 169))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 112))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 32))
+		return false;
+	if (!ASAPWriter_WriteWord(self, initAndPlayer[1] + 3))
+		return false;
+	if (!ASAPWriter_WritePlaTaxLda0(self))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 76))
+		return false;
+	if (!ASAPWriter_WriteWord(self, initAndPlayer[1] + 3))
+		return false;
+	initAndPlayer[0] = 4064;
+	initAndPlayer[1] += 6;
+	return true;
+}
+
+static bool ASAPWriter_WriteExecutableFromSap(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, int type, uint8_t const *module, int moduleLen)
+{
+	if (!ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, type, ASAPInfo_GetInitAddress(info), info->player))
+		return false;
+	return ASAPWriter_WriteBytes(self, module, info->headerLen, moduleLen);
+}
+
+static int ASAPWriter_WriteExecutableHeaderForSongPos(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, int player, int codeForOneSong, int codeForManySongs, int playerOffset)
+{
+	if (ASAPInfo_GetSongs(info) != 1) {
+		return ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 66, player - codeForManySongs, player + playerOffset) ? player - codeForManySongs - ASAPInfo_GetSongs(info) : -1;
+	}
+	return ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 66, player - codeForOneSong, player + playerOffset) ? player - codeForOneSong : -1;
+}
+
+static bool ASAPWriter_WriteExecutable(ASAPWriter *self, int *initAndPlayer, const ASAPInfo *info, uint8_t const *module, int moduleLen)
+{
+	uint8_t const *playerRoutine = ASAP6502_GetPlayerRoutine(info);
+	int player = -1;
+	int playerLastByte = -1;
+	int music = ASAPInfo_GetMusicAddress(info);
+	if (playerRoutine != NULL) {
+		player = ASAPInfo_GetWord(playerRoutine, 2);
+		playerLastByte = ASAPInfo_GetWord(playerRoutine, 4);
+		if (music <= playerLastByte)
+			return false;
+	}
+	int startAddr;
+	switch (info->type) {
+	case ASAPModuleType_SAP_B:
+		if (!ASAPWriter_WriteExecutableFromSap(self, initAndPlayer, info, 66, module, moduleLen))
+			return false;
+		break;
+	case ASAPModuleType_SAP_C:
+		if (!ASAPWriter_WriteExecutableFromSap(self, initAndPlayer, info, 67, module, moduleLen))
+			return false;
+		if (!ASAPWriter_WriteCmcInit(self, initAndPlayer, info))
+			return false;
+		break;
+	case ASAPModuleType_SAP_D:
+		if (!ASAPWriter_WriteExecutableFromSap(self, initAndPlayer, info, 68, module, moduleLen))
+			return false;
+		break;
+	case ASAPModuleType_SAP_S:
+		if (!ASAPWriter_WriteExecutableFromSap(self, initAndPlayer, info, 83, module, moduleLen))
+			return false;
+		break;
+	case ASAPModuleType_CMC:
+	case ASAPModuleType_CM3:
+	case ASAPModuleType_CMR:
+	case ASAPModuleType_CMS:
+		if (!ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 67, -1, player))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 65535))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, module, 2, moduleLen))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 2, playerLastByte - player + 7))
+			return false;
+		if (!ASAPWriter_WriteCmcInit(self, initAndPlayer, info))
+			return false;
+		break;
+	case ASAPModuleType_DLT:
+		if ((startAddr = ASAPWriter_WriteExecutableHeaderForSongPos(self, initAndPlayer, info, player, 5, 7, 259)) == -1)
+			return false;
+		if (moduleLen == 11270) {
+			if (!ASAPWriter_WriteBytes(self, module, 0, 4))
+				return false;
+			if (!ASAPWriter_WriteWord(self, 19456))
+				return false;
+			if (!ASAPWriter_WriteBytes(self, module, 6, moduleLen))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteBytes(self, module, 0, moduleLen))
+				return false;
+		}
+		if (!ASAPWriter_WriteWord(self, startAddr))
+			return false;
+		if (!ASAPWriter_WriteWord(self, playerLastByte))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteBytes(self, info->songPos, 0, ASAPInfo_GetSongs(info)))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 170))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 188))
+				return false;
+			if (!ASAPWriter_WriteWord(self, startAddr))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteByte(self, 160))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 76))
+			return false;
+		if (!ASAPWriter_WriteWord(self, player + 256))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 6, playerLastByte - player + 7))
+			return false;
+		break;
+	case ASAPModuleType_MPT:
+		if ((startAddr = ASAPWriter_WriteExecutableHeaderForSongPos(self, initAndPlayer, info, player, 13, 17, 3)) == -1)
+			return false;
+		if (!ASAPWriter_WriteBytes(self, module, 0, moduleLen))
+			return false;
+		if (!ASAPWriter_WriteWord(self, startAddr))
+			return false;
+		if (!ASAPWriter_WriteWord(self, playerLastByte))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteBytes(self, info->songPos, 0, ASAPInfo_GetSongs(info)))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 72))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 160))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music & 255))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 162))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music >> 8))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 169))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 0))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 32))
+			return false;
+		if (!ASAPWriter_WriteWord(self, player))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteByte(self, 104))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 168))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 190))
+				return false;
+			if (!ASAPWriter_WriteWord(self, startAddr))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteByte(self, 162))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 169))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 2))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 6, playerLastByte - player + 7))
+			return false;
+		break;
+	case ASAPModuleType_RMT:
+		if (!ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 66, 3200, 1539))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, module, 0, ASAPInfo_GetWord(module, 4) - music + 7))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 3200))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteWord(self, 3210 + ASAPInfo_GetSongs(info)))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 168))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 185))
+				return false;
+			if (!ASAPWriter_WriteWord(self, 3211))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteWord(self, 3208))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 169))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 162))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music & 255))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 160))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music >> 8))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 76))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 1536))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteBytes(self, info->songPos, 0, ASAPInfo_GetSongs(info)))
+				return false;
+		}
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 2, playerLastByte - player + 7))
+			return false;
+		break;
+	case ASAPModuleType_TMC:
+		;
+		static const int TMC_PLAYER_OFFSET[4] = { 3, -9, -10, -10 };
+		int player2 = player + TMC_PLAYER_OFFSET[module[37] - 1];
+		static const int TMC_INIT_OFFSET[4] = { -14, -16, -17, -17 };
+		startAddr = player2 + TMC_INIT_OFFSET[module[37] - 1];
+		if (ASAPInfo_GetSongs(info) != 1)
+			startAddr -= 3;
+		if (!ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 66, startAddr, player2))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, module, 0, moduleLen))
+			return false;
+		if (!ASAPWriter_WriteWord(self, startAddr))
+			return false;
+		if (!ASAPWriter_WriteWord(self, playerLastByte))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteByte(self, 72))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 160))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music & 255))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 162))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music >> 8))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 169))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 112))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 32))
+			return false;
+		if (!ASAPWriter_WriteWord(self, player))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WritePlaTaxLda0(self))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteByte(self, 169))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 96))
+				return false;
+		}
+		switch (module[37]) {
+		case 2:
+			if (!ASAPWriter_WriteByte(self, 6))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 76))
+				return false;
+			if (!ASAPWriter_WriteWord(self, player))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 165))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 230))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 74))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 144))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 5))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 176))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 6))
+				return false;
+			break;
+		case 3:
+		case 4:
+			if (!ASAPWriter_WriteByte(self, 160))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 1))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 132))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 208))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 10))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 198))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 208))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 12))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 160))
+				return false;
+			if (!ASAPWriter_WriteByte(self, module[37]))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 132))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 208))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 3))
+				return false;
+			break;
+		}
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 6, playerLastByte - player + 7))
+			return false;
+		break;
+	case ASAPModuleType_TM2:
+		if (!ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 66, 4992, 2051))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, module, 0, moduleLen))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 4992))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WriteWord(self, 5008))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 72))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteWord(self, 5006))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 160))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music & 255))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 162))
+			return false;
+		if (!ASAPWriter_WriteByte(self, music >> 8))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 169))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 112))
+			return false;
+		if (!ASAPWriter_WriteByte(self, 32))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 2048))
+			return false;
+		if (ASAPInfo_GetSongs(info) != 1) {
+			if (!ASAPWriter_WritePlaTaxLda0(self))
+				return false;
+		}
+		else {
+			if (!ASAPWriter_WriteByte(self, 169))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 0))
+				return false;
+			if (!ASAPWriter_WriteByte(self, 170))
+				return false;
+		}
+		if (!ASAPWriter_WriteByte(self, 76))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 2048))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 2, playerLastByte - player + 7))
+			return false;
+		break;
+	case ASAPModuleType_FC:
+		if (!ASAPWriter_WriteExecutableHeader(self, initAndPlayer, info, 66, player, player + 3))
+			return false;
+		if (!ASAPWriter_WriteWord(self, 65535))
+			return false;
+		if (!ASAPWriter_WriteWord(self, music))
+			return false;
+		if (!ASAPWriter_WriteWord(self, music + moduleLen - 1))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, module, 0, moduleLen))
+			return false;
+		if (!ASAPWriter_WriteBytes(self, playerRoutine, 2, playerLastByte - player + 7))
+			return false;
+		break;
+	}
+	return true;
+}
+
+static int ASAPWriter_PadXexInfo(uint8_t *dest, int offset, int endColumn)
+{
+	while (offset % 32 != endColumn)
+		dest[offset++] = 32;
+	return offset;
+}
+
+static int ASAPWriter_FormatXexInfoText(uint8_t *dest, int destLen, int endColumn, const char *src, bool author)
+{
+	int srcLen = (int) strlen(src);
+	for (int srcOffset = 0; srcOffset < srcLen;) {
+		int c = src[srcOffset++];
+		if (c == 32) {
+			if (author && srcOffset < srcLen && src[srcOffset] == '&') {
+				int authorLen;
+				for (authorLen = 1; srcOffset + authorLen < srcLen; authorLen++) {
+					if (src[srcOffset + authorLen] == ' ' && srcOffset + authorLen + 1 < srcLen && src[srcOffset + authorLen + 1] == '&')
+						break;
+				}
+				if (authorLen <= 32 && destLen % 32 + 1 + authorLen > 32) {
+					destLen = ASAPWriter_PadXexInfo(dest, destLen, 1);
+					continue;
+				}
+			}
+			int wordLen;
+			for (wordLen = 0; srcOffset + wordLen < srcLen && src[srcOffset + wordLen] != ' '; wordLen++) {
+			}
+			if (wordLen <= 32 && destLen % 32 + 1 + wordLen > 32) {
+				destLen = ASAPWriter_PadXexInfo(dest, destLen, 0);
+				continue;
+			}
+		}
+		dest[destLen++] = (uint8_t) c;
+	}
+	return ASAPWriter_PadXexInfo(dest, destLen, endColumn);
+}
+
+static bool ASAPWriter_WriteXexInfoTextDl(ASAPWriter *self, int address, int len, int verticalScrollAt)
+{
+	if (!ASAPWriter_WriteByte(self, verticalScrollAt == 0 ? 98 : 66))
+		return false;
+	if (!ASAPWriter_WriteWord(self, address))
+		return false;
+	for (int i = 32; i < len; i += 32) {
+		if (!ASAPWriter_WriteByte(self, i == verticalScrollAt ? 34 : 2))
+			return false;
+	}
+	return true;
+}
+
+static bool ASAPWriter_WriteXexInfo(ASAPWriter *self, const ASAPInfo *info)
+{
+	uint8_t title[256];
+	int titleLen = ASAPWriter_FormatXexInfoText(title, 0, 0, ASAPInfo_GetTitle(info)[0] == '\0' ? "(untitled)" : ASAPInfo_GetTitle(info), false);
+	uint8_t author[256];
+	int authorLen;
+	if (ASAPInfo_GetAuthor(info)[0] != '\0') {
+		author[0] = 98;
+		author[1] = 121;
+		author[2] = 32;
+		authorLen = ASAPWriter_FormatXexInfoText(author, 3, 0, ASAPInfo_GetAuthor(info), true);
+	}
+	else
+		authorLen = 0;
+	uint8_t other[256];
+	int otherLen = ASAPWriter_FormatXexInfoText(other, 0, 19, ASAPInfo_GetDate(info), false);
+	otherLen = ASAPWriter_FormatXexInfoText(other, otherLen, 27, ASAPInfo_GetChannels(info) > 1 ? " STEREO" : "   MONO", false);
+	int duration = ASAPInfo_GetDuration(info, ASAPInfo_GetDefaultSong(info));
+	if (duration > 0 && ASAPWriter_SecondsToString(other, otherLen, duration + 999))
+		otherLen += 5;
+	else
+		otherLen = ASAPWriter_PadXexInfo(other, otherLen, 0);
+	int totalCharacters = titleLen + authorLen + otherLen;
+	int totalLines = totalCharacters / 32;
+	int otherAddress = 64592 - otherLen;
+	int titleAddress = otherAddress - authorLen - 8 - titleLen;
+	if (!ASAPWriter_WriteWord(self, titleAddress))
+		return false;
+	if (!ASAPWriter_WriteBytes(self, CiResource_xexinfo_obx, 4, 6))
+		return false;
+	if (!ASAPWriter_WriteBytes(self, title, 0, titleLen))
+		return false;
+	for (int i = 0; i < 8; i++) {
+		if (!ASAPWriter_WriteByte(self, 85))
+			return false;
+	}
+	if (!ASAPWriter_WriteBytes(self, author, 0, authorLen))
+		return false;
+	if (!ASAPWriter_WriteBytes(self, other, 0, otherLen))
+		return false;
+	for (int i = totalLines; i < 26; i++) {
+		if (!ASAPWriter_WriteByte(self, 112))
+			return false;
+	}
+	if (!ASAPWriter_WriteByte(self, 48))
+		return false;
+	if (!ASAPWriter_WriteXexInfoTextDl(self, titleAddress, titleLen, titleLen - 32))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 8))
+		return false;
+	if (!ASAPWriter_WriteByte(self, 0))
+		return false;
+	for (int i = 0; i < authorLen; i += 32) {
+		if (!ASAPWriter_WriteByte(self, 2))
+			return false;
+	}
+	if (!ASAPWriter_WriteByte(self, 16))
+		return false;
+	for (int i = 0; i < otherLen; i += 32) {
+		if (!ASAPWriter_WriteByte(self, 2))
+			return false;
+	}
+	return ASAPWriter_WriteBytes(self, CiResource_xexinfo_obx, 6, 178);
+}
+
+static bool ASAPWriter_WriteNative(ASAPWriter *self, const ASAPInfo *info, uint8_t const *module, int moduleLen)
+{
+	ASAPNativeModuleWriter nativeWriter;
+	nativeWriter.writer = self;
+	nativeWriter.sourceModule = module;
+	ASAPModuleType type = info->type;
+	switch (type) {
+	case ASAPModuleType_SAP_B:
+	case ASAPModuleType_SAP_C:
+		;
+		int offset = ASAPInfo_GetRmtSapOffset(info, module, moduleLen);
+		if (offset > 0) {
+			nativeWriter.sourceOffset = offset - 2;
+			return ASAPNativeModuleWriter_Write(&nativeWriter, info, ASAPModuleType_RMT, moduleLen - offset + 2);
+		}
+		nativeWriter.sourceOffset = info->headerLen;
+		int blockLen = ASAPNativeModuleWriter_GetWord(&nativeWriter, 4) - ASAPNativeModuleWriter_GetWord(&nativeWriter, 2) + 7;
+		if (blockLen < 7 || info->headerLen + blockLen >= moduleLen)
+			return false;
+		type = ASAPInfo_GetOriginalModuleType(info, module, moduleLen);
+		if (type == ASAPModuleType_FC) {
+			if (!ASAPWriter_WriteBytes(self, module, info->headerLen + 6, info->headerLen + blockLen))
+				return false;
+		}
+		else {
+			if (!ASAPNativeModuleWriter_Write(&nativeWriter, info, type, blockLen))
+				return false;
+		}
+		break;
+	case ASAPModuleType_FC:
+		return ASAPWriter_WriteBytes(self, module, 0, moduleLen);
+	default:
+		nativeWriter.sourceOffset = 0;
+		if (!ASAPNativeModuleWriter_Write(&nativeWriter, info, type, moduleLen))
+			return false;
+		break;
+	}
+	return true;
+}
+
+int ASAPWriter_Write(ASAPWriter *self, const char *targetFilename, const ASAPInfo *info, uint8_t const *module, int moduleLen, bool tag)
+{
+	int destExt = ASAPInfo_GetPackedExt(targetFilename);
+	switch (destExt) {
+	case 7364979:
+		return ASAPWriter_WriteExecutable(self, NULL, info, module, moduleLen) ? self->outputOffset : -1;
+	case 7890296:
+		{
+			int initAndPlayer[2];
+			if (!ASAPWriter_WriteExecutable(self, initAndPlayer, info, module, moduleLen))
+				return -1;
+			switch (info->type) {
+			case ASAPModuleType_SAP_D:
+				if (ASAPInfo_GetPlayerRateScanlines(info) != 312)
+					return -1;
+				if (!ASAPWriter_WriteBytes(self, CiResource_xexd_obx, 2, 117))
+					return -1;
+				if (!ASAPWriter_WriteWord(self, initAndPlayer[0]))
+					return -1;
+				if (initAndPlayer[1] < 0) {
+					if (!ASAPWriter_WriteByte(self, 96))
+						return -1;
+					if (!ASAPWriter_WriteByte(self, 96))
+						return -1;
+					if (!ASAPWriter_WriteByte(self, 96))
+						return -1;
+				}
+				else {
+					if (!ASAPWriter_WriteByte(self, 76))
+						return -1;
+					if (!ASAPWriter_WriteWord(self, initAndPlayer[1]))
+						return -1;
+				}
+				if (!ASAPWriter_WriteByte(self, ASAPInfo_GetDefaultSong(info)))
+					return -1;
+				break;
+			case ASAPModuleType_SAP_S:
+				return -1;
+			default:
+				if (!ASAPWriter_WriteBytes(self, CiResource_xexb_obx, 2, 183))
+					return -1;
+				if (!ASAPWriter_WriteWord(self, initAndPlayer[0]))
+					return -1;
+				if (!ASAPWriter_WriteByte(self, 76))
+					return -1;
+				if (!ASAPWriter_WriteWord(self, initAndPlayer[1]))
+					return -1;
+				if (!ASAPWriter_WriteByte(self, ASAPInfo_GetDefaultSong(info)))
+					return -1;
+				int fastplay = ASAPInfo_GetPlayerRateScanlines(info);
+				if (!ASAPWriter_WriteByte(self, fastplay & 1))
+					return -1;
+				if (!ASAPWriter_WriteByte(self, (fastplay >> 1) % 156))
+					return -1;
+				if (!ASAPWriter_WriteByte(self, (fastplay >> 1) % 131))
+					return -1;
+				if (!ASAPWriter_WriteByte(self, fastplay / 312))
+					return -1;
+				if (!ASAPWriter_WriteByte(self, fastplay / 262))
+					return -1;
+				break;
+			}
+			if (tag) {
+				if (!ASAPWriter_WriteXexInfo(self, info))
+					return -1;
+			}
+			if (!ASAPWriter_WriteWord(self, 736))
+				return -1;
+			if (!ASAPWriter_WriteWord(self, 737))
+				return -1;
+			if (!ASAPWriter_WriteWord(self, tag ? 256 : 292))
+				return -1;
+			FlashPack flashPack;
+			return FlashPack_Compress(&flashPack, self) ? self->outputOffset : -1;
+		}
+	default:
+		;
+		const char *possibleExt = ASAPInfo_GetOriginalModuleExt(info, module, moduleLen);
+		if (possibleExt != NULL) {
+			int packedPossibleExt = ASAPInfo_PackExt(possibleExt);
+			if (destExt == packedPossibleExt || (destExt == 3698036 && packedPossibleExt == 6516084)) {
+				return ASAPWriter_WriteNative(self, info, module, moduleLen) ? self->outputOffset : -1;
+			}
+		}
+		return -1;
+	}
+}
+
+static void Cpu6502_Reset(Cpu6502 *self)
+{
+	self->cycle = 0;
+	self->nz = 0;
+	self->c = 0;
+	self->vdi = 0;
+}
+
+static int Cpu6502_Peek(const Cpu6502 *self, int addr)
+{
+	if ((addr & 63744) == 53248)
+		return ASAP_PeekHardware(self->asap, addr);
+	else
+		return self->memory[addr];
+}
+
+static void Cpu6502_Poke(Cpu6502 *self, int addr, int data)
+{
+	if ((addr & 63744) == 53248)
+		ASAP_PokeHardware(self->asap, addr, data);
+	else
+		self->memory[addr] = (uint8_t) data;
+}
+
+static int Cpu6502_PeekReadModifyWrite(Cpu6502 *self, int addr)
+{
+	if (addr >> 8 == 210) {
+		self->cycle--;
+		int data = ASAP_PeekHardware(self->asap, addr);
+		ASAP_PokeHardware(self->asap, addr, data);
+		self->cycle++;
+		return data;
+	}
+	return self->memory[addr];
+}
+
+static int Cpu6502_Pull(Cpu6502 *self)
+{
+	int s = (self->s + 1) & 255;
+	self->s = s;
+	return self->memory[256 + s];
+}
+
+static void Cpu6502_PullFlags(Cpu6502 *self)
+{
+	int data = Cpu6502_Pull(self);
+	self->nz = ((data & 128) << 1) + (~data & 2);
+	self->c = data & 1;
+	self->vdi = data & 76;
+}
+
+static void Cpu6502_Push(Cpu6502 *self, int data)
+{
+	int s = self->s;
+	self->memory[256 + s] = (uint8_t) data;
+	self->s = (s - 1) & 255;
+}
+
+static void Cpu6502_PushPc(Cpu6502 *self)
+{
+	Cpu6502_Push(self, self->pc >> 8);
+	Cpu6502_Push(self, self->pc & 255);
+}
+
+static void Cpu6502_PushFlags(Cpu6502 *self, int b)
+{
+	int nz = self->nz;
+	b += ((nz | nz >> 1) & 128) + self->vdi + self->c;
+	if ((nz & 255) == 0)
+		b += 2;
+	Cpu6502_Push(self, b);
+}
+
+static void Cpu6502_AddWithCarry(Cpu6502 *self, int data)
+{
+	int a = self->a;
+	int vdi = self->vdi;
+	int tmp = a + data + self->c;
+	self->nz = tmp & 255;
+	if ((vdi & 8) == 0) {
+		self->vdi = (vdi & 12) + ((~(data ^ a) & (a ^ tmp)) >> 1 & 64);
+		self->c = tmp >> 8;
+		self->a = self->nz;
+	}
+	else {
+		int al = (a & 15) + (data & 15) + self->c;
+		if (al >= 10) {
+			tmp += al < 26 ? 6 : -10;
+			if (self->nz != 0)
+				self->nz = (tmp & 128) + 1;
+		}
+		self->vdi = (vdi & 12) + ((~(data ^ a) & (a ^ tmp)) >> 1 & 64);
+		if (tmp >= 160) {
+			self->c = 1;
+			self->a = (tmp - 160) & 255;
+		}
+		else {
+			self->c = 0;
+			self->a = tmp;
+		}
+	}
+}
+
+static void Cpu6502_SubtractWithCarry(Cpu6502 *self, int data)
+{
+	int a = self->a;
+	int vdi = self->vdi;
+	int borrow = self->c - 1;
+	int tmp = a - data + borrow;
+	int al = (a & 15) - (data & 15) + borrow;
+	self->vdi = (vdi & 12) + (((data ^ a) & (a ^ tmp)) >> 1 & 64);
+	self->c = tmp >= 0 ? 1 : 0;
+	self->nz = self->a = tmp & 255;
+	if ((vdi & 8) != 0) {
+		if (al < 0)
+			self->a += al < -10 ? 10 : -6;
+		if (self->c == 0)
+			self->a = (self->a - 96) & 255;
+	}
+}
+
+static int Cpu6502_ArithmeticShiftLeft(Cpu6502 *self, int addr)
+{
+	int data = Cpu6502_PeekReadModifyWrite(self, addr);
+	self->c = data >> 7;
+	data = data << 1 & 255;
+	Cpu6502_Poke(self, addr, data);
+	return data;
+}
+
+static int Cpu6502_RotateLeft(Cpu6502 *self, int addr)
+{
+	int data = (Cpu6502_PeekReadModifyWrite(self, addr) << 1) + self->c;
+	self->c = data >> 8;
+	data &= 255;
+	Cpu6502_Poke(self, addr, data);
+	return data;
+}
+
+static int Cpu6502_LogicalShiftRight(Cpu6502 *self, int addr)
+{
+	int data = Cpu6502_PeekReadModifyWrite(self, addr);
+	self->c = data & 1;
+	data >>= 1;
+	Cpu6502_Poke(self, addr, data);
+	return data;
+}
+
+static int Cpu6502_RotateRight(Cpu6502 *self, int addr)
+{
+	int data = (self->c << 8) + Cpu6502_PeekReadModifyWrite(self, addr);
+	self->c = data & 1;
+	data >>= 1;
+	Cpu6502_Poke(self, addr, data);
+	return data;
+}
+
+static int Cpu6502_Decrement(Cpu6502 *self, int addr)
+{
+	int data = (Cpu6502_PeekReadModifyWrite(self, addr) - 1) & 255;
+	Cpu6502_Poke(self, addr, data);
+	return data;
+}
+
+static int Cpu6502_Increment(Cpu6502 *self, int addr)
+{
+	int data = (Cpu6502_PeekReadModifyWrite(self, addr) + 1) & 255;
+	Cpu6502_Poke(self, addr, data);
+	return data;
+}
+
+static void Cpu6502_ExecuteIrq(Cpu6502 *self, int b)
+{
+	Cpu6502_PushPc(self);
+	Cpu6502_PushFlags(self, b);
+	self->vdi |= 4;
+	self->pc = self->memory[65534] + (self->memory[65535] << 8);
+}
+
+static void Cpu6502_CheckIrq(Cpu6502 *self)
+{
+	if ((self->vdi & 4) == 0 && ASAP_IsIrq(self->asap)) {
+		self->cycle += 7;
+		Cpu6502_ExecuteIrq(self, 32);
+	}
+}
+
+static void Cpu6502_Shx(Cpu6502 *self, int addr, int data)
+{
+	addr += self->memory[self->pc++];
+	int hi = self->memory[self->pc++];
+	data &= hi + 1;
+	if (addr >= 256)
+		hi = data - 1;
+	addr += hi << 8;
+	Cpu6502_Poke(self, addr, data);
+}
+
+static void Cpu6502_DoFrame(Cpu6502 *self, int cycleLimit)
+{
+	while (self->cycle < cycleLimit) {
+		if (self->cycle >= self->asap->nextEventCycle) {
+			ASAP_HandleEvent(self->asap);
+			Cpu6502_CheckIrq(self);
+		}
+		int data = self->memory[self->pc++];
+		static const uint8_t OPCODE_CYCLES[256] = { 7, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 4, 4, 6, 6,
+			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
+			6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 4, 4, 6, 6,
+			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
+			6, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 3, 4, 6, 6,
+			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
+			6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 5, 4, 6, 6,
+			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
+			2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4,
+			2, 6, 2, 6, 4, 4, 4, 4, 2, 5, 2, 5, 5, 5, 5, 5,
+			2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4,
+			2, 5, 2, 5, 4, 4, 4, 4, 2, 4, 2, 4, 4, 4, 4, 4,
+			2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6,
+			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7,
+			2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6,
+			2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7 };
+		self->cycle += OPCODE_CYCLES[data];
+		int addr = 0;
+		switch (data) {
+		case 0:
+			self->pc++;
+			Cpu6502_ExecuteIrq(self, 48);
+			continue;
+		case 1:
+		case 3:
+		case 33:
+		case 35:
+		case 65:
+		case 67:
+		case 97:
+		case 99:
+		case 129:
+		case 131:
+		case 161:
+		case 163:
+		case 193:
+		case 195:
+		case 225:
+		case 227:
+			addr = (self->memory[self->pc++] + self->x) & 255;
+			addr = self->memory[addr] + (self->memory[(addr + 1) & 255] << 8);
+			break;
+		case 2:
+		case 18:
+		case 34:
+		case 50:
+		case 66:
+		case 82:
+		case 98:
+		case 114:
+		case 146:
+		case 178:
+		case 210:
+		case 242:
+			self->pc--;
+			self->cycle = self->asap->nextEventCycle;
+			continue;
+		case 4:
+		case 68:
+		case 100:
+		case 20:
+		case 52:
+		case 84:
+		case 116:
+		case 212:
+		case 244:
+		case 128:
+		case 130:
+		case 137:
+		case 194:
+		case 226:
+			self->pc++;
+			continue;
+		case 5:
+		case 6:
+		case 7:
+		case 36:
+		case 37:
+		case 38:
+		case 39:
+		case 69:
+		case 70:
+		case 71:
+		case 101:
+		case 102:
+		case 103:
+		case 132:
+		case 133:
+		case 134:
+		case 135:
+		case 164:
+		case 165:
+		case 166:
+		case 167:
+		case 196:
+		case 197:
+		case 198:
+		case 199:
+		case 228:
+		case 229:
+		case 230:
+		case 231:
+			addr = self->memory[self->pc++];
+			break;
+		case 8:
+			Cpu6502_PushFlags(self, 48);
+			continue;
+		case 9:
+		case 41:
+		case 73:
+		case 105:
+		case 160:
+		case 162:
+		case 169:
+		case 192:
+		case 201:
+		case 224:
+		case 233:
+		case 235:
+			addr = self->pc++;
+			break;
+		case 10:
+			self->c = self->a >> 7;
+			self->nz = self->a = self->a << 1 & 255;
+			continue;
+		case 11:
+		case 43:
+			self->nz = self->a &= self->memory[self->pc++];
+			self->c = self->nz >> 7;
+			continue;
+		case 12:
+			self->pc += 2;
+			continue;
+		case 13:
+		case 14:
+		case 15:
+		case 44:
+		case 45:
+		case 46:
+		case 47:
+		case 77:
+		case 78:
+		case 79:
+		case 108:
+		case 109:
+		case 110:
+		case 111:
+		case 140:
+		case 141:
+		case 142:
+		case 143:
+		case 172:
+		case 173:
+		case 174:
+		case 175:
+		case 204:
+		case 205:
+		case 206:
+		case 207:
+		case 236:
+		case 237:
+		case 238:
+		case 239:
+			addr = self->memory[self->pc++];
+			addr += self->memory[self->pc++] << 8;
+			break;
+		case 16:
+			if (self->nz < 128)
+				break;
+			self->pc++;
+			continue;
+		case 17:
+		case 49:
+		case 81:
+		case 113:
+		case 177:
+		case 179:
+		case 209:
+		case 241:
+			;
+			int zp = self->memory[self->pc++];
+			addr = self->memory[zp] + self->y;
+			if (addr >= 256)
+				self->cycle++;
+			addr = (addr + (self->memory[(zp + 1) & 255] << 8)) & 65535;
+			break;
+		case 19:
+		case 51:
+		case 83:
+		case 115:
+		case 145:
+		case 211:
+		case 243:
+			addr = self->memory[self->pc++];
+			addr = (self->memory[addr] + (self->memory[(addr + 1) & 255] << 8) + self->y) & 65535;
+			break;
+		case 21:
+		case 22:
+		case 23:
+		case 53:
+		case 54:
+		case 55:
+		case 85:
+		case 86:
+		case 87:
+		case 117:
+		case 118:
+		case 119:
+		case 148:
+		case 149:
+		case 180:
+		case 181:
+		case 213:
+		case 214:
+		case 215:
+		case 245:
+		case 246:
+		case 247:
+			addr = (self->memory[self->pc++] + self->x) & 255;
+			break;
+		case 24:
+			self->c = 0;
+			continue;
+		case 25:
+		case 57:
+		case 89:
+		case 121:
+		case 185:
+		case 187:
+		case 190:
+		case 191:
+		case 217:
+		case 249:
+			addr = self->memory[self->pc++] + self->y;
+			if (addr >= 256)
+				self->cycle++;
+			addr = (addr + (self->memory[self->pc++] << 8)) & 65535;
+			break;
+		case 27:
+		case 59:
+		case 91:
+		case 123:
+		case 153:
+		case 219:
+		case 251:
+			addr = self->memory[self->pc++] + self->y;
+			addr = (addr + (self->memory[self->pc++] << 8)) & 65535;
+			break;
+		case 28:
+		case 60:
+		case 92:
+		case 124:
+		case 220:
+		case 252:
+			if (self->memory[self->pc] + self->x >= 256)
+				self->cycle++;
+			self->pc += 2;
+			continue;
+		case 29:
+		case 61:
+		case 93:
+		case 125:
+		case 188:
+		case 189:
+		case 221:
+		case 253:
+			addr = self->memory[self->pc++] + self->x;
+			if (addr >= 256)
+				self->cycle++;
+			addr = (addr + (self->memory[self->pc++] << 8)) & 65535;
+			break;
+		case 30:
+		case 31:
+		case 62:
+		case 63:
+		case 94:
+		case 95:
+		case 126:
+		case 127:
+		case 157:
+		case 222:
+		case 223:
+		case 254:
+		case 255:
+			addr = self->memory[self->pc++] + self->x;
+			addr = (addr + (self->memory[self->pc++] << 8)) & 65535;
+			break;
+		case 32:
+			addr = self->memory[self->pc++];
+			Cpu6502_PushPc(self);
+			self->pc = addr + (self->memory[self->pc] << 8);
+			continue;
+		case 40:
+			Cpu6502_PullFlags(self);
+			Cpu6502_CheckIrq(self);
+			continue;
+		case 42:
+			self->a = (self->a << 1) + self->c;
+			self->c = self->a >> 8;
+			self->nz = self->a &= 255;
+			continue;
+		case 48:
+			if (self->nz >= 128)
+				break;
+			self->pc++;
+			continue;
+		case 56:
+			self->c = 1;
+			continue;
+		case 64:
+			Cpu6502_PullFlags(self);
+			self->pc = Cpu6502_Pull(self);
+			self->pc += Cpu6502_Pull(self) << 8;
+			Cpu6502_CheckIrq(self);
+			continue;
+		case 72:
+			Cpu6502_Push(self, self->a);
+			continue;
+		case 74:
+			self->c = self->a & 1;
+			self->nz = self->a >>= 1;
+			continue;
+		case 75:
+			self->a &= self->memory[self->pc++];
+			self->c = self->a & 1;
+			self->nz = self->a >>= 1;
+			continue;
+		case 76:
+			addr = self->memory[self->pc++];
+			self->pc = addr + (self->memory[self->pc] << 8);
+			continue;
+		case 80:
+			if ((self->vdi & 64) == 0)
+				break;
+			self->pc++;
+			continue;
+		case 88:
+			self->vdi &= 72;
+			Cpu6502_CheckIrq(self);
+			continue;
+		case 96:
+			self->pc = Cpu6502_Pull(self);
+			self->pc += (Cpu6502_Pull(self) << 8) + 1;
+			continue;
+		case 104:
+			self->nz = self->a = Cpu6502_Pull(self);
+			continue;
+		case 106:
+			self->nz = (self->c << 7) + (self->a >> 1);
+			self->c = self->a & 1;
+			self->a = self->nz;
+			continue;
+		case 107:
+			data = self->a & self->memory[self->pc++];
+			self->nz = self->a = (data >> 1) + (self->c << 7);
+			self->vdi = (self->vdi & 12) + ((self->a ^ data) & 64);
+			if ((self->vdi & 8) == 0)
+				self->c = data >> 7;
+			else {
+				if ((data & 15) >= 5)
+					self->a = (self->a & 240) + ((self->a + 6) & 15);
+				if (data >= 80) {
+					self->a = (self->a + 96) & 255;
+					self->c = 1;
+				}
+				else
+					self->c = 0;
+			}
+			continue;
+		case 112:
+			if ((self->vdi & 64) != 0)
+				break;
+			self->pc++;
+			continue;
+		case 120:
+			self->vdi |= 4;
+			continue;
+		case 136:
+			self->nz = self->y = (self->y - 1) & 255;
+			continue;
+		case 138:
+			self->nz = self->a = self->x;
+			continue;
+		case 139:
+			data = self->memory[self->pc++];
+			self->a &= (data | 239) & self->x;
+			self->nz = self->a & data;
+			continue;
+		case 144:
+			if (self->c == 0)
+				break;
+			self->pc++;
+			continue;
+		case 147:
+			{
+				addr = self->memory[self->pc++];
+				int hi = self->memory[(addr + 1) & 255];
+				addr = self->memory[addr];
+				data = (hi + 1) & self->a & self->x;
+				addr += self->y;
+				if (addr >= 256)
+					hi = data - 1;
+				addr += hi << 8;
+				Cpu6502_Poke(self, addr, data);
+			}
+			continue;
+		case 150:
+		case 151:
+		case 182:
+		case 183:
+			addr = (self->memory[self->pc++] + self->y) & 255;
+			break;
+		case 152:
+			self->nz = self->a = self->y;
+			continue;
+		case 154:
+			self->s = self->x;
+			continue;
+		case 155:
+			self->s = self->a & self->x;
+			Cpu6502_Shx(self, self->y, self->s);
+			continue;
+		case 156:
+			Cpu6502_Shx(self, self->x, self->y);
+			continue;
+		case 158:
+			Cpu6502_Shx(self, self->y, self->x);
+			continue;
+		case 159:
+			Cpu6502_Shx(self, self->y, self->a & self->x);
+			continue;
+		case 168:
+			self->nz = self->y = self->a;
+			continue;
+		case 170:
+			self->nz = self->x = self->a;
+			continue;
+		case 171:
+			self->nz = self->x = self->a &= self->memory[self->pc++];
+			continue;
+		case 176:
+			if (self->c != 0)
+				break;
+			self->pc++;
+			continue;
+		case 184:
+			self->vdi &= 12;
+			continue;
+		case 186:
+			self->nz = self->x = self->s;
+			continue;
+		case 200:
+			self->nz = self->y = (self->y + 1) & 255;
+			continue;
+		case 202:
+			self->nz = self->x = (self->x - 1) & 255;
+			continue;
+		case 203:
+			self->nz = self->memory[self->pc++];
+			self->x &= self->a;
+			self->c = self->x >= self->nz ? 1 : 0;
+			self->nz = self->x = (self->x - self->nz) & 255;
+			continue;
+		case 208:
+			if ((self->nz & 255) != 0)
+				break;
+			self->pc++;
+			continue;
+		case 216:
+			self->vdi &= 68;
+			continue;
+		case 232:
+			self->nz = self->x = (self->x + 1) & 255;
+			continue;
+		case 234:
+		case 26:
+		case 58:
+		case 90:
+		case 122:
+		case 218:
+		case 250:
+			continue;
+		case 240:
+			if ((self->nz & 255) == 0)
+				break;
+			self->pc++;
+			continue;
+		case 248:
+			self->vdi |= 8;
+			continue;
+		default:
+			continue;
+		}
+		switch (data) {
+		case 1:
+		case 5:
+		case 9:
+		case 13:
+		case 17:
+		case 21:
+		case 25:
+		case 29:
+			self->nz = self->a |= Cpu6502_Peek(self, addr);
+			break;
+		case 3:
+		case 7:
+		case 15:
+		case 19:
+		case 23:
+		case 27:
+		case 31:
+			self->nz = self->a |= Cpu6502_ArithmeticShiftLeft(self, addr);
+			break;
+		case 6:
+		case 14:
+		case 22:
+		case 30:
+			self->nz = Cpu6502_ArithmeticShiftLeft(self, addr);
+			break;
+		case 16:
+		case 48:
+		case 80:
+		case 112:
+		case 144:
+		case 176:
+		case 208:
+		case 240:
+			addr = (self->memory[self->pc] ^ 128) - 128;
+			self->pc++;
+			addr += self->pc;
+			self->cycle += (addr ^ self->pc) >> 8 != 0 ? 2 : 1;
+			self->pc = addr;
+			break;
+		case 33:
+		case 37:
+		case 41:
+		case 45:
+		case 49:
+		case 53:
+		case 57:
+		case 61:
+			self->nz = self->a &= Cpu6502_Peek(self, addr);
+			break;
+		case 35:
+		case 39:
+		case 47:
+		case 51:
+		case 55:
+		case 59:
+		case 63:
+			self->nz = self->a &= Cpu6502_RotateLeft(self, addr);
+			break;
+		case 36:
+		case 44:
+			self->nz = Cpu6502_Peek(self, addr);
+			self->vdi = (self->vdi & 12) + (self->nz & 64);
+			self->nz = ((self->nz & 128) << 1) + (self->nz & self->a);
+			break;
+		case 38:
+		case 46:
+		case 54:
+		case 62:
+			self->nz = Cpu6502_RotateLeft(self, addr);
+			break;
+		case 65:
+		case 69:
+		case 73:
+		case 77:
+		case 81:
+		case 85:
+		case 89:
+		case 93:
+			self->nz = self->a ^= Cpu6502_Peek(self, addr);
+			break;
+		case 67:
+		case 71:
+		case 79:
+		case 83:
+		case 87:
+		case 91:
+		case 95:
+			self->nz = self->a ^= Cpu6502_LogicalShiftRight(self, addr);
+			break;
+		case 70:
+		case 78:
+		case 86:
+		case 94:
+			self->nz = Cpu6502_LogicalShiftRight(self, addr);
+			break;
+		case 97:
+		case 101:
+		case 105:
+		case 109:
+		case 113:
+		case 117:
+		case 121:
+		case 125:
+			Cpu6502_AddWithCarry(self, Cpu6502_Peek(self, addr));
+			break;
+		case 99:
+		case 103:
+		case 111:
+		case 115:
+		case 119:
+		case 123:
+		case 127:
+			Cpu6502_AddWithCarry(self, Cpu6502_RotateRight(self, addr));
+			break;
+		case 102:
+		case 110:
+		case 118:
+		case 126:
+			self->nz = Cpu6502_RotateRight(self, addr);
+			break;
+		case 108:
+			self->pc = self->memory[addr];
+			if ((++addr & 255) == 0)
+				addr -= 255;
+			self->pc += self->memory[addr] << 8;
+			break;
+		case 129:
+		case 133:
+		case 141:
+		case 145:
+		case 149:
+		case 153:
+		case 157:
+			Cpu6502_Poke(self, addr, self->a);
+			break;
+		case 131:
+		case 135:
+		case 143:
+		case 151:
+			Cpu6502_Poke(self, addr, self->a & self->x);
+			break;
+		case 132:
+		case 140:
+		case 148:
+			Cpu6502_Poke(self, addr, self->y);
+			break;
+		case 134:
+		case 142:
+		case 150:
+			Cpu6502_Poke(self, addr, self->x);
+			break;
+		case 160:
+		case 164:
+		case 172:
+		case 180:
+		case 188:
+			self->nz = self->y = Cpu6502_Peek(self, addr);
+			break;
+		case 161:
+		case 165:
+		case 169:
+		case 173:
+		case 177:
+		case 181:
+		case 185:
+		case 189:
+			self->nz = self->a = Cpu6502_Peek(self, addr);
+			break;
+		case 162:
+		case 166:
+		case 174:
+		case 182:
+		case 190:
+			self->nz = self->x = Cpu6502_Peek(self, addr);
+			break;
+		case 163:
+		case 167:
+		case 175:
+		case 179:
+		case 183:
+		case 191:
+			self->nz = self->x = self->a = Cpu6502_Peek(self, addr);
+			break;
+		case 187:
+			self->nz = self->x = self->a = self->s &= Cpu6502_Peek(self, addr);
+			break;
+		case 192:
+		case 196:
+		case 204:
+			self->nz = Cpu6502_Peek(self, addr);
+			self->c = self->y >= self->nz ? 1 : 0;
+			self->nz = (self->y - self->nz) & 255;
+			break;
+		case 193:
+		case 197:
+		case 201:
+		case 205:
+		case 209:
+		case 213:
+		case 217:
+		case 221:
+			self->nz = Cpu6502_Peek(self, addr);
+			self->c = self->a >= self->nz ? 1 : 0;
+			self->nz = (self->a - self->nz) & 255;
+			break;
+		case 195:
+		case 199:
+		case 207:
+		case 211:
+		case 215:
+		case 219:
+		case 223:
+			data = Cpu6502_Decrement(self, addr);
+			self->c = self->a >= data ? 1 : 0;
+			self->nz = (self->a - data) & 255;
+			break;
+		case 198:
+		case 206:
+		case 214:
+		case 222:
+			self->nz = Cpu6502_Decrement(self, addr);
+			break;
+		case 224:
+		case 228:
+		case 236:
+			self->nz = Cpu6502_Peek(self, addr);
+			self->c = self->x >= self->nz ? 1 : 0;
+			self->nz = (self->x - self->nz) & 255;
+			break;
+		case 225:
+		case 229:
+		case 233:
+		case 235:
+		case 237:
+		case 241:
+		case 245:
+		case 249:
+		case 253:
+			Cpu6502_SubtractWithCarry(self, Cpu6502_Peek(self, addr));
+			break;
+		case 227:
+		case 231:
+		case 239:
+		case 243:
+		case 247:
+		case 251:
+		case 255:
+			Cpu6502_SubtractWithCarry(self, Cpu6502_Increment(self, addr));
+			break;
+		case 230:
+		case 238:
+		case 246:
+		case 254:
+			self->nz = Cpu6502_Increment(self, addr);
+			break;
+		}
+	}
+}
+
+static int FlashPackItem_WriteValueTo(const FlashPackItem *self, uint8_t *buffer, int index)
+{
+	switch (self->type) {
+	case FlashPackItemType_LITERAL:
+		buffer[index] = (uint8_t) self->value;
+		return 1;
+	case FlashPackItemType_COPY_TWO_BYTES:
+		buffer[index] = (uint8_t) ((128 - self->value) << 1);
+		return 1;
+	case FlashPackItemType_COPY_THREE_BYTES:
+		buffer[index] = (uint8_t) (((128 - self->value) << 1) + 1);
+		return 1;
+	case FlashPackItemType_COPY_MANY_BYTES:
+		buffer[index] = 1;
+		buffer[index + 1] = (uint8_t) self->value;
+		return 2;
+	case FlashPackItemType_SET_ADDRESS:
+		;
+		int value = self->value - 128;
+		buffer[index] = 0;
+		buffer[index + 1] = (uint8_t) (value & 255);
+		buffer[index + 2] = (uint8_t) (value >> 8);
+		return 3;
+	default:
+		buffer[index] = 1;
+		buffer[index + 1] = 0;
+		return 2;
+	}
+}
+
+static int FlashPack_FindHole(const FlashPack *self)
+{
+	int end = 48159;
+	for (;;) {
+		while (self->memory[end] >= 0)
+			if (--end < 9216)
+				return -1;
+		int start = end;
+		while (self->memory[--start] < 0)
+			if (end - start >= 1023)
+				return end;
+		end = start;
+	}
+}
+
+static int FlashPack_GetInnerFlags(const FlashPack *self, int index)
+{
+	int flags = 1;
+	do {
+		flags <<= 1;
+		if (index < self->itemsCount && self->items[index++].type != FlashPackItemType_LITERAL)
+			flags++;
+	}
+	while (flags < 256);
+	return flags & 255;
+}
+
+static void FlashPack_PutItems(FlashPack *self)
+{
+	int outerFlags = 0;
+	for (int i = 0; i < self->itemsCount; i += 8) {
+		if (FlashPack_GetInnerFlags(self, i) != 0)
+			outerFlags |= 128 >> (i >> 3);
+	}
+	self->compressed[self->compressedLength++] = (uint8_t) outerFlags;
+	for (int i = 0; i < self->itemsCount; i++) {
+		if ((i & 7) == 0) {
+			int flags = FlashPack_GetInnerFlags(self, i);
+			if (flags != 0)
+				self->compressed[self->compressedLength++] = (uint8_t) flags;
+		}
+		self->compressedLength += FlashPackItem_WriteValueTo(&self->items[i], self->compressed, self->compressedLength);
+	}
+}
+
+static void FlashPack_PutItem(FlashPack *self, FlashPackItemType type, int value)
+{
+	if (self->itemsCount >= 64) {
+		FlashPack_PutItems(self);
+		self->itemsCount = 0;
+	}
+	self->items[self->itemsCount].type = type;
+	self->items[self->itemsCount].value = value;
+	self->itemsCount++;
+}
+
+static bool FlashPack_IsLiteralPreferred(const FlashPack *self)
+{
+	return (self->itemsCount & 7) == 7 && FlashPack_GetInnerFlags(self, self->itemsCount - 7) == 0;
+}
+
+static void FlashPack_CompressMemoryArea(FlashPack *self, int startAddress, int endAddress)
+{
+	int lastDistance = -1;
+	for (int address = startAddress; address <= endAddress;) {
+		while (self->memory[address] < 0)
+			if (++address > endAddress)
+				return;
+		FlashPack_PutItem(self, FlashPackItemType_SET_ADDRESS, address);
+		while (address <= endAddress && self->memory[address] >= 0) {
+			int bestMatch = 0;
+			int bestDistance = -1;
+			for (int backAddress = address - 1; backAddress >= startAddress && address - backAddress < 128; backAddress--) {
+				int match;
+				for (match = 0; address + match <= endAddress; match++) {
+					int data = self->memory[address + match];
+					if (data < 0 || data != self->memory[backAddress + match])
+						break;
+				}
+				if (bestMatch < match) {
+					bestMatch = match;
+					bestDistance = address - backAddress;
+				}
+				else if (bestMatch == match && address - backAddress == lastDistance)
+					bestDistance = lastDistance;
+			}
+			switch (bestMatch) {
+			case 0:
+			case 1:
+				FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address++]);
+				continue;
+			case 2:
+				FlashPack_PutItem(self, FlashPackItemType_COPY_TWO_BYTES, bestDistance);
+				break;
+			case 3:
+				FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+				break;
+			case 4:
+				if (bestDistance == lastDistance)
+					FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 4);
+				else if (FlashPack_IsLiteralPreferred(self)) {
+					FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address]);
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+				}
+				else {
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+					FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address + 3]);
+				}
+				break;
+			case 5:
+				if (bestDistance == lastDistance)
+					FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 5);
+				else {
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+					FlashPack_PutItem(self, FlashPackItemType_COPY_TWO_BYTES, bestDistance);
+				}
+				break;
+			case 6:
+				if (bestDistance == lastDistance)
+					FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 6);
+				else {
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+				}
+				break;
+			default:
+				;
+				int length = bestMatch;
+				if (bestDistance != lastDistance) {
+					if (FlashPack_IsLiteralPreferred(self) && length % 255 == 4) {
+						FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address]);
+						length--;
+					}
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+					length -= 3;
+				}
+				else if (FlashPack_IsLiteralPreferred(self) && length % 255 == 1) {
+					FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address]);
+					length--;
+				}
+				for (; length > 255; length -= 255)
+					FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, 255);
+				switch (length) {
+				case 0:
+					break;
+				case 1:
+					FlashPack_PutItem(self, FlashPackItemType_LITERAL, self->memory[address + bestMatch - 1]);
+					break;
+				case 2:
+					FlashPack_PutItem(self, FlashPackItemType_COPY_TWO_BYTES, bestDistance);
+					break;
+				case 3:
+					FlashPack_PutItem(self, FlashPackItemType_COPY_THREE_BYTES, bestDistance);
+					break;
+				default:
+					FlashPack_PutItem(self, FlashPackItemType_COPY_MANY_BYTES, length);
+					break;
+				}
+				break;
+			}
+			address += bestMatch;
+			lastDistance = bestDistance;
+		}
+	}
+}
+
+static void FlashPack_PutPoke(FlashPack *self, int address, int value)
+{
+	FlashPack_PutItem(self, FlashPackItemType_SET_ADDRESS, address);
+	FlashPack_PutItem(self, FlashPackItemType_LITERAL, value);
+}
+
+static bool FlashPack_Compress(FlashPack *self, ASAPWriter *w)
+{
+	for (int i = 0; i < 65536; i++)
+		self->memory[i] = -1;
+	for (int i = 0; i + 5 <= w->outputOffset;) {
+		int startAddress = w->output[i] + (w->output[i + 1] << 8);
+		if (startAddress == 65535) {
+			i += 2;
+			startAddress = w->output[i] + (w->output[i + 1] << 8);
+		}
+		int endAddress = w->output[i + 2] + (w->output[i + 3] << 8);
+		if (startAddress > endAddress)
+			return false;
+		i += 4;
+		if (i + endAddress - startAddress >= w->outputOffset)
+			return false;
+		while (startAddress <= endAddress)
+			self->memory[startAddress++] = w->output[i++];
+	}
+	if (self->memory[736] < 0 || self->memory[737] < 0)
+		return false;
+	if (self->memory[252] >= 0 || self->memory[253] >= 0 || self->memory[254] >= 0 || self->memory[255] >= 0)
+		return false;
+	int runAddress = self->memory[736] + (self->memory[737] << 8);
+	self->memory[736] = self->memory[737] = -1;
+	int depackerEndAddress = FlashPack_FindHole(self);
+	if (depackerEndAddress == -1)
+		return false;
+	self->compressedLength = 0;
+	self->itemsCount = 0;
+	FlashPack_PutPoke(self, 54286, 0);
+	FlashPack_PutPoke(self, 53774, 0);
+	FlashPack_PutPoke(self, 54272, 0);
+	FlashPack_PutPoke(self, 54017, 254);
+	FlashPack_PutPoke(self, 580, 255);
+	FlashPack_CompressMemoryArea(self, depackerEndAddress, 65535);
+	FlashPack_CompressMemoryArea(self, 0, depackerEndAddress);
+	FlashPack_PutItem(self, FlashPackItemType_END_OF_STREAM, 0);
+	FlashPack_PutItems(self);
+	int depackerStartAddress = depackerEndAddress - 87;
+	int compressedStartAddress = depackerStartAddress - self->compressedLength;
+	if (compressedStartAddress < 8192)
+		return false;
+	w->outputOffset = 0;
+	if (!ASAPWriter_WriteWord(w, 65535))
+		return false;
+	if (!ASAPWriter_WriteWord(w, 54017))
+		return false;
+	if (!ASAPWriter_WriteWord(w, 54017))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 255))
+		return false;
+	if (!ASAPWriter_WriteWord(w, compressedStartAddress))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerEndAddress))
+		return false;
+	if (!ASAPWriter_WriteBytes(w, self->compressed, 0, self->compressedLength))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 173))
+		return false;
+	if (!ASAPWriter_WriteWord(w, compressedStartAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 238))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress + 1))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 208))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 3))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 238))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress + 2))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 96))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 76))
+		return false;
+	if (!ASAPWriter_WriteWord(w, runAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 133))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 254))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 138))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 42))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 170))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 240))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 246))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 177))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 254))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 153))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 128))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 128))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 200))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 208))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 9))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 152))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 56))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 101))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 255))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 133))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 255))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 141))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress + 26))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 202))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 208))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 236))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 6))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 253))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 208))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 21))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 6))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 252))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 208))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 7))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 56))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 32))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 42))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 133))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 252))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 169))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 1))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 144))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 4))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 32))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 42))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 133))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 253))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 32))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 162))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 1))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 144))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 206))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 74))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 208))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 194))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 32))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 176))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 193))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 168))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 32))
+		return false;
+	if (!ASAPWriter_WriteWord(w, depackerStartAddress))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 144))
+		return false;
+	if (!ASAPWriter_WriteByte(w, 202))
+		return false;
+	if (!ASAPWriter_WriteWord(w, 736))
+		return false;
+	if (!ASAPWriter_WriteWord(w, 737))
+		return false;
+	return ASAPWriter_WriteWord(w, depackerStartAddress + 50);
+}
+
+static void PokeyChannel_Initialize(PokeyChannel *self)
+{
+	self->audf = 0;
+	self->audc = 0;
+	self->periodCycles = 28;
+	self->tickCycle = 8388608;
+	self->timerCycle = 8388608;
+	self->mute = 1;
+	self->out = 0;
+	self->delta = 0;
+}
+
+static void PokeyChannel_Slope(PokeyChannel *self, Pokey *pokey, const PokeyPair *pokeys, int cycle)
+{
+	self->delta = -self->delta;
+	Pokey_AddDelta(pokey, pokeys, cycle, self->delta);
+}
+
+static void PokeyChannel_DoTick(PokeyChannel *self, Pokey *pokey, const PokeyPair *pokeys, int cycle, int ch)
+{
+	self->tickCycle += self->periodCycles;
+	int audc = self->audc;
+	if ((audc & 176) == 160)
+		self->out ^= 1;
+	else if ((audc & 16) != 0 || pokey->init)
+		return;
+	else {
+		int poly = cycle + pokey->polyIndex - ch;
+		if (audc < 128 && (1706902752 & 1 << poly % 31) == 0)
+			return;
+		if ((audc & 32) != 0)
+			self->out ^= 1;
+		else {
+			int newOut;
+			if ((audc & 64) != 0)
+				newOut = 21360 >> poly % 15;
+			else if (pokey->audctl < 128) {
+				poly %= 131071;
+				newOut = pokeys->poly17Lookup[poly >> 3] >> (poly & 7);
+			}
+			else
+				newOut = pokeys->poly9Lookup[poly % 511];
+			newOut &= 1;
+			if (self->out == newOut)
+				return;
+			self->out = newOut;
+		}
+	}
+	PokeyChannel_Slope(self, pokey, pokeys, cycle);
+}
+
+static void PokeyChannel_DoStimer(PokeyChannel *self, int cycle)
+{
+	if (self->tickCycle != 8388608)
+		self->tickCycle = cycle + self->periodCycles;
+}
+
+static void PokeyChannel_SetMute(PokeyChannel *self, bool enable, int mask, int cycle)
+{
+	if (enable) {
+		self->mute |= mask;
+		self->tickCycle = 8388608;
+	}
+	else {
+		self->mute &= ~mask;
+		if (self->mute == 0 && self->tickCycle == 8388608)
+			self->tickCycle = cycle;
+	}
+}
+
+static void PokeyChannel_MuteUltrasound(PokeyChannel *self, int cycle)
+{
+	PokeyChannel_SetMute(self, self->periodCycles <= 112 && (self->audc & 176) == 160, 1, cycle);
+}
+
+static void PokeyChannel_SetAudc(PokeyChannel *self, Pokey *pokey, const PokeyPair *pokeys, int data, int cycle)
+{
+	if (self->audc == data)
+		return;
+	Pokey_GenerateUntilCycle(pokey, pokeys, cycle);
+	self->audc = data;
+	if ((data & 16) != 0) {
+		data = (data & 15) << 20;
+		if ((self->mute & 4) == 0)
+			Pokey_AddDelta(pokey, pokeys, cycle, self->delta > 0 ? data - self->delta : data);
+		self->delta = data;
+	}
+	else {
+		data = (data & 15) << 20;
+		PokeyChannel_MuteUltrasound(self, cycle);
+		if (self->delta > 0) {
+			if ((self->mute & 4) == 0)
+				Pokey_AddDelta(pokey, pokeys, cycle, data - self->delta);
+			self->delta = data;
+		}
+		else
+			self->delta = -data;
+	}
+}
+
+static void PokeyChannel_EndFrame(PokeyChannel *self, int cycle)
+{
+	if (self->timerCycle != 8388608)
+		self->timerCycle -= cycle;
+}
+
+static void Pokey_StartFrame(Pokey *self)
+{
+	memset(self->deltaBuffer, 0, sizeof(self->deltaBuffer));
+}
+
+static void Pokey_Initialize(Pokey *self)
+{
+	for (int i = 0; i < 4; i++)
+		PokeyChannel_Initialize(&self->channels[i]);
+	self->audctl = 0;
+	self->skctl = 3;
+	self->irqst = 255;
+	self->init = false;
+	self->divCycles = 28;
+	self->reloadCycles1 = 28;
+	self->reloadCycles3 = 28;
+	self->polyIndex = 60948015;
+	self->iirAcc = 0;
+	Pokey_StartFrame(self);
+}
+
+static void Pokey_AddDelta(Pokey *self, const PokeyPair *pokeys, int cycle, int delta)
+{
+	int i = cycle * pokeys->sampleFactor + pokeys->sampleOffset;
+	int delta2 = (delta >> 16) * (i >> 4 & 65535);
+	i >>= 20;
+	self->deltaBuffer[i] += delta - delta2;
+	self->deltaBuffer[i + 1] += delta2;
+}
+
+static void Pokey_GenerateUntilCycle(Pokey *self, const PokeyPair *pokeys, int cycleLimit)
+{
+	for (;;) {
+		int cycle = cycleLimit;
+		for (int i = 0; i < 4; i++) {
+			int tickCycle = self->channels[i].tickCycle;
+			if (cycle > tickCycle)
+				cycle = tickCycle;
+		}
+		if (cycle == cycleLimit)
+			break;
+		if (cycle == self->channels[2].tickCycle) {
+			if ((self->audctl & 4) != 0 && self->channels[0].delta > 0 && self->channels[0].mute == 0)
+				PokeyChannel_Slope(&self->channels[0], self, pokeys, cycle);
+			PokeyChannel_DoTick(&self->channels[2], self, pokeys, cycle, 2);
+		}
+		if (cycle == self->channels[3].tickCycle) {
+			if ((self->audctl & 8) != 0)
+				self->channels[2].tickCycle = cycle + self->reloadCycles3;
+			if ((self->audctl & 2) != 0 && self->channels[1].delta > 0 && self->channels[1].mute == 0)
+				PokeyChannel_Slope(&self->channels[1], self, pokeys, cycle);
+			PokeyChannel_DoTick(&self->channels[3], self, pokeys, cycle, 3);
+		}
+		if (cycle == self->channels[0].tickCycle) {
+			if ((self->skctl & 136) == 8)
+				self->channels[1].tickCycle = cycle + self->channels[1].periodCycles;
+			PokeyChannel_DoTick(&self->channels[0], self, pokeys, cycle, 0);
+		}
+		if (cycle == self->channels[1].tickCycle) {
+			if ((self->audctl & 16) != 0)
+				self->channels[0].tickCycle = cycle + self->reloadCycles1;
+			else if ((self->skctl & 8) != 0)
+				self->channels[0].tickCycle = cycle + self->channels[0].periodCycles;
+			PokeyChannel_DoTick(&self->channels[1], self, pokeys, cycle, 1);
+		}
+	}
+}
+
+static void Pokey_EndFrame(Pokey *self, const PokeyPair *pokeys, int cycle)
+{
+	Pokey_GenerateUntilCycle(self, pokeys, cycle);
+	self->polyIndex += cycle;
+	int m = (self->audctl & 128) != 0 ? 237615 : 60948015;
+	if (self->polyIndex >= 2 * m)
+		self->polyIndex -= m;
+	for (int i = 0; i < 4; i++) {
+		int tickCycle = self->channels[i].tickCycle;
+		if (tickCycle != 8388608)
+			self->channels[i].tickCycle = tickCycle - cycle;
+	}
+}
+
+static bool Pokey_IsSilent(const Pokey *self)
+{
+	for (int i = 0; i < 4; i++)
+		if ((self->channels[i].audc & 15) != 0)
+			return false;
+	return true;
+}
+
+static void Pokey_Mute(Pokey *self, int mask)
+{
+	for (int i = 0; i < 4; i++)
+		PokeyChannel_SetMute(&self->channels[i], (mask & 1 << i) != 0, 4, 0);
+}
+
+static void Pokey_InitMute(Pokey *self, int cycle)
+{
+	bool init = self->init;
+	int audctl = self->audctl;
+	PokeyChannel_SetMute(&self->channels[0], init && (audctl & 64) == 0, 2, cycle);
+	PokeyChannel_SetMute(&self->channels[1], init && (audctl & 80) != 80, 2, cycle);
+	PokeyChannel_SetMute(&self->channels[2], init && (audctl & 32) == 0, 2, cycle);
+	PokeyChannel_SetMute(&self->channels[3], init && (audctl & 40) != 40, 2, cycle);
+}
+
+static int Pokey_Poke(Pokey *self, const PokeyPair *pokeys, int addr, int data, int cycle)
+{
+	int nextEventCycle = 8388608;
+	switch (addr & 15) {
+	case 0:
+		if (data == self->channels[0].audf)
+			break;
+		Pokey_GenerateUntilCycle(self, pokeys, cycle);
+		self->channels[0].audf = data;
+		switch (self->audctl & 80) {
+		case 0:
+			self->channels[0].periodCycles = self->divCycles * (data + 1);
+			break;
+		case 16:
+			self->channels[1].periodCycles = self->divCycles * (data + (self->channels[1].audf << 8) + 1);
+			self->reloadCycles1 = self->divCycles * (data + 1);
+			PokeyChannel_MuteUltrasound(&self->channels[1], cycle);
+			break;
+		case 64:
+			self->channels[0].periodCycles = data + 4;
+			break;
+		case 80:
+			self->channels[1].periodCycles = data + (self->channels[1].audf << 8) + 7;
+			self->reloadCycles1 = data + 4;
+			PokeyChannel_MuteUltrasound(&self->channels[1], cycle);
+			break;
+		}
+		PokeyChannel_MuteUltrasound(&self->channels[0], cycle);
+		break;
+	case 1:
+		PokeyChannel_SetAudc(&self->channels[0], self, pokeys, data, cycle);
+		break;
+	case 2:
+		if (data == self->channels[1].audf)
+			break;
+		Pokey_GenerateUntilCycle(self, pokeys, cycle);
+		self->channels[1].audf = data;
+		switch (self->audctl & 80) {
+		case 0:
+		case 64:
+			self->channels[1].periodCycles = self->divCycles * (data + 1);
+			break;
+		case 16:
+			self->channels[1].periodCycles = self->divCycles * (self->channels[0].audf + (data << 8) + 1);
+			break;
+		case 80:
+			self->channels[1].periodCycles = self->channels[0].audf + (data << 8) + 7;
+			break;
+		}
+		PokeyChannel_MuteUltrasound(&self->channels[1], cycle);
+		break;
+	case 3:
+		PokeyChannel_SetAudc(&self->channels[1], self, pokeys, data, cycle);
+		break;
+	case 4:
+		if (data == self->channels[2].audf)
+			break;
+		Pokey_GenerateUntilCycle(self, pokeys, cycle);
+		self->channels[2].audf = data;
+		switch (self->audctl & 40) {
+		case 0:
+			self->channels[2].periodCycles = self->divCycles * (data + 1);
+			break;
+		case 8:
+			self->channels[3].periodCycles = self->divCycles * (data + (self->channels[3].audf << 8) + 1);
+			self->reloadCycles3 = self->divCycles * (data + 1);
+			PokeyChannel_MuteUltrasound(&self->channels[3], cycle);
+			break;
+		case 32:
+			self->channels[2].periodCycles = data + 4;
+			break;
+		case 40:
+			self->channels[3].periodCycles = data + (self->channels[3].audf << 8) + 7;
+			self->reloadCycles3 = data + 4;
+			PokeyChannel_MuteUltrasound(&self->channels[3], cycle);
+			break;
+		}
+		PokeyChannel_MuteUltrasound(&self->channels[2], cycle);
+		break;
+	case 5:
+		PokeyChannel_SetAudc(&self->channels[2], self, pokeys, data, cycle);
+		break;
+	case 6:
+		if (data == self->channels[3].audf)
+			break;
+		Pokey_GenerateUntilCycle(self, pokeys, cycle);
+		self->channels[3].audf = data;
+		switch (self->audctl & 40) {
+		case 0:
+		case 32:
+			self->channels[3].periodCycles = self->divCycles * (data + 1);
+			break;
+		case 8:
+			self->channels[3].periodCycles = self->divCycles * (self->channels[2].audf + (data << 8) + 1);
+			break;
+		case 40:
+			self->channels[3].periodCycles = self->channels[2].audf + (data << 8) + 7;
+			break;
+		}
+		PokeyChannel_MuteUltrasound(&self->channels[3], cycle);
+		break;
+	case 7:
+		PokeyChannel_SetAudc(&self->channels[3], self, pokeys, data, cycle);
+		break;
+	case 8:
+		if (data == self->audctl)
+			break;
+		Pokey_GenerateUntilCycle(self, pokeys, cycle);
+		self->audctl = data;
+		self->divCycles = (data & 1) != 0 ? 114 : 28;
+		switch (data & 80) {
+		case 0:
+			self->channels[0].periodCycles = self->divCycles * (self->channels[0].audf + 1);
+			self->channels[1].periodCycles = self->divCycles * (self->channels[1].audf + 1);
+			break;
+		case 16:
+			self->channels[0].periodCycles = self->divCycles << 8;
+			self->channels[1].periodCycles = self->divCycles * (self->channels[0].audf + (self->channels[1].audf << 8) + 1);
+			self->reloadCycles1 = self->divCycles * (self->channels[0].audf + 1);
+			break;
+		case 64:
+			self->channels[0].periodCycles = self->channels[0].audf + 4;
+			self->channels[1].periodCycles = self->divCycles * (self->channels[1].audf + 1);
+			break;
+		case 80:
+			self->channels[0].periodCycles = 256;
+			self->channels[1].periodCycles = self->channels[0].audf + (self->channels[1].audf << 8) + 7;
+			self->reloadCycles1 = self->channels[0].audf + 4;
+			break;
+		}
+		PokeyChannel_MuteUltrasound(&self->channels[0], cycle);
+		PokeyChannel_MuteUltrasound(&self->channels[1], cycle);
+		switch (data & 40) {
+		case 0:
+			self->channels[2].periodCycles = self->divCycles * (self->channels[2].audf + 1);
+			self->channels[3].periodCycles = self->divCycles * (self->channels[3].audf + 1);
+			break;
+		case 8:
+			self->channels[2].periodCycles = self->divCycles << 8;
+			self->channels[3].periodCycles = self->divCycles * (self->channels[2].audf + (self->channels[3].audf << 8) + 1);
+			self->reloadCycles3 = self->divCycles * (self->channels[2].audf + 1);
+			break;
+		case 32:
+			self->channels[2].periodCycles = self->channels[2].audf + 4;
+			self->channels[3].periodCycles = self->divCycles * (self->channels[3].audf + 1);
+			break;
+		case 40:
+			self->channels[2].periodCycles = 256;
+			self->channels[3].periodCycles = self->channels[2].audf + (self->channels[3].audf << 8) + 7;
+			self->reloadCycles3 = self->channels[2].audf + 4;
+			break;
+		}
+		PokeyChannel_MuteUltrasound(&self->channels[2], cycle);
+		PokeyChannel_MuteUltrasound(&self->channels[3], cycle);
+		Pokey_InitMute(self, cycle);
+		break;
+	case 9:
+		for (int i = 0; i < 4; i++)
+			PokeyChannel_DoStimer(&self->channels[i], cycle);
+		break;
+	case 14:
+		self->irqst |= data ^ 255;
+		for (int i = 3;; i >>= 1) {
+			if ((data & self->irqst & (i + 1)) != 0) {
+				if (self->channels[i].timerCycle == 8388608) {
+					int t = self->channels[i].tickCycle;
+					while (t < cycle)
+						t += self->channels[i].periodCycles;
+					self->channels[i].timerCycle = t;
+					if (nextEventCycle > t)
+						nextEventCycle = t;
+				}
+			}
+			else
+				self->channels[i].timerCycle = 8388608;
+			if (i == 0)
+				break;
+		}
+		break;
+	case 15:
+		if (data == self->skctl)
+			break;
+		Pokey_GenerateUntilCycle(self, pokeys, cycle);
+		self->skctl = data;
+		bool init = (data & 3) == 0;
+		if (self->init && !init)
+			self->polyIndex = ((self->audctl & 128) != 0 ? 237614 : 60948014) - cycle;
+		self->init = init;
+		Pokey_InitMute(self, cycle);
+		PokeyChannel_SetMute(&self->channels[2], (data & 16) != 0, 8, cycle);
+		PokeyChannel_SetMute(&self->channels[3], (data & 16) != 0, 8, cycle);
+		break;
+	default:
+		break;
+	}
+	return nextEventCycle;
+}
+
+static int Pokey_CheckIrq(Pokey *self, int cycle, int nextEventCycle)
+{
+	for (int i = 3;; i >>= 1) {
+		int timerCycle = self->channels[i].timerCycle;
+		if (cycle >= timerCycle) {
+			self->irqst &= ~(i + 1);
+			self->channels[i].timerCycle = 8388608;
+		}
+		else if (nextEventCycle > timerCycle)
+			nextEventCycle = timerCycle;
+		if (i == 0)
+			break;
+	}
+	return nextEventCycle;
+}
+
+static int Pokey_StoreSample(Pokey *self, uint8_t *buffer, int bufferOffset, int i, ASAPSampleFormat format)
+{
+	self->iirAcc += self->deltaBuffer[i] - (self->iirAcc * 3 >> 10);
+	int sample = self->iirAcc >> 11;
+	if (sample < -32767)
+		sample = -32767;
+	else if (sample > 32767)
+		sample = 32767;
+	switch (format) {
+	case ASAPSampleFormat_U8:
+		buffer[bufferOffset++] = (uint8_t) ((sample >> 8) + 128);
+		break;
+	case ASAPSampleFormat_S16_L_E:
+		buffer[bufferOffset++] = (uint8_t) (sample & 255);
+		buffer[bufferOffset++] = (uint8_t) (sample >> 8 & 255);
+		break;
+	case ASAPSampleFormat_S16_B_E:
+		buffer[bufferOffset++] = (uint8_t) (sample >> 8 & 255);
+		buffer[bufferOffset++] = (uint8_t) (sample & 255);
+		break;
+	}
+	return bufferOffset;
+}
+
+static void Pokey_AccumulateTrailing(Pokey *self, int i)
+{
+	self->iirAcc += self->deltaBuffer[i] + self->deltaBuffer[i + 1];
+}
+
+static void PokeyPair_Construct(PokeyPair *self)
+{
+	int reg = 511;
+	for (int i = 0; i < 511; i++) {
+		reg = (((reg >> 5 ^ reg) & 1) << 8) + (reg >> 1);
+		self->poly9Lookup[i] = (uint8_t) (reg & 255);
+	}
+	reg = 131071;
+	for (int i = 0; i < 16385; i++) {
+		reg = (((reg >> 5 ^ reg) & 255) << 9) + (reg >> 8);
+		self->poly17Lookup[i] = (uint8_t) (reg >> 1 & 255);
+	}
+}
+
+static void PokeyPair_Initialize(PokeyPair *self, bool ntsc, bool stereo)
+{
+	self->extraPokeyMask = stereo ? 16 : 0;
+	Pokey_Initialize(&self->basePokey);
+	Pokey_Initialize(&self->extraPokey);
+	self->sampleFactor = ntsc ? 25837 : 26075;
+	self->sampleOffset = 0;
+	self->readySamplesStart = 0;
+	self->readySamplesEnd = 0;
+}
+
+static int PokeyPair_Poke(PokeyPair *self, int addr, int data, int cycle)
+{
+	Pokey *pokey = (addr & self->extraPokeyMask) != 0 ? &self->extraPokey : &self->basePokey;
+	return Pokey_Poke(pokey, self, addr, data, cycle);
+}
+
+static int PokeyPair_Peek(const PokeyPair *self, int addr, int cycle)
+{
+	const Pokey *pokey = (addr & self->extraPokeyMask) != 0 ? &self->extraPokey : &self->basePokey;
+	switch (addr & 15) {
+	case 10:
+		if (pokey->init)
+			return 255;
+		int i = cycle + pokey->polyIndex;
+		if ((pokey->audctl & 128) != 0)
+			return self->poly9Lookup[i % 511];
+		i %= 131071;
+		int j = i >> 3;
+		i &= 7;
+		return ((self->poly17Lookup[j] >> i) + (self->poly17Lookup[j + 1] << (8 - i))) & 255;
+	case 14:
+		return pokey->irqst;
+	default:
+		return 255;
+	}
+}
+
+static void PokeyPair_StartFrame(PokeyPair *self)
+{
+	Pokey_StartFrame(&self->basePokey);
+	if (self->extraPokeyMask != 0)
+		Pokey_StartFrame(&self->extraPokey);
+}
+
+static int PokeyPair_EndFrame(PokeyPair *self, int cycle)
+{
+	Pokey_EndFrame(&self->basePokey, self, cycle);
+	if (self->extraPokeyMask != 0)
+		Pokey_EndFrame(&self->extraPokey, self, cycle);
+	self->sampleOffset += cycle * self->sampleFactor;
+	self->readySamplesStart = 0;
+	self->readySamplesEnd = self->sampleOffset >> 20;
+	self->sampleOffset &= 1048575;
+	return self->readySamplesEnd;
+}
+
+static int PokeyPair_Generate(PokeyPair *self, uint8_t *buffer, int bufferOffset, int blocks, ASAPSampleFormat format)
+{
+	int i = self->readySamplesStart;
+	int samplesEnd = self->readySamplesEnd;
+	if (blocks < samplesEnd - i)
+		samplesEnd = i + blocks;
+	else
+		blocks = samplesEnd - i;
+	for (; i < samplesEnd; i++) {
+		bufferOffset = Pokey_StoreSample(&self->basePokey, buffer, bufferOffset, i, format);
+		if (self->extraPokeyMask != 0)
+			bufferOffset = Pokey_StoreSample(&self->extraPokey, buffer, bufferOffset, i, format);
+	}
+	if (i == self->readySamplesEnd) {
+		Pokey_AccumulateTrailing(&self->basePokey, i);
+		Pokey_AccumulateTrailing(&self->extraPokey, i);
+	}
+	self->readySamplesStart = i;
+	return blocks;
+}
+
+static bool PokeyPair_IsSilent(const PokeyPair *self)
+{
+	return Pokey_IsSilent(&self->basePokey) && Pokey_IsSilent(&self->extraPokey);
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,624 @@
+// asap.ci - emulation engine
+//
+// Copyright (C) 2010-2019  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+enum NmiStatus
+{
+	Reset,
+	OnVBlank,
+	WasVBlank
+}
+
+/// Atari 8-bit chip music emulator.
+/// This class performs no I/O operations - all music data must be passed in byte arrays.
+public class ASAP
+{
+	/// Output sample rate.
+	public const int SampleRate = Pokey.SampleRate;
+
+	internal int NextEventCycle;
+
+	Cpu6502() Cpu;
+
+	// ANTIC:
+	int NextScanlineCycle;
+	NmiStatus Nmist;
+
+	// GTIA:
+	int Consol;
+
+	// COVOX:
+	byte[4] Covox;
+
+	// POKEYs:
+	PokeyPair() Pokeys;
+
+	ASAPInfo() ModuleInfo;
+	int NextPlayerCycle;
+	int TmcPerFrameCounter;
+	int CurrentSong;
+	int CurrentDuration;
+	int BlocksPlayed;
+	int SilenceCycles;
+	int SilenceCyclesCounter;
+	bool GtiaOrCovoxPlayedThisFrame;
+
+	public ASAP()
+	{
+		SilenceCycles = 0;
+		Cpu.Asap = this;
+	}
+
+	/// Enables silence detection.
+	/// Causes playback to stop after the specified period of silence.
+	public void DetectSilence!(
+		/// Length of silence which ends playback. Zero disables silence detection.
+		int seconds)
+	{
+		// for simplicity ignore PAL/NTSC difference - this doesn't need to be precise
+		SilenceCyclesCounter = SilenceCycles = seconds * 1773447;
+	}
+
+	internal int PeekHardware(int addr)
+	{
+		switch (addr & 0xff1f) {
+		case 0xd014:
+			return ModuleInfo.IsNtsc() ? 0xf : 1;
+		case 0xd01f:
+			return ~Consol & 0xf;
+		case 0xd20a:
+		case 0xd21a:
+		case 0xd20e:
+		case 0xd21e:
+			return Pokeys.Peek(addr, Cpu.Cycle);
+		case 0xd20c:
+		case 0xd21c:
+		case 0xd20f: // just because some SAP files rely on this
+		case 0xd21f:
+			return 0xff;
+		case 0xd40b:
+		case 0xd41b:
+			int cycle = Cpu.Cycle;
+			if (cycle > (ModuleInfo.IsNtsc() ? 262 * 114 : 312 * 114))
+				return 0;
+			return cycle / 228;
+		case 0xd40f:
+		case 0xd41f:
+			switch (Nmist) {
+			case NmiStatus.Reset:
+				return 0x1f;
+			case NmiStatus.WasVBlank:
+				return 0x5f;
+			default: // case NmiStatus.OnVBlank:
+				return Cpu.Cycle < 28291 ? 0x1f : 0x5f;
+			}
+		default:
+			return Cpu.Memory[addr];
+		}
+	}
+
+	internal void PokeHardware!(int addr, int data)
+	{
+		if (addr >> 8 == 0xd2) {
+			int t = Pokeys.Poke(addr, data, Cpu.Cycle);
+			if (NextEventCycle > t)
+				NextEventCycle = t;
+		}
+		else if ((addr & 0xff0f) == 0xd40a) {
+			int x = Cpu.Cycle % 114;
+			Cpu.Cycle += (x <= 106 ? 106 : 106 + 114) - x;
+		}
+		else if ((addr & 0xff0f) == 0xd40f) {
+			Nmist = Cpu.Cycle < 28292 ? NmiStatus.OnVBlank : NmiStatus.Reset;
+		}
+		else if ((addr & 0xff00) == ModuleInfo.GetCovoxAddress()) {
+			Pokey! pokey;
+			addr &= 3;
+			if (addr == 0 || addr == 3)
+				pokey = Pokeys.BasePokey;
+			else
+				pokey = Pokeys.ExtraPokey;
+			int delta = data - Covox[addr];
+			if (delta != 0) {
+				const int DeltaShiftCOVOX = 17;
+				pokey.AddDelta(Pokeys, Cpu.Cycle, delta << DeltaShiftCOVOX);
+				Covox[addr] = data;
+				GtiaOrCovoxPlayedThisFrame = true;
+			}
+		}
+		else if ((addr & 0xff1f) == 0xd01f) {
+			const int DeltaShiftGTIA = 20;
+			// NOT data - Consol; reverse to the POKEY sound
+			int delta = ((Consol & 8) - (data & 8)) << DeltaShiftGTIA;
+			if (delta != 0) {
+				int cycle = Cpu.Cycle;
+				Pokeys.BasePokey.AddDelta(Pokeys, cycle, delta);
+				Pokeys.ExtraPokey.AddDelta(Pokeys, cycle, delta);
+				GtiaOrCovoxPlayedThisFrame = true;
+			}
+			Consol = data;
+		}
+		else
+			Cpu.Memory[addr] = data;
+	}
+
+	void Call6502!(int addr)
+	{
+		const int codeAddr = 0xd200;
+		Cpu.Memory[codeAddr] = 0x20; // JSR
+		Cpu.Memory[codeAddr + 1] = addr & 0xff;
+		Cpu.Memory[codeAddr + 2] = addr >> 8;
+		Cpu.Memory[codeAddr + 3] = 0xd2; // escape
+		Cpu.Pc = codeAddr;
+	}
+
+	void Call6502Player!()
+	{
+		int player = ModuleInfo.Player;
+		switch (ModuleInfo.Type) {
+		case ASAPModuleType.SapB:
+			Call6502(player);
+			break;
+		case ASAPModuleType.SapC:
+#if !ASAP_ONLY_SAP
+		case ASAPModuleType.Cmc:
+		case ASAPModuleType.Cm3:
+		case ASAPModuleType.Cmr:
+		case ASAPModuleType.Cms:
+#endif
+			Call6502(player + 6);
+			break;
+		case ASAPModuleType.SapD:
+			if (player >= 0) {
+				Cpu.PushPc();
+				const int codeAddr = 0xd200;
+				Cpu.Memory[codeAddr] = 0x08; // PHP
+				Cpu.Memory[codeAddr + 1] = 0x48; // PHA
+				Cpu.Memory[codeAddr + 2] = 0x8a; // TXA
+				Cpu.Memory[codeAddr + 3] = 0x48; // PHA
+				Cpu.Memory[codeAddr + 4] = 0x98; // TYA
+				Cpu.Memory[codeAddr + 5] = 0x48; // PHA
+				Cpu.Memory[codeAddr + 6] = 0x20; // JSR
+				Cpu.Memory[codeAddr + 7] = player & 0xff;
+				Cpu.Memory[codeAddr + 8] = player >> 8;
+				Cpu.Memory[codeAddr + 9] = 0x68; // PLA
+				Cpu.Memory[codeAddr + 10] = 0xa8; // TAY
+				Cpu.Memory[codeAddr + 11] = 0x68; // PLA
+				Cpu.Memory[codeAddr + 12] = 0xaa; // TAX
+				Cpu.Memory[codeAddr + 13] = 0x68; // PLA
+				Cpu.Memory[codeAddr + 14] = 0x40; // RTI
+				Cpu.Pc = codeAddr;
+			}
+			break;
+		case ASAPModuleType.SapS:
+			int i = Cpu.Memory[0x45] - 1;
+			Cpu.Memory[0x45] = i & 0xff;
+			if (i == 0)
+				Cpu.Memory[0xb07b] = (Cpu.Memory[0xb07b] + 1) & 0xff;
+			break;
+#if !ASAP_ONLY_SAP
+		case ASAPModuleType.Dlt:
+			Call6502(player + 0x103);
+			break;
+		case ASAPModuleType.Mpt:
+		case ASAPModuleType.Rmt:
+		case ASAPModuleType.Tm2:
+		case ASAPModuleType.Fc:
+			Call6502(player + 3);
+			break;
+		case ASAPModuleType.Tmc:
+			if (--TmcPerFrameCounter <= 0) {
+				TmcPerFrameCounter = Cpu.Memory[ModuleInfo.GetMusicAddress() + 0x1f];
+				Call6502(player + 3);
+			}
+			else
+				Call6502(player + 6);
+			break;
+#if EXPERIMENTAL_XEX
+		case ASAPModuleType.Xex:
+			break;
+#endif
+#endif
+		}
+	}
+
+	internal bool IsIrq() => Pokeys.BasePokey.Irqst != 0xff;
+
+	internal void HandleEvent!()
+	{
+		int cycle = Cpu.Cycle;
+		if (cycle >= NextScanlineCycle) {
+			if (cycle - NextScanlineCycle < 50) // not WSYNC
+				Cpu.Cycle = cycle += 9;
+			NextScanlineCycle += 114;
+			if (cycle >= NextPlayerCycle) {
+				Call6502Player();
+				NextPlayerCycle += 114 * ModuleInfo.GetPlayerRateScanlines();
+			}
+		}
+		int nextEventCycle = NextScanlineCycle;
+		nextEventCycle = Pokeys.BasePokey.CheckIrq(cycle, nextEventCycle);
+		nextEventCycle = Pokeys.ExtraPokey.CheckIrq(cycle, nextEventCycle);
+		NextEventCycle = nextEventCycle;
+	}
+
+	int Do6502Frame!()
+	{
+		NextEventCycle = 0;
+		NextScanlineCycle = 0;
+		Nmist = Nmist == NmiStatus.Reset ? NmiStatus.OnVBlank : NmiStatus.WasVBlank;
+		int cycles = ModuleInfo.IsNtsc() ? 262 * 114 : 312 * 114;
+		Cpu.DoFrame(cycles);
+		Cpu.Cycle -= cycles;
+		if (NextPlayerCycle != Pokey.NeverCycle)
+			NextPlayerCycle -= cycles;
+		for (int i = 3; ; i >>= 1) {
+			Pokeys.BasePokey.Channels[i].EndFrame(cycles);
+			Pokeys.ExtraPokey.Channels[i].EndFrame(cycles);
+			if (i == 0)
+				break;
+		}
+		return cycles;
+	}
+
+	int DoFrame!()
+	{
+		GtiaOrCovoxPlayedThisFrame = false;
+		Pokeys.StartFrame();
+		int cycles = Do6502Frame();
+		Pokeys.EndFrame(cycles);
+		return cycles;
+	}
+
+	/// Loads music data ("module").
+	public void Load!(
+		/// Filename, used to determine the format.
+		string filename,
+		/// Contents of the file.
+		byte[] module,
+		/// Length of the file.
+		int moduleLen)
+		throws
+	{
+		ModuleInfo.Load(filename, module, moduleLen);
+#if !ASAP_ONLY_SAP
+		byte[] playerRoutine = ASAP6502.GetPlayerRoutine(ModuleInfo);
+		if (playerRoutine != null) {
+			int player = ASAPInfo.GetWord(playerRoutine, 2);
+			int playerLastByte = ASAPInfo.GetWord(playerRoutine, 4);
+			int music = ModuleInfo.GetMusicAddress();
+			if (music <= playerLastByte)
+				throw "Module address conflicts with the player routine";
+			Cpu.Memory[0x4c00] = 0; // for 11270-byte DLT
+			if (ModuleInfo.Type == ASAPModuleType.Fc)
+				module.CopyTo(0, Cpu.Memory, music, moduleLen);
+			else
+				module.CopyTo(6, Cpu.Memory, music, moduleLen - 6);
+			playerRoutine.CopyTo(6, Cpu.Memory, player, playerLastByte + 1 - player);
+			if (ModuleInfo.Player < 0)
+				ModuleInfo.Player = player;
+			return;
+		}
+#endif
+		Cpu.Memory.Fill(0);
+		int moduleIndex = ModuleInfo.HeaderLen + 2;
+		while (moduleIndex + 5 <= moduleLen) {
+			int startAddr = ASAPInfo.GetWord(module, moduleIndex);
+			int blockLen = ASAPInfo.GetWord(module, moduleIndex + 2) + 1 - startAddr;
+			if (blockLen <= 0 || moduleIndex + blockLen > moduleLen)
+				throw "Invalid binary block";
+			moduleIndex += 4;
+			module.CopyTo(moduleIndex, Cpu.Memory, startAddr, blockLen);
+			moduleIndex += blockLen;
+			if (moduleIndex == moduleLen)
+				return;
+			if (moduleIndex + 7 <= moduleLen && module[moduleIndex] == 0xff && module[moduleIndex + 1] == 0xff)
+				moduleIndex += 2;
+		}
+		throw "Invalid binary block";
+	}
+
+	/// Returns information about the loaded module.
+	public ASAPInfo GetInfo() => ModuleInfo;
+
+	void Do6502Init!(int pc, int a, int x, int y)
+		throws
+	{
+		Cpu.Pc = pc;
+		Cpu.A = a & 0xff;
+		Cpu.X = x & 0xff;
+		Cpu.Y = y & 0xff;
+		const int escapeAddr = 0xd200;
+		// escape code
+		Cpu.Memory[escapeAddr] = 0xd2;
+		// return address points to the escape code
+		Cpu.Memory[0x1fe] = (escapeAddr - 1) & 0xff;
+		Cpu.Memory[0x1ff] = (escapeAddr - 1) >> 8;
+		Cpu.S = 0xfd;
+		for (int frame = 0; frame < 50; frame++) {
+			Do6502Frame();
+			if (Cpu.Pc == escapeAddr)
+				return;
+		}
+		throw "INIT routine didn't return";
+	}
+
+	/// Mutes the selected POKEY channels.
+	public void MutePokeyChannels!(
+		/// An 8-bit mask which selects POKEY channels to be muted.
+		int mask)
+	{
+		Pokeys.BasePokey.Mute(mask);
+		Pokeys.ExtraPokey.Mute(mask >> 4);
+	}
+
+	/// Prepares playback of the specified song of the loaded module.
+	public void PlaySong!(
+		/// Zero-based song index.
+		int song,
+		/// Playback time in milliseconds, -1 means infinity.
+		int duration)
+		throws
+	{
+		if (song < 0 || song >= ModuleInfo.GetSongs())
+			throw "Song number out of range";
+		CurrentSong = song;
+		CurrentDuration = duration;
+		NextPlayerCycle = Pokey.NeverCycle;
+		BlocksPlayed = 0;
+		SilenceCyclesCounter = SilenceCycles;
+
+		Cpu.Reset();
+		Nmist = NmiStatus.OnVBlank;
+		Consol = 8;
+		Covox[0] = 0x80;
+		Covox[1] = 0x80;
+		Covox[2] = 0x80;
+		Covox[3] = 0x80;
+		Pokeys.Initialize(ModuleInfo.IsNtsc(), ModuleInfo.GetChannels() > 1);
+		MutePokeyChannels(0xff);
+		int player = ModuleInfo.Player;
+		int music = ModuleInfo.GetMusicAddress();
+		switch (ModuleInfo.Type) {
+		case ASAPModuleType.SapB:
+			Do6502Init(ModuleInfo.GetInitAddress(), song, 0, 0);
+			break;
+		case ASAPModuleType.SapC:
+#if !ASAP_ONLY_SAP
+		case ASAPModuleType.Cmc:
+		case ASAPModuleType.Cm3:
+		case ASAPModuleType.Cmr:
+		case ASAPModuleType.Cms:
+#endif
+			Do6502Init(player + 3, 0x70, music, music >> 8);
+			Do6502Init(player + 3, 0x00, song, 0);
+			break;
+		case ASAPModuleType.SapD:
+		case ASAPModuleType.SapS:
+			Cpu.Pc = ModuleInfo.GetInitAddress();
+			Cpu.A = song;
+			Cpu.X = 0x00;
+			Cpu.Y = 0x00;
+			Cpu.S = 0xff;
+			break;
+#if !ASAP_ONLY_SAP
+		case ASAPModuleType.Dlt:
+			Do6502Init(player + 0x100, 0x00, 0x00, ModuleInfo.SongPos[song]);
+			break;
+		case ASAPModuleType.Mpt:
+			Do6502Init(player, 0x00, music >> 8, music);
+			Do6502Init(player, 0x02, ModuleInfo.SongPos[song], 0);
+			break;
+		case ASAPModuleType.Rmt:
+			Do6502Init(player, ModuleInfo.SongPos[song], music, music >> 8);
+			break;
+		case ASAPModuleType.Tmc:
+		case ASAPModuleType.Tm2:
+			Do6502Init(player, 0x70, music >> 8, music);
+			Do6502Init(player, 0x00, song, 0);
+			TmcPerFrameCounter = 1;
+			break;
+		case ASAPModuleType.Fc:
+			Do6502Init(player, song, 0, 0);
+			break;
+#if EXPERIMENTAL_XEX
+		case ASAPModuleType.Xex:
+			Cpu.Pc = ASAPInfo.GetWord(Cpu.Memory, 0x2e0);
+			Cpu.A = song;
+			Cpu.X = 0x00;
+			Cpu.Y = 0x00;
+			Cpu.S = 0xff;
+			break;
+#endif
+#endif
+		}
+		MutePokeyChannels(0);
+		NextPlayerCycle = 0;
+	}
+
+	/// Returns current playback position in blocks.
+	/// A block is one sample or a pair of samples for stereo.
+	public int GetBlocksPlayed() => BlocksPlayed;
+
+	/// Returns current playback position in milliseconds.
+	public int GetPosition() => BlocksPlayed * 10 / (SampleRate / 100);
+
+	static int MillisecondsToBlocks(int milliseconds) => milliseconds * (SampleRate / 100) / 10;
+
+	/// Changes the playback position.
+	public void SeekSample!(
+		/// The requested absolute position in samples (always 44100 per second, even in stereo).
+		int block)
+		throws
+	{
+		if (block < BlocksPlayed)
+			PlaySong(CurrentSong, CurrentDuration);
+		while (BlocksPlayed + Pokeys.ReadySamplesEnd < block) {
+			BlocksPlayed += Pokeys.ReadySamplesEnd;
+			DoFrame();
+		}
+		Pokeys.ReadySamplesStart = block - BlocksPlayed;
+		BlocksPlayed = block;
+	}
+
+	/// Changes the playback position.
+	public void Seek!(
+		/// The requested absolute position in milliseconds.
+		int position)
+		throws
+	{
+		SeekSample(MillisecondsToBlocks(position));
+	}
+
+	static void PutLittleEndian(byte[]! buffer, int offset, int value)
+	{
+		buffer[offset] = value & 0xff;
+		buffer[offset + 1] = value >> 8 & 0xff;
+		buffer[offset + 2] = value >> 16 & 0xff;
+		buffer[offset + 3] = value >> 24 & 0xff;
+	}
+
+	static int FourCC(string s)
+		=> (s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24) & 0x7fffffff;
+
+	static void PutLittleEndians(byte[]! buffer, int offset, int value1, int value2)
+	{
+		PutLittleEndian(buffer, offset, value1);
+		PutLittleEndian(buffer, offset + 4, value2);
+	}
+
+	static int PutWavMetadata(byte[]! buffer, int offset, int fourCC, string value)
+	{
+		int len = value.Length;
+		if (len > 0) {
+			// include terminator and round up to the nearest word
+			PutLittleEndians(buffer, offset, fourCC, (len | 1) + 1);
+			offset += 8;
+			for (int i = 0; i < len; i++)
+				buffer[offset++] = value[i];
+			buffer[offset++] = 0;
+			if ((len & 1) == 0)
+				buffer[offset++] = 0;
+		}
+		return offset;
+	}
+
+	/// Fills leading bytes of the specified buffer with WAV file header.
+	/// Returns the number of changed bytes.
+	public int GetWavHeader(
+		/// The destination buffer.
+		byte[]! buffer,
+		/// Format of samples.
+		ASAPSampleFormat format,
+		/// Include metadata (title, author, date).
+		bool metadata)
+	{
+		int use16bit = format != ASAPSampleFormat.U8 ? 1 : 0;
+		int blockSize = ModuleInfo.GetChannels() << use16bit;
+		int bytesPerSecond = SampleRate * blockSize;
+		int totalBlocks = MillisecondsToBlocks(CurrentDuration);
+		int nBytes = (totalBlocks - BlocksPlayed) * blockSize;
+		PutLittleEndian(buffer, 8, FourCC("WAVE"));
+		PutLittleEndians(buffer, 12, FourCC("fmt "), 16);
+		buffer[20] = 1;
+		buffer[21] = 0;
+		buffer[22] = ModuleInfo.GetChannels();
+		buffer[23] = 0;
+		PutLittleEndians(buffer, 24, SampleRate, bytesPerSecond);
+		buffer[32] = blockSize;
+		buffer[33] = 0;
+		buffer[34] = 8 << use16bit;
+		buffer[35] = 0;
+		int i = 36;
+		if (metadata) {
+			int year = ModuleInfo.GetYear();
+			if (ModuleInfo.GetTitle().Length > 0 || ModuleInfo.GetAuthor().Length > 0 || year > 0) {
+				PutLittleEndian(buffer, 44, FourCC("INFO"));
+				i = PutWavMetadata(buffer, 48, FourCC("INAM"), ModuleInfo.GetTitle());
+				i = PutWavMetadata(buffer, i, FourCC("IART"), ModuleInfo.GetAuthor());
+				if (year > 0) {
+					PutLittleEndians(buffer, i, FourCC("ICRD"), 6);
+					for (int j = 3; j >= 0; j--) {
+						buffer[i + 8 + j] = '0' + year % 10;
+						year /= 10;
+					}
+					buffer[i + 12] =  0;
+					buffer[i + 13] =  0;
+					i += 14;
+				}
+				PutLittleEndians(buffer, 36, FourCC("LIST"), i - 44);
+			}
+		}
+		PutLittleEndians(buffer, 0, FourCC("RIFF"), i + nBytes);
+		PutLittleEndians(buffer, i, FourCC("data"), nBytes);
+		return i + 8;
+	}
+
+	int GenerateAt!(byte[]! buffer, int bufferOffset, int bufferLen, ASAPSampleFormat format)
+	{
+		if (SilenceCycles > 0 && SilenceCyclesCounter <= 0)
+			return 0;
+		int blockShift = (ModuleInfo.GetChannels() - 1) + (format != ASAPSampleFormat.U8 ? 1 : 0);
+		int bufferBlocks = bufferLen >> blockShift;
+		if (CurrentDuration > 0) {
+			int totalBlocks = MillisecondsToBlocks(CurrentDuration);
+			if (bufferBlocks > totalBlocks - BlocksPlayed)
+				bufferBlocks = totalBlocks - BlocksPlayed;
+		}
+		int block = 0;
+		for (;;) {
+			int blocks = Pokeys.Generate(buffer, bufferOffset + (block << blockShift), bufferBlocks - block, format);
+			BlocksPlayed += blocks;
+			block += blocks;
+			if (block >= bufferBlocks)
+				break;
+			int cycles = DoFrame();
+			if (SilenceCycles > 0) {
+				if (Pokeys.IsSilent() && !GtiaOrCovoxPlayedThisFrame) {
+					SilenceCyclesCounter -= cycles;
+					if (SilenceCyclesCounter <= 0)
+						break;
+				}
+				else
+					SilenceCyclesCounter = SilenceCycles;
+			}
+		}
+		return block << blockShift;
+	}
+
+	/// Fills the specified buffer with generated samples.
+	public int Generate!(
+		/// The destination buffer.
+		byte[]! buffer,
+		/// Number of bytes to fill.
+		int bufferLen,
+		/// Format of samples.
+		ASAPSampleFormat format)
+		=> GenerateAt(buffer, 0, bufferLen, format);
+
+	/// Returns POKEY channel volume - an integer between 0 and 15.
+	public int GetPokeyChannelVolume(
+		/// POKEY channel number (from 0 to 7).
+		int channel)
+	{
+		Pokey pokey = (channel & 4) == 0 ? Pokeys.BasePokey : Pokeys.ExtraPokey;
+		return pokey.Channels[channel & 3].Audc & 0xf;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapconv.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapconv.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapconv.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapconv.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,640 @@
+/*
+ * asapconv.c - converter of ASAP-supported formats
+ *
+ * Copyright (C) 2005-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <fcntl.h>
+#ifdef _MSC_VER
+#define strcasecmp _stricmp
+#include <io.h>
+#endif
+#endif
+
+#ifdef HAVE_LIBMP3LAME
+#define SAMPLE_FORMATS "WAV, RAW or MP3"
+#ifndef HAVE_LIBMP3LAME_DLL
+#include <lame.h>
+#endif
+#else
+#define SAMPLE_FORMATS "WAV or RAW"
+#endif
+
+#include "asap.h"
+
+/* parsed command line */
+static const char *arg_output = NULL;
+static int arg_song = -1;
+static ASAPSampleFormat arg_sample_format = ASAPSampleFormat_S16_L_E;
+static int arg_duration = -1;
+static int arg_mute_mask = 0;
+static const char *arg_author = NULL;
+static const char *arg_name = NULL;
+static const char *arg_date = NULL;
+static bool arg_tag = false;
+static int arg_music_address = -1;
+
+static int current_song;
+static char output_file[FILENAME_MAX];
+
+static void print_help(void)
+{
+	printf(
+		"Usage: asapconv [OPTIONS] INPUTFILE...\n"
+		"Each INPUTFILE must be in a supported format:\n"
+		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n"
+		"Output EXT must be one of the above or XEX, " SAMPLE_FORMATS ".\n"
+		"Options:\n"
+		"-o FILE.EXT --output=FILE.EXT  Write to the specified file\n"
+		"-o .EXT     --output=.EXT      Use input file path and name\n"
+		"-o DIR/.EXT --output=DIR/.EXT  Write to the specified directory\n"
+		"-o -.EXT    --output=-.EXT     Write to standard output\n"
+		"-a \"TEXT\"   --author=\"TEXT\"    Set author name\n"
+		"-n \"TEXT\"   --name=\"TEXT\"      Set music name\n"
+		"-d \"TEXT\"   --date=\"TEXT\"      Set music creation date (DD/MM/YYYY format)\n"
+		"-h          --help             Display this information\n"
+		"-v          --version          Display version information\n"
+		"In FILE, DIR and EXT you may use the following placeholders:\n"
+		"%%a                             Music author\n"
+		"%%n                             Music name\n"
+		"%%d                             Music creation date\n"
+		"%%e                             Original extension (e.g. \"cmc\")\n"
+		"%%s                             Subsong number (1-based), one file per subsong\n"
+		"Options for XEX, " SAMPLE_FORMATS " output:\n"
+		"-s SONG     --song=SONG        Select subsong number (zero-based)\n"
+		"-t TIME     --time=TIME        Set output length (MM:SS format)\n"
+		"Options for XEX, WAV "
+#ifdef HAVE_LIBMP3LAME
+		                "or MP3 "
+#endif
+		                       "output:\n"
+		"            --tag              Include metadata in the output file\n"
+		"Options for " SAMPLE_FORMATS " output:\n"
+		"-m CHANNELS --mute=CHANNELS    Mute POKEY channels (1-8, comma-separated)\n"
+#ifdef HAVE_LIBMP3LAME
+		"Options for WAV or RAW output:\n"
+#endif
+		"-b          --byte-samples     Output 8-bit samples\n"
+		"-w          --word-samples     Output 16-bit samples (default)\n"
+		"Options for SAP output:\n"
+		"-s SONG     --song=SONG        Select subsong to set length of\n"
+		"-t TIME     --time=TIME        Set subsong length (MM:SS format)\n"
+		"Options for native module output:\n"
+		"            --address=HEXNUM   Relocate music to the given address\n"
+	);
+}
+
+static void fatal_error(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	fprintf(stderr, "asapconv: ");
+	vfprintf(stderr, format, args);
+	fputc('\n', stderr);
+	va_end(args);
+	exit(1);
+}
+
+static int parse_int(const char *s, int base, const char *description, int max_value)
+{
+	if (s[0] == '\0')
+		fatal_error("invalid %s", description);
+	char *e;
+	long result = strtol(s, &e, base);
+	if (e[0] != '\0' || result < 0 || result > max_value)
+		fatal_error("invalid %s", description);
+	return (int) result;
+}
+
+static void set_song(const char *s)
+{
+	arg_song = parse_int(s, 10, "subsong number", ASAPInfo_MAX_SONGS - 1);
+}
+
+static void set_time(const char *s)
+{
+	arg_duration = ASAPInfo_ParseDuration(s);
+	if (arg_duration <= 0)
+		fatal_error("invalid time format");
+}
+
+static void set_mute_mask(const char *s)
+{
+	while (*s != '\0') {
+		if (*s >= '1' && *s <= '8')
+			arg_mute_mask |= 1 << (*s - '1');
+		s++;
+	}
+}
+
+static void set_music_address(const char *s)
+{
+	if (s[0] == '$')
+		s++;
+	arg_music_address = parse_int(s, 16, "music address", 0xffff);
+}
+
+static void apply_tags(const char *input_file, ASAPInfo *info)
+{
+	if (arg_author != NULL) {
+		if (!ASAPInfo_SetAuthor(info, arg_author))
+			fatal_error("invalid author");
+	}
+	if (arg_name != NULL) {
+		if (!ASAPInfo_SetTitle(info, arg_name))
+			fatal_error("invalid music name");
+		arg_name = NULL;
+	}
+	if (arg_date != NULL) {
+		if (!ASAPInfo_SetDate(info, arg_date))
+			fatal_error("invalid date");
+	}
+}
+
+static ASAP *load_module(const char *input_file, const unsigned char *module, int module_len)
+{
+	ASAP *asap = ASAP_New();
+	if (asap == NULL)
+		fatal_error("out of memory");
+	if (!ASAP_Load(asap, input_file, module, module_len))
+		fatal_error("%s: unsupported file", input_file);
+	ASAPInfo *info = (ASAPInfo *) ASAP_GetInfo(asap); /* FIXME: avoid cast */
+	apply_tags(input_file, info);
+	return asap;
+}
+
+static FILE *open_output_file(const char *input_file, const unsigned char *module, int module_len, const ASAPInfo *info, bool allow_file_per_song)
+{
+	const char *output_ext = strrchr(arg_output, '.');
+	FILE *fp = NULL;
+	if (output_ext == arg_output) {
+		/* .EXT */
+	}
+	else if (output_ext[-1] == '/' || output_ext[-1] == '\\') {
+		/* DIR/.EXT */
+		for (const char *p = input_file; *p != '\0'; p++)
+			if (*p == '/' || *p == '\\')
+				input_file = p + 1;
+	}
+	else {
+		/* FILE.EXT or -.EXT */
+		if (output_ext == arg_output + 1 && arg_output[0] == '-') {
+			/* -.EXT */
+#ifdef _WIN32
+			_setmode(_fileno(stdout), _O_BINARY);
+#endif
+			fp = stdout;
+		}
+		output_ext = NULL; /* don't insert input_file */
+	}
+
+	bool file_per_song = false;
+	char *output_ptr = output_file;
+	for (const char *pattern_ptr = arg_output; *pattern_ptr != '\0'; pattern_ptr++) {
+		if (pattern_ptr == output_ext) {
+			/* insert input_file without the extension */
+			size_t len = strrchr(input_file, '.') - input_file;
+			if (output_ptr + len >= output_file + sizeof(output_file))
+				fatal_error("filename too long");
+			memcpy(output_ptr, input_file, len);
+			output_ptr += len;
+		}
+		char c = *pattern_ptr;
+		if (c == '%') {
+			const char *tag;
+			char song_tag[16];
+			c = *++pattern_ptr;
+			switch (c) {
+			case 'a':
+				tag = ASAPInfo_GetAuthor(info);
+				break;
+			case 'n':
+				tag = ASAPInfo_GetTitleOrFilename(info);
+				break;
+			case 'd':
+				tag = ASAPInfo_GetDate(info);
+				break;
+			case 'e':
+				tag = ASAPInfo_GetOriginalModuleExt(info, module, module_len);
+				if (tag == NULL)
+					tag = "unknown";
+				break;
+			case 's':
+				if (!file_per_song) {
+					if (!allow_file_per_song)
+						fatal_error("%%s is invalid for this output format");
+					if (arg_song >= 0)
+						fatal_error("-s and %%s are mutually exclusive");
+					if (++current_song >= ASAPInfo_GetSongs(info))
+						return NULL;
+					sprintf(song_tag, "%d", current_song + 1);
+					file_per_song = true;
+				}
+				tag = song_tag;
+				break;
+			case '%':
+				tag = "%";
+				break;
+			default:
+				fatal_error("unrecognized %%%c", c);
+				return NULL;
+			}
+			while (*tag != '\0') {
+				if (output_ptr >= output_file + sizeof(output_file) - 1)
+					fatal_error("filename too long");
+				c = *tag++;
+				switch (c) {
+				case '<':
+				case '>':
+				case ':':
+				case '/':
+				case '\\':
+				case '|':
+				case '?':
+				case '*':
+					c = '_';
+					break;
+				default:
+					break;
+				}
+				*output_ptr++ = c;
+			}
+		}
+		else {
+			if (output_ptr >= output_file + sizeof(output_file) - 1)
+				fatal_error("filename too long");
+			*output_ptr++ = c;
+		}
+	}
+	*output_ptr = '\0';
+
+	if (!file_per_song) {
+		if (current_song >= 0)
+			return NULL;
+		if (arg_song < 0)
+			current_song = ASAPInfo_GetDefaultSong(info);
+		else if (arg_song >= ASAPInfo_GetSongs(info)) {
+			fatal_error("you have requested subsong %d ...\n"
+				"... but %s contains only %d subsongs",
+				arg_song + 1, input_file, ASAPInfo_GetSongs(info));
+		}
+		else
+			current_song = arg_song;
+	}
+
+	if (fp == NULL) {
+		fp = fopen(output_file, "wb");
+		if (fp == NULL)
+			fatal_error("cannot write %s", output_file);
+	}
+	return fp;
+}
+
+static int play_song(const char *input_file, ASAP *asap)
+{
+	int duration = arg_duration;
+	if (duration < 0) {
+		duration = ASAPInfo_GetDuration(ASAP_GetInfo(asap), current_song);
+		if (duration < 0)
+			duration = 180 * 1000;
+	}
+	if (!ASAP_PlaySong(asap, current_song, duration))
+		fatal_error("%s: PlaySong failed", input_file);
+	ASAP_MutePokeyChannels(asap, arg_mute_mask);
+	return duration;
+}
+
+static void write_output_file(FILE *fp, unsigned char *buffer, int n_bytes)
+{
+	if (fwrite(buffer, 1, n_bytes, fp) != n_bytes) {
+		if (fp != stdout)
+			fclose(fp);
+		fatal_error("error writing to %s", output_file);
+	}
+}
+
+static void close_output_file(FILE *fp)
+{
+	if (fp != stdout) {
+		if (fclose(fp) != 0)
+			fatal_error("error closing %s", output_file);
+	}
+}
+
+static void convert_to_wav(const char *input_file, const unsigned char *module, int module_len, bool output_header)
+{
+	ASAP *asap = load_module(input_file, module, module_len);
+	FILE *fp;
+
+	while ((fp = open_output_file(input_file, module, module_len, ASAP_GetInfo(asap), true)) != NULL) {
+		play_song(input_file, asap);
+		unsigned char buffer[8192];
+		int n_bytes;
+		if (output_header) {
+			n_bytes = ASAP_GetWavHeader(asap, buffer, arg_sample_format, arg_tag);
+			fwrite(buffer, 1, n_bytes, fp);
+		}
+		do {
+			n_bytes = ASAP_Generate(asap, buffer, sizeof(buffer), arg_sample_format);
+			write_output_file(fp, buffer, n_bytes);
+		} while (n_bytes == sizeof(buffer));
+		close_output_file(fp);
+	}
+
+	ASAP_Delete(asap);
+}
+
+#ifdef HAVE_LIBMP3LAME
+
+#ifdef HAVE_LIBMP3LAME_DLL
+
+#include <windows.h>
+
+typedef struct lame_global_struct *lame_global_flags;
+typedef lame_global_flags *(*plame_init)(void);
+typedef int (*plame_set_num_samples)(lame_global_flags *, unsigned long);
+typedef int (*plame_set_in_samplerate)(lame_global_flags *, int);
+typedef int (*plame_set_num_channels)(lame_global_flags *, int);
+typedef int (*plame_init_params)(lame_global_flags *);
+typedef int (*plame_encode_buffer_interleaved)(lame_global_flags *, short int[], int, unsigned char *, int);
+typedef int (*plame_encode_flush)(lame_global_flags *, unsigned char *, int);
+typedef int (*plame_close)(lame_global_flags *);
+typedef int (*pid3tag_init)(lame_global_flags *);
+typedef int (*pid3tag_set_title)(lame_global_flags *, const char *);
+typedef int (*pid3tag_set_artist)(lame_global_flags *, const char *);
+typedef int (*pid3tag_set_year)(lame_global_flags *, const char *);
+typedef int (*pid3tag_set_genre)(lame_global_flags *, const char *);
+#define LAME_OKAY 0
+
+static HMODULE lame_load(void)
+{
+	HMODULE lame_dll = LoadLibrary("libmp3lame.dll");
+	if (lame_dll != NULL)
+		return lame_dll;
+	lame_dll = LoadLibrary("lame_enc.dll");
+	if (lame_dll != NULL)
+		return lame_dll;
+	fatal_error("libmp3lame.dll and lame_enc.dll not found");
+	return NULL;
+}
+
+static FARPROC lame_proc(HMODULE lame_dll, const char *name)
+{
+	FARPROC proc = GetProcAddress(lame_dll, name);
+	if (proc == NULL) {
+		char dll_name[FILENAME_MAX];
+		GetModuleFileName(lame_dll, dll_name, FILENAME_MAX);
+		fatal_error("%s not found in %s", name, dll_name);
+	}
+	return proc;
+}
+
+#define LAME_FUNC(name) p##name name = (p##name) lame_proc(lame_dll, #name)
+
+#endif
+
+static void convert_to_mp3(const char *input_file, const unsigned char *module, int module_len)
+{
+	ASAP *asap = load_module(input_file, module, module_len);
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	int channels = ASAPInfo_GetChannels(info);
+
+#ifdef HAVE_LIBMP3LAME_DLL
+	HMODULE lame_dll = lame_load();
+	LAME_FUNC(lame_init);
+	LAME_FUNC(lame_set_num_samples);
+	LAME_FUNC(lame_set_in_samplerate);
+	LAME_FUNC(lame_set_num_channels);
+	LAME_FUNC(lame_init_params);
+	LAME_FUNC(lame_encode_buffer_interleaved);
+	LAME_FUNC(lame_encode_flush);
+	LAME_FUNC(lame_close);
+#endif
+
+	FILE *fp;
+	while ((fp = open_output_file(input_file, module, module_len, info, true)) != NULL) {
+		int duration = play_song(input_file, asap);
+		lame_global_flags *lame = lame_init();
+		if (lame == NULL)
+			fatal_error("lame_init failed");
+		if (lame_set_num_samples(lame, duration * (ASAP_SAMPLE_RATE / 100) / 10) != LAME_OKAY
+		 || lame_set_in_samplerate(lame, ASAP_SAMPLE_RATE) != LAME_OKAY
+		 || lame_set_num_channels(lame, channels) != LAME_OKAY)
+			fatal_error("lame_set_* failed");
+		if (lame_init_params(lame) != LAME_OKAY)
+			fatal_error("lame_init_params failed");
+
+		if (arg_tag) {
+#ifdef HAVE_LIBMP3LAME_DLL
+			LAME_FUNC(id3tag_init);
+			LAME_FUNC(id3tag_set_title);
+			LAME_FUNC(id3tag_set_artist);
+			LAME_FUNC(id3tag_set_year);
+			LAME_FUNC(id3tag_set_genre);
+#endif
+			id3tag_init(lame);
+			const char *s = ASAPInfo_GetTitle(info);
+			if (s[0] != '\0')
+				id3tag_set_title(lame, s);
+			s = ASAPInfo_GetAuthor(info);
+			if (s[0] != '\0')
+				id3tag_set_artist(lame, s);
+			int year = ASAPInfo_GetYear(info);
+			if (year > 0) {
+				char year_string[16];
+				sprintf(year_string, "%d", year);
+				id3tag_set_year(lame, year_string);
+			}
+			id3tag_set_genre(lame, "Electronic");
+		}
+
+		unsigned char buffer[8192];
+		int n_bytes;
+		unsigned char mp3buf[4096 * 5 / 4 + 7200]; /* it would be possible to reuse "buffer" instead */
+		int mp3_bytes;
+
+		do {
+			short pcm[8192];
+			short *p = pcm;
+			n_bytes = ASAP_Generate(asap, buffer, sizeof(buffer), ASAPSampleFormat_S16_L_E);
+			for (int i = 0; i < n_bytes; i += 2) {
+				*p++ = buffer[i] + (buffer[i + 1] << 8);
+				if (channels == 1)
+					p++;
+			}
+			mp3_bytes = lame_encode_buffer_interleaved(lame, pcm, n_bytes >> channels, mp3buf, sizeof(mp3buf));
+			if (mp3_bytes < 0)
+				fatal_error("lame_encode_buffer_interleaved failed");
+			write_output_file(fp, mp3buf, mp3_bytes);
+		} while (n_bytes == sizeof(buffer));
+
+		mp3_bytes = lame_encode_flush(lame, mp3buf, sizeof(mp3buf));
+		if (mp3_bytes < 0)
+			fatal_error("lame_encode_flush failed");
+		write_output_file(fp, mp3buf, mp3_bytes);
+		lame_close(lame);
+		close_output_file(fp);
+	}
+
+	ASAP_Delete(asap);
+}
+
+#endif /* HAVE_LIBMP3LAME */
+
+static void convert_to_module(const char *input_file, const unsigned char *module, int module_len, bool output_xex)
+{
+	const char *input_ext = strrchr(input_file, '.');
+	if (input_ext == NULL)
+		fatal_error("%s: missing extension", input_file);
+	input_ext++;
+	ASAPInfo *info = ASAPInfo_New();
+	if (info == NULL)
+		fatal_error("out of memory");
+	if (!ASAPInfo_Load(info, input_file, module, module_len))
+		fatal_error("%s: unsupported file", input_file);
+	ASAPWriter *writer = ASAPWriter_New();
+	if (writer == NULL)
+		fatal_error("out of memory");
+	apply_tags(input_file, info);
+	if (arg_music_address >= 0)
+		ASAPInfo_SetMusicAddress(info, arg_music_address);
+
+	FILE *fp;
+	while ((fp = open_output_file(input_file, module, module_len, info, output_xex)) != NULL) {
+		if (output_xex)
+			ASAPInfo_SetDefaultSong(info, current_song);
+		if (arg_duration >= 0)
+			ASAPInfo_SetDuration(info, current_song, arg_duration);
+		unsigned char output[ASAPInfo_MAX_MODULE_LENGTH];
+		ASAPWriter_SetOutput(writer, output, 0, sizeof(output));
+		int output_len = ASAPWriter_Write(writer, output_file, info, module, module_len, arg_tag);
+		if (output_len < 0)
+			fatal_error("%s: conversion error", input_file);
+		write_output_file(fp, output, output_len);
+		close_output_file(fp);
+	}
+
+	ASAPWriter_Delete(writer);
+	ASAPInfo_Delete(info);
+}
+
+static void process_file(const char *input_file)
+{
+	if (arg_output == NULL)
+		fatal_error("the -o/--output option is mandatory");
+	FILE *fp = fopen(input_file, "rb");
+	if (fp == NULL)
+		fatal_error("cannot open %s", input_file);
+	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len = fread(module, 1, sizeof(module), fp);
+	fclose(fp);
+
+	const char *output_ext = strrchr(arg_output, '.');
+	if (output_ext == NULL)
+		fatal_error("missing .EXT in -o/--output");
+	output_ext++;
+	current_song = -1;
+	if (strcasecmp(output_ext, "wav") == 0)
+		convert_to_wav(input_file, module, module_len, true);
+	else if (strcasecmp(output_ext, "raw") == 0)
+		convert_to_wav(input_file, module, module_len, false);
+	else if (strcasecmp(output_ext, "mp3") == 0) {
+#ifdef HAVE_LIBMP3LAME
+		convert_to_mp3(input_file, module, module_len);
+#else
+		fatal_error("this build of asapconv doesn't support MP3");
+#endif
+	}
+	else
+		convert_to_module(input_file, module, module_len, strcasecmp(output_ext, "xex") == 0);
+}
+
+int main(int argc, char *argv[])
+{
+	const char *options_error = "no input files";
+	for (int i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (arg[0] != '-') {
+			process_file(arg);
+			options_error = NULL;
+			continue;
+		}
+		options_error = "options must be specified before the input file";
+#define is_opt(c)  (arg[1] == c && arg[2] == '\0')
+		if (is_opt('o'))
+			arg_output = argv[++i];
+		else if (strncmp(arg, "--output=", 9) == 0)
+			arg_output = arg + 9;
+		else if (is_opt('s'))
+			set_song(argv[++i]);
+		else if (strncmp(arg, "--song=", 7) == 0)
+			set_song(arg + 7);
+		else if (is_opt('t'))
+			set_time(argv[++i]);
+		else if (strncmp(arg, "--time=", 7) == 0)
+			set_time(arg + 7);
+		else if (is_opt('b') || strcmp(arg, "--byte-samples") == 0)
+			arg_sample_format = ASAPSampleFormat_U8;
+		else if (is_opt('w') || strcmp(arg, "--word-samples") == 0)
+			arg_sample_format = ASAPSampleFormat_S16_L_E;
+		else if (is_opt('m'))
+			set_mute_mask(argv[++i]);
+		else if (strncmp(arg, "--mute=", 7) == 0)
+			set_mute_mask(arg + 7);
+		else if (is_opt('a'))
+			arg_author = argv[++i];
+		else if (strncmp(arg, "--author=", 9) == 0)
+			arg_author = arg + 9;
+		else if (is_opt('n'))
+			arg_name = argv[++i];
+		else if (strncmp(arg, "--name=", 7) == 0)
+			arg_name = arg + 7;
+		else if (is_opt('d'))
+			arg_date = argv[++i];
+		else if (strncmp(arg, "--date=", 7) == 0)
+			arg_date = arg + 7;
+		else if (strcmp(arg, "--tag") == 0)
+			arg_tag = true;
+		else if (strncmp(arg, "--address=", 10) == 0)
+			set_music_address(arg + 10);
+		else if (is_opt('h') || strcmp(arg, "--help") == 0) {
+			print_help();
+			options_error = NULL;
+		}
+		else if (is_opt('v') || strcmp(arg, "--version") == 0) {
+			printf("asapconv " ASAPInfo_VERSION "\n");
+			options_error = NULL;
+		}
+		else
+			fatal_error("unknown option: %s", arg);
+	}
+	if (options_error != NULL) {
+		fprintf(stderr, "asapconv: %s\n", options_error);
+		print_help();
+		return 1;
+	}
+	return 0;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,519 @@
+// Generated automatically with "cito". Do not edit.
+#pragma once
+#include <stdbool.h>
+#include <stdint.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef struct ASAP ASAP;
+typedef struct ASAPInfo ASAPInfo;
+typedef struct ASAPWriter ASAPWriter;
+
+/**
+ * Format of output samples.
+ */
+typedef enum {
+	/**
+	 * Unsigned 8-bit.
+	 */
+	ASAPSampleFormat_U8,
+	/**
+	 * Signed 16-bit little-endian.
+	 */
+	ASAPSampleFormat_S16_L_E,
+	/**
+	 * Signed 16-bit big-endian.
+	 */
+	ASAPSampleFormat_S16_B_E
+} ASAPSampleFormat;
+
+ASAP *ASAP_New(void);
+void ASAP_Delete(ASAP *self);
+
+/**
+ * Output sample rate.
+ */
+#define ASAP_SAMPLE_RATE 44100
+
+/**
+ * Enables silence detection.
+ * Causes playback to stop after the specified period of silence.
+ * @param self This <code>ASAP</code>.
+ * @param seconds Length of silence which ends playback. Zero disables silence detection.
+ */
+void ASAP_DetectSilence(ASAP *self, int seconds);
+
+/**
+ * Loads music data ("module").
+ * @param self This <code>ASAP</code>.
+ * @param filename Filename, used to determine the format.
+ * @param module Contents of the file.
+ * @param moduleLen Length of the file.
+ */
+bool ASAP_Load(ASAP *self, const char *filename, uint8_t const *module, int moduleLen);
+
+/**
+ * Returns information about the loaded module.
+ * @param self This <code>ASAP</code>.
+ */
+const ASAPInfo *ASAP_GetInfo(const ASAP *self);
+
+/**
+ * Mutes the selected POKEY channels.
+ * @param self This <code>ASAP</code>.
+ * @param mask An 8-bit mask which selects POKEY channels to be muted.
+ */
+void ASAP_MutePokeyChannels(ASAP *self, int mask);
+
+/**
+ * Prepares playback of the specified song of the loaded module.
+ * @param self This <code>ASAP</code>.
+ * @param song Zero-based song index.
+ * @param duration Playback time in milliseconds, -1 means infinity.
+ */
+bool ASAP_PlaySong(ASAP *self, int song, int duration);
+
+/**
+ * Returns current playback position in blocks.
+ * A block is one sample or a pair of samples for stereo.
+ * @param self This <code>ASAP</code>.
+ */
+int ASAP_GetBlocksPlayed(const ASAP *self);
+
+/**
+ * Returns current playback position in milliseconds.
+ * @param self This <code>ASAP</code>.
+ */
+int ASAP_GetPosition(const ASAP *self);
+
+/**
+ * Changes the playback position.
+ * @param self This <code>ASAP</code>.
+ * @param block The requested absolute position in samples (always 44100 per second, even in stereo).
+ */
+bool ASAP_SeekSample(ASAP *self, int block);
+
+/**
+ * Changes the playback position.
+ * @param self This <code>ASAP</code>.
+ * @param position The requested absolute position in milliseconds.
+ */
+bool ASAP_Seek(ASAP *self, int position);
+
+/**
+ * Fills leading bytes of the specified buffer with WAV file header.
+ * Returns the number of changed bytes.
+ * @param self This <code>ASAP</code>.
+ * @param buffer The destination buffer.
+ * @param format Format of samples.
+ * @param metadata Include metadata (title, author, date).
+ */
+int ASAP_GetWavHeader(const ASAP *self, uint8_t *buffer, ASAPSampleFormat format, bool metadata);
+
+/**
+ * Fills the specified buffer with generated samples.
+ * @param self This <code>ASAP</code>.
+ * @param buffer The destination buffer.
+ * @param bufferLen Number of bytes to fill.
+ * @param format Format of samples.
+ */
+int ASAP_Generate(ASAP *self, uint8_t *buffer, int bufferLen, ASAPSampleFormat format);
+
+/**
+ * Returns POKEY channel volume - an integer between 0 and 15.
+ * @param self This <code>ASAP</code>.
+ * @param channel POKEY channel number (from 0 to 7).
+ */
+int ASAP_GetPokeyChannelVolume(const ASAP *self, int channel);
+
+ASAPInfo *ASAPInfo_New(void);
+void ASAPInfo_Delete(ASAPInfo *self);
+
+/**
+ * ASAP version - major part.
+ */
+#define ASAPInfo_VERSION_MAJOR 5
+
+/**
+ * ASAP version - minor part.
+ */
+#define ASAPInfo_VERSION_MINOR 0
+
+/**
+ * ASAP version - micro part.
+ */
+#define ASAPInfo_VERSION_MICRO 1
+
+/**
+ * ASAP version as a string.
+ */
+#define ASAPInfo_VERSION "5.0.1"
+
+/**
+ * Years ASAP was created in.
+ */
+#define ASAPInfo_YEARS "2005-2020"
+
+/**
+ * Short credits for ASAP.
+ */
+#define ASAPInfo_CREDITS "Another Slight Atari Player (C) 2005-2020 Piotr Fusik\nCMC, MPT, TMC, TM2 players (C) 1994-2005 Marcin Lewandowski\nRMT player (C) 2002-2005 Radek Sterba\nDLT player (C) 2009 Marek Konopka\nCMS player (C) 1999 David Spilka\nFC player (C) 2011 Jerzy Kut\n"
+
+/**
+ * Short license notice.
+ * Display after the credits.
+ */
+#define ASAPInfo_COPYRIGHT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+
+/**
+ * Maximum length of a supported input file.
+ * You may assume that files longer than this are not supported by ASAP.
+ */
+#define ASAPInfo_MAX_MODULE_LENGTH 65000
+
+/**
+ * Maximum length of text metadata.
+ */
+#define ASAPInfo_MAX_TEXT_LENGTH 127
+
+/**
+ * Maximum number of songs in a file.
+ */
+#define ASAPInfo_MAX_SONGS 32
+
+/**
+ * Returns author's name.
+ * A nickname may be included in parentheses after the real name.
+ * Multiple authors are separated with <code>" &amp; "</code>.
+ * An empty string means the author is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+const char *ASAPInfo_GetAuthor(const ASAPInfo *self);
+
+/**
+ * Sets author's name.
+ * A nickname may be included in parentheses after the real name.
+ * Multiple authors are separated with <code>" &amp; "</code>.
+ * An empty string means the author is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ * @param value New author's name for the current music.
+ */
+bool ASAPInfo_SetAuthor(ASAPInfo *self, const char *value);
+
+/**
+ * Returns music title.
+ * An empty string means the title is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+const char *ASAPInfo_GetTitle(const ASAPInfo *self);
+
+/**
+ * Sets music title.
+ * An empty string means the title is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ * @param value New title for the current music.
+ */
+bool ASAPInfo_SetTitle(ASAPInfo *self, const char *value);
+
+/**
+ * Returns music title or filename.
+ * If title is unknown returns filename without the path or extension.
+ * @param self This <code>ASAPInfo</code>.
+ */
+const char *ASAPInfo_GetTitleOrFilename(const ASAPInfo *self);
+
+/**
+ * Returns music creation date.
+ * Some of the possible formats are:
+ * <ul>
+ * <li>YYYY</li>
+ * <li>MM/YYYY</li>
+ * <li>DD/MM/YYYY</li>
+ * <li>YYYY-YYYY</li>
+ * </ul>
+ * An empty string means the date is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+const char *ASAPInfo_GetDate(const ASAPInfo *self);
+
+/**
+ * Sets music creation date.
+ * Some of the possible formats are:
+ * <ul>
+ * <li>YYYY</li>
+ * <li>MM/YYYY</li>
+ * <li>DD/MM/YYYY</li>
+ * <li>YYYY-YYYY</li>
+ * </ul>
+ * An empty string means the date is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ * @param value New music creation date.
+ */
+bool ASAPInfo_SetDate(ASAPInfo *self, const char *value);
+
+/**
+ * Returns music creation year.
+ * -1 means the year is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetYear(const ASAPInfo *self);
+
+/**
+ * Returns music creation month (1-12).
+ * -1 means the month is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetMonth(const ASAPInfo *self);
+
+/**
+ * Returns day of month of the music creation date.
+ * -1 means the day is unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetDayOfMonth(const ASAPInfo *self);
+
+/**
+ * Returns 1 for mono or 2 for stereo.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetChannels(const ASAPInfo *self);
+
+/**
+ * Returns number of songs in the file.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetSongs(const ASAPInfo *self);
+
+/**
+ * Returns 0-based index of the "main" song.
+ * The specified song should be played by default.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetDefaultSong(const ASAPInfo *self);
+
+/**
+ * Sets the 0-based index of the "main" song.
+ * @param self This <code>ASAPInfo</code>.
+ * @param song New default song.
+ */
+bool ASAPInfo_SetDefaultSong(ASAPInfo *self, int song);
+
+/**
+ * Returns length of the specified song.
+ * The length is specified in milliseconds. -1 means the length is indeterminate.
+ * @param self This <code>ASAPInfo</code>.
+ * @param song Song to get length of, 0-based.
+ */
+int ASAPInfo_GetDuration(const ASAPInfo *self, int song);
+
+/**
+ * Sets length of the specified song.
+ * The length is specified in milliseconds. -1 means the length is indeterminate.
+ * @param self This <code>ASAPInfo</code>.
+ * @param song Song to set length of, 0-based.
+ * @param duration New length in milliseconds.
+ */
+bool ASAPInfo_SetDuration(ASAPInfo *self, int song, int duration);
+
+/**
+ * Returns information whether the specified song loops.
+ * Returns:
+ * <ul>
+ * <li><code>true</code> if the song loops</li>
+ * <li><code>false</code> if the song stops</li>
+ * </ul>
+ * 
+ * @param self This <code>ASAPInfo</code>.
+ * @param song Song to check for looping, 0-based.
+ */
+bool ASAPInfo_GetLoop(const ASAPInfo *self, int song);
+
+/**
+ * Sets information whether the specified song loops.
+ * Use:
+ * <ul>
+ * <li><code>true</code> if the song loops</li>
+ * <li><code>false</code> if the song stops</li>
+ * </ul>
+ * 
+ * @param self This <code>ASAPInfo</code>.
+ * @param song Song to set as looping, 0-based.
+ * @param loop <code>true</code> if the song loops.
+ */
+bool ASAPInfo_SetLoop(ASAPInfo *self, int song, bool loop);
+
+/**
+ * Returns <code>true</code> for NTSC song and <code>false</code> for PAL song.
+ * @param self This <code>ASAPInfo</code>.
+ */
+bool ASAPInfo_IsNtsc(const ASAPInfo *self);
+
+/**
+ * Returns the letter argument for the TYPE SAP tag.
+ * Returns zero for non-SAP files.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetTypeLetter(const ASAPInfo *self);
+
+/**
+ * Returns player routine rate in Atari scanlines.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetPlayerRateScanlines(const ASAPInfo *self);
+
+/**
+ * Returns approximate player routine rate in Hz.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetPlayerRateHz(const ASAPInfo *self);
+
+/**
+ * Returns the address of the module.
+ * Returns -1 if unknown.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetMusicAddress(const ASAPInfo *self);
+
+/**
+ * Causes music to be relocated.
+ * Use only with <code>ASAPWriter.Write</code>.
+ * @param self This <code>ASAPInfo</code>.
+ * @param address New music address.
+ */
+bool ASAPInfo_SetMusicAddress(ASAPInfo *self, int address);
+
+/**
+ * Returns the address of the player initialization routine.
+ * Returns -1 if no initialization routine.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetInitAddress(const ASAPInfo *self);
+
+/**
+ * Returns the address of the player routine.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetPlayerAddress(const ASAPInfo *self);
+
+/**
+ * Returns the address of the COVOX chip.
+ * Returns -1 if no COVOX enabled.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetCovoxAddress(const ASAPInfo *self);
+
+/**
+ * Retturns the length of the SAP header in bytes.
+ * @param self This <code>ASAPInfo</code>.
+ */
+int ASAPInfo_GetSapHeaderLength(const ASAPInfo *self);
+
+/**
+ * Returns the offset of instrument names for RMT module.
+ * Returns -1 if not an RMT module or RMT module without instrument names.
+ * @param self This <code>ASAPInfo</code>.
+ * @param module Content of the RMT file.
+ * @param moduleLen Length of the RMT file.
+ */
+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 <code>"mm:ss.xxx"</code> format.
+ */
+int ASAPInfo_ParseDuration(const char *s);
+
+/**
+ * Checks whether the filename represents a module type supported by ASAP.
+ * Returns <code>true</code> 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 <code>true</code> 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 <code>ASAPInfo</code>.
+ * @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.
+ */
+const char *ASAPInfo_GetExtDescription(const char *ext);
+
+/**
+ * Returns the extension of the original module format.
+ * For native modules it simply returns their extension.
+ * For the SAP format it attempts to detect the original module format.
+ * @param self This <code>ASAPInfo</code>.
+ * @param module Contents of the file.
+ * @param moduleLen Length of the file.
+ */
+const char *ASAPInfo_GetOriginalModuleExt(const ASAPInfo *self, uint8_t const *module, int moduleLen);
+
+ASAPWriter *ASAPWriter_New(void);
+void ASAPWriter_Delete(ASAPWriter *self);
+
+/**
+ * Maximum number of extensions returned by <code>GetSaveExts</code>.
+ */
+#define ASAPWriter_MAX_SAVE_EXTS 3
+
+/**
+ * Maximum length of text representation of a duration.
+ * Corresponds to the longest format which is <code>"mm:ss.xxx"</code>.
+ */
+#define ASAPWriter_MAX_DURATION_LENGTH 9
+
+/**
+ * Enumerates possible file types the given module can be written as.
+ * Returns the number of extensions written to <code>exts</code>.
+ * @param exts Receives filename extensions without the leading dot.
+ * @param info File information.
+ * @param module Contents of the file.
+ * @param moduleLen Length of the file.
+ */
+int ASAPWriter_GetSaveExts(const char **exts, const ASAPInfo *info, uint8_t const *module, int moduleLen);
+
+/**
+ * Writes text representation of the given duration.
+ * Returns the number of bytes written to <code>result</code>.
+ * @param result The output buffer.
+ * @param value Number of milliseconds.
+ */
+int ASAPWriter_DurationToString(uint8_t *result, int value);
+
+/**
+ * Sets the destination array for <code>Write</code>.
+ * @param self This <code>ASAPWriter</code>.
+ * @param output The destination array.
+ * @param startIndex The array offset to start writing at.
+ * @param endIndex The array offset to finish writing before.
+ */
+void ASAPWriter_SetOutput(ASAPWriter *self, uint8_t *output, int startIndex, int endIndex);
+
+/**
+ * Writes the given module in a possibly different file format.
+ * @param self This <code>ASAPWriter</code>.
+ * @param targetFilename Output filename, used to determine the format.
+ * @param info File information got from the source file with data updated for the output file.
+ * @param module Contents of the source file.
+ * @param moduleLen Length of the source file.
+ * @param tag Display information (xex output only).
+ */
+int ASAPWriter_Write(ASAPWriter *self, const char *targetFilename, const ASAPInfo *info, uint8_t const *module, int moduleLen, bool tag);
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapinfo.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapinfo.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapinfo.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapinfo.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,1882 @@
+// asapinfo.ci - module parser
+//
+// Copyright (C) 2010-2020  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+enum ASAPModuleType
+{
+	SapB,
+	SapC,
+	SapD,
+	SapS,
+	Cmc,
+	Cm3,
+	Cmr,
+	Cms,
+	Dlt,
+	Mpt,
+	Rmt,
+	Tmc,
+	Tm2,
+	Fc
+#if EXPERIMENTAL_XEX
+	// actually it works, but without VBLKI it's practically useless
+	, Xex
+#endif
+}
+
+class DurationParser
+{
+	string Source;
+	int Position;
+	int Length;
+
+	int ParseDigit!(int max)
+		throws
+	{
+		if (Position >= Length)
+			throw "Invalid duration";
+		int digit = Source[Position++] - '0';
+		if (digit < 0 || digit > max)
+			throw "Invalid duration";
+		return digit;
+	}
+
+	internal int Parse!(string s)
+		throws
+	{
+		Source = s;
+		Position = 0;
+		Length = s.Length;
+		int result = ParseDigit(9);
+		int digit;
+		if (Position < Length) {
+			digit = s[Position] - '0';
+			if (digit >= 0 && digit <= 9) {
+				Position++;
+				result = result * 10 + digit;
+			}
+			if (Position < Length && s[Position] == ':') {
+				Position++;
+				digit = ParseDigit(5);
+				result = result * 60 + digit * 10;
+				digit = ParseDigit(9);
+				result += digit;
+			}
+		}
+		result *= 1000;
+		if (Position >= Length)
+			return result;
+		if (s[Position++] != '.')
+			throw "Invalid duration";
+		digit = ParseDigit(9);
+		result += digit * 100;
+		if (Position >= Length)
+			return result;
+		digit = ParseDigit(9);
+		result += digit * 10;
+		if (Position >= Length)
+			return result;
+		digit = ParseDigit(9);
+		result += digit;
+		return result;
+	}
+}
+
+/// Information about a music file.
+public class ASAPInfo
+{
+	/// ASAP version - major part.
+	public const int VersionMajor = 5;
+	/// ASAP version - minor part.
+	public const int VersionMinor = 0;
+	/// ASAP version - micro part.
+	public const int VersionMicro = 1;
+	/// ASAP version as a string.
+	public const string Version = VersionMajor + "." + VersionMinor + "." + VersionMicro;
+
+	/// Years ASAP was created in.
+	public const string Years = "2005-2020";
+
+	/// Short credits for ASAP.
+	public const string Credits =
+		"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" +
+		"CMS player (C) 1999 David Spilka\n" +
+		"FC player (C) 2011 Jerzy Kut\n";
+
+	/// Short license notice.
+	/// Display after the credits.
+	public const string Copyright =
+		"This program is free software; you can redistribute it and/or modify it " +
+		"under the terms of the GNU General Public License as published " +
+		"by the Free Software Foundation; either version 2 of the License, " +
+		"or (at your option) any later version.";
+
+	/// Maximum length of a supported input file.
+	/// You may assume that files longer than this are not supported by ASAP.
+	public const int MaxModuleLength = 65000;
+
+	/// Maximum length of text metadata.
+	public const int MaxTextLength = 127;
+
+	/// Maximum number of songs in a file.
+	public const int MaxSongs = 32;
+
+	string() Filename;
+	string() Author;
+	string() Title;
+	string() Date;
+	int Channels;
+	int Songs;
+	int DefaultSong;
+	int[MaxSongs] Durations;
+	bool[MaxSongs] Loops;
+	bool Ntsc;
+	internal ASAPModuleType Type;
+	int Fastplay;
+	int Music;
+	int Init;
+	internal int Player;
+	int CovoxAddr;
+	internal int HeaderLen;
+	internal byte[MaxSongs] SongPos;
+
+	public ASAPInfo()
+	{
+	}
+
+	static bool IsValidChar(int c) => c >= ' ' && c <= '|' && c != '`' && c != '{';
+
+	static void CheckValidChar(int c)
+		throws
+	{
+		if (!IsValidChar(c))
+			throw "Invalid character";
+	}
+
+	static void CheckValidText(string s)
+		throws
+	{
+		int n = s.Length;
+		if (n > MaxTextLength)
+			throw "Text too long";
+		for (int i = 0; i < n; i++)
+			CheckValidChar(s[i]);
+	}
+
+	/// 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
+	{
+		CheckValidText(value);
+		Author = value;
+	}
+
+	/// 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
+	{
+		CheckValidText(value);
+		Title = value;
+	}
+
+	/// 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
+	{
+		CheckValidText(value);
+		Date = value;
+	}
+
+	bool CheckTwoDateDigits(int i)
+	{
+		int d1 = Date[i];
+		int d2 = Date[i + 1];
+		return d1 >= '0' && d1 <= '9' && d2 >= '0' && d2 <= '9';
+	}
+
+	int CheckDate()
+	{
+		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;
+		}
+	}
+
+	int GetTwoDateDigits(int i) => (Date[i] - '0') * 10 + Date[i + 1] - '0';
+
+	/// 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
+	{
+		if (moduleLen != 0x2c06 && moduleLen != 0x2c07)
+			throw "Invalid module length";
+		Type = ASAPModuleType.Dlt;
+		ParseModule(module, moduleLen);
+		if (Music != 0x2000)
+			throw "Unsupported module address";
+		bool[128] seen = false;
+		Songs = 0;
+		for (int pos = 0; pos < 128 && Songs < MaxSongs; pos++) {
+			if (!seen[pos])
+				ParseDltSong(module, seen, pos);
+		}
+		if (Songs == 0)
+			throw "No songs found";
+	}
+
+	void ParseMptSong!(byte[] module, bool[]! globalSeen, int songLen, int pos)
+	{
+		int addrToOffset = GetWord(module, 2) - 6;
+		int tempo = module[0x1cf];
+		int playerCalls = 0;
+		byte[256] seen = 0;
+		int[4] patternOffset;
+		int[4] blankRows = 0;
+		int[4] blankRowsCounter;
+		while (pos < songLen) {
+			if (seen[pos] != 0) {
+				if (seen[pos] != SeenThisCall)
+					Loops[Songs] = true;
+				break;
+			}
+			seen[pos] = SeenThisCall;
+			globalSeen[pos] = true;
+			int i = module[0x1d0 + pos * 2];
+			if (i == 0xff) {
+				pos = module[0x1d1 + pos * 2];
+				continue;
+			}
+			int ch;
+			for (ch = 3; ch >= 0; ch--) {
+				i = module[0x1c6 + ch] + (module[0x1ca + ch] << 8) - addrToOffset;
+				i = module[i + pos * 2];
+				if (i >= 0x40)
+					break;
+				i <<= 1;
+				i = GetWord(module, 0x46 + i);
+				patternOffset[ch] = i == 0 ? 0 : i - addrToOffset;
+				blankRowsCounter[ch] = 0;
+			}
+			if (ch >= 0)
+				break;
+			for (i = 0; i < songLen; i++)
+				if (seen[i] == SeenThisCall)
+					seen[i] = SeenBefore;
+			for (int patternRows = module[0x1ce]; --patternRows >= 0; ) {
+				for (ch = 3; ch >= 0; ch--) {
+					if (patternOffset[ch] == 0 || --blankRowsCounter[ch] >= 0)
+						continue;
+					for (;;) {
+						i = module[patternOffset[ch]++];
+						if (i < 0x40 || i == 0xfe)
+							break;
+						if (i < 0x80)
+							continue;
+						if (i < 0xc0) {
+							blankRows[ch] = i - 0x80;
+							continue;
+						}
+						if (i < 0xd0)
+							continue;
+						if (i < 0xe0) {
+							tempo = i - 0xcf;
+							continue;
+						}
+						patternRows = 0;
+					}
+					blankRowsCounter[ch] = blankRows[ch];
+				}
+				playerCalls += tempo;
+			}
+			pos++;
+		}
+		if (playerCalls > 0)
+			AddSong(playerCalls);
+	}
+
+	void ParseMpt!(byte[] module, int moduleLen)
+		throws
+	{
+		if (moduleLen < 0x1d0)
+			throw "Module too short";
+		Type = ASAPModuleType.Mpt;
+		ParseModule(module, moduleLen);
+		int track0Addr = GetWord(module, 2) + 0x1ca;
+		if (module[0x1c6] + (module[0x1ca] << 8) != track0Addr)
+			throw "Invalid address of the first track";
+		// Calculate the length of the first track. Address of the second track minus
+		// address of the first track equals the length of the first track in bytes.
+		// Divide by two to get number of track positions.
+		int songLen = (module[0x1c7] + (module[0x1cb] << 8) - track0Addr) >> 1;
+		if (songLen > 0xfe)
+			throw "Song too long";
+		// `globalSeen[i] == true` if the track position `i` has been processed
+		bool[256] globalSeen = false;
+		Songs = 0;
+		for (int pos = 0; pos < songLen && Songs < MaxSongs; pos++) {
+			if (!globalSeen[pos]) {
+				SongPos[Songs] = pos;
+				ParseMptSong(module, globalSeen, songLen, pos);
+			}
+		}
+		if (Songs == 0)
+			throw "No songs found";
+	}
+
+	static int GetRmtInstrumentFrames(byte[] module, int instrument, int volume, int volumeFrame, bool onExtraPokey)
+	{
+		int addrToOffset = GetWord(module, 2) - 6;
+		instrument = GetWord(module, 0xe) - addrToOffset + (instrument << 1);
+		if (module[instrument + 1] == 0)
+			return 0;
+		instrument = GetWord(module, instrument) - addrToOffset;
+		int perFrame = module[0xc];
+		int playerCall = volumeFrame * perFrame;
+		int playerCalls = playerCall;
+		int index = module[instrument] + 1 + playerCall * 3;
+		int indexEnd = module[instrument + 2] + 3;
+		int indexLoop = module[instrument + 3];
+		if (indexLoop >= indexEnd)
+			return 0; // error
+		int volumeSlideDepth = module[instrument + 6];
+		int volumeMin = module[instrument + 7];
+		const byte[] rmtVolumeSilent = { 16, 8, 4, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1 };
+		if (index >= indexEnd)
+			index = (index - indexEnd) % (indexEnd - indexLoop) + indexLoop;
+		else {
+			do {
+				int vol = module[instrument + index];
+				if (onExtraPokey)
+					vol >>= 4;
+				if ((vol & 0xf) >= rmtVolumeSilent[volume])
+					playerCalls = playerCall + 1;
+				playerCall++;
+				index += 3;
+			} while (index < indexEnd);
+		}
+		if (volumeSlideDepth == 0)
+			return playerCalls / perFrame;
+		int volumeSlide = 128;
+		bool silentLoop = false;
+		for (;;) {
+			if (index >= indexEnd) {
+				if (silentLoop)
+					break;
+				silentLoop = true;
+				index = indexLoop;
+			}
+			int vol = module[instrument + index];
+			if (onExtraPokey)
+				vol >>= 4;
+			if ((vol & 0xf) >= rmtVolumeSilent[volume]) {
+				playerCalls = playerCall + 1;
+				silentLoop = false;
+			}
+			playerCall++;
+			index += 3;
+			volumeSlide -= volumeSlideDepth;
+			if (volumeSlide < 0) {
+				volumeSlide += 256;
+				if (--volume <= volumeMin)
+					break;
+			}
+		}
+		return playerCalls / perFrame;
+	}
+
+	void ParseRmtSong!(byte[] module, bool[]! globalSeen, int songLen, int posShift, int pos)
+	{
+		int addrToOffset = GetWord(module, 2) - 6;
+		int tempo = module[0xb];
+		int frames = 0;
+		int songOffset = GetWord(module, 0x14) - addrToOffset;
+		int patternLoOffset = GetWord(module, 0x10) - addrToOffset;
+		int patternHiOffset = GetWord(module, 0x12) - addrToOffset;
+		byte[256] seen = 0;
+		int[8] patternBegin;
+		int[8] patternOffset;
+		int[8] blankRows;
+		int[8] instrumentNo = 0;
+		int[8] instrumentFrame = 0;
+		int[8] volumeValue = 0;
+		int[8] volumeFrame = 0;
+		while (pos < songLen) {
+			if (seen[pos] != 0) {
+				if (seen[pos] != SeenThisCall)
+					Loops[Songs] = true;
+				break;
+			}
+			seen[pos] = SeenThisCall;
+			globalSeen[pos] = true;
+			if (module[songOffset + (pos << posShift)] == 0xfe) {
+				pos = module[songOffset + (pos << posShift) + 1];
+				continue;
+			}
+			for (int ch = 0; ch < 1 << posShift; ch++) {
+				int p = module[songOffset + (pos << posShift) + ch];
+				if (p == 0xff)
+					blankRows[ch] = 256;
+				else {
+					patternOffset[ch] = patternBegin[ch] = module[patternLoOffset + p]
+						+ (module[patternHiOffset + p] << 8) - addrToOffset;
+					if (patternOffset[ch] < 0)
+						return; // badly ripped alien.rmt
+					blankRows[ch] = 0;
+				}
+			}
+			for (int i = 0; i < songLen; i++)
+				if (seen[i] == SeenThisCall)
+					seen[i] = SeenBefore;
+			for (int patternRows = module[0xa]; --patternRows >= 0; ) {
+				for (int ch = 0; ch < 1 << posShift; ch++) {
+					if (--blankRows[ch] > 0)
+						continue;
+					for (;;) {
+						int i = module[patternOffset[ch]++];
+						if ((i & 0x3f) < 62) {
+							i += module[patternOffset[ch]++] << 8;
+							if ((i & 0x3f) != 61) {
+								instrumentNo[ch] = i >> 10;
+								instrumentFrame[ch] = frames;
+							}
+							volumeValue[ch] = (i >> 6) & 0xf;
+							volumeFrame[ch] = frames;
+							break;
+						}
+						if (i == 62) {
+							blankRows[ch] = module[patternOffset[ch]++];
+							break;
+						}
+						if ((i & 0x3f) == 62) {
+							blankRows[ch] = i >> 6;
+							break;
+						}
+						if ((i & 0xbf) == 63) {
+							tempo = module[patternOffset[ch]++];
+							continue;
+						}
+						if (i == 0xbf) {
+							patternOffset[ch] = patternBegin[ch] + module[patternOffset[ch]];
+							continue;
+						}
+						// assert(i == 0xff);
+						patternRows = -1;
+						break;
+					}
+					if (patternRows < 0)
+						break;
+				}
+				if (patternRows >= 0)
+					frames += tempo;
+			}
+			pos++;
+		}
+		int instrumentFrames = 0;
+		for (int ch = 0; ch < 1 << posShift; ch++) {
+			int frame = instrumentFrame[ch];
+			frame += GetRmtInstrumentFrames(module, instrumentNo[ch], volumeValue[ch], volumeFrame[ch] - frame, ch >= 4);
+			if (instrumentFrames < frame)
+				instrumentFrames = frame;
+		}
+		if (frames > instrumentFrames) {
+			if (frames - instrumentFrames > 100)
+				Loops[Songs] = false;
+			frames = instrumentFrames;
+		}
+		if (frames > 0)
+			AddSong(frames);
+	}
+
+	static bool ValidateRmt(byte[] module, int moduleLen)
+	{
+		if (moduleLen < 0x30)
+			return false;
+		if (module[6] != 'R' || module[7] != 'M' || module[8] != 'T' || module[0xd] != 1)
+			return false;
+		return true;
+	}
+
+	void ParseRmt!(byte[] module, int moduleLen)
+		throws
+	{
+		if (!ValidateRmt(module, moduleLen))
+			throw "Invalid RMT file";
+		int posShift;
+		switch (module[9]) {
+		case '4':
+			posShift = 2;
+			break;
+		case '8':
+			Channels = 2;
+			posShift = 3;
+			break;
+		default:
+			throw "Unsupported number of channels";
+		}
+		int perFrame = module[0xc];
+		if (perFrame < 1 || perFrame > 4)
+			throw "Unsupported player call rate";
+		Type = ASAPModuleType.Rmt;
+		ParseModule(module, moduleLen);
+		int blockLen = GetWord(module, 4) + 1 - Music;
+		int songLen = GetWord(module, 4) + 1 - GetWord(module, 0x14);
+		if (posShift == 3 && (songLen & 4) != 0 && module[6 + blockLen - 4] == 0xfe)
+			songLen += 4;
+		songLen >>= posShift;
+		if (songLen >= 0x100)
+			throw "Song too long";
+		bool[256] globalSeen = false;
+		Songs = 0;
+		for (int pos = 0; pos < songLen && Songs < MaxSongs; pos++) {
+			if (!globalSeen[pos]) {
+				SongPos[Songs] = pos;
+				ParseRmtSong(module, globalSeen, songLen, posShift, pos);
+			}
+		}
+		// must set Fastplay after song durations calculations, so they assume 312
+		Fastplay = 312 / perFrame;
+		Player = 0x600;
+		if (Songs == 0)
+			throw "No songs found";
+		byte[MaxTextLength] title;
+		int titleLen;
+		for (titleLen = 0; titleLen < MaxTextLength && 10 + blockLen + titleLen < moduleLen; titleLen++) {
+			int c = module[10 + blockLen + titleLen];
+			if (c == 0)
+				break;
+			// RMT only allows entering characters we consider valid, but let's check just in case
+			title[titleLen] = IsValidChar(c) ? c : ' ';
+		}
+		Title = Encoding.UTF8.GetString(title, 0, titleLen);
+	}
+
+	void ParseTmcSong!(byte[] module, int pos)
+	{
+		int addrToOffset = GetWord(module, 2) - 6;
+		int tempo = module[0x24] + 1;
+		int frames = 0;
+		int[8] patternOffset;
+		int[8] blankRows;
+		while (module[0x1a6 + 15 + pos] < 0x80) {
+			for (int ch = 7; ch >= 0; ch--) {
+				int pat = module[0x1a6 + 15 + pos - 2 * ch];
+				patternOffset[ch] = module[0xa6 + pat] + (module[0x126 + pat] << 8) - addrToOffset;
+				blankRows[ch] = 0;
+			}
+			for (int patternRows = 64; --patternRows >= 0; ) {
+				for (int ch = 7; ch >= 0; ch--) {
+					if (--blankRows[ch] >= 0)
+						continue;
+					for (;;) {
+						int i = module[patternOffset[ch]++];
+						if (i < 0x40) {
+							patternOffset[ch]++;
+							break;
+						}
+						if (i == 0x40) {
+							i = module[patternOffset[ch]++];
+							if ((i & 0x7f) == 0)
+								patternRows = 0;
+							else
+								tempo = (i & 0x7f) + 1;
+							if (i >= 0x80)
+								patternOffset[ch]++;
+							break;
+						}
+						if (i < 0x80) {
+							i = module[patternOffset[ch]++] & 0x7f;
+							if (i == 0)
+								patternRows = 0;
+							else
+								tempo = i + 1;
+							patternOffset[ch]++;
+							break;
+						}
+						if (i < 0xc0)
+							continue;
+						blankRows[ch] = i - 0xbf;
+						break;
+					}
+				}
+				frames += tempo;
+			}
+			pos += 16;
+		}
+		if (module[0x1a6 + 14 + pos] < 0x80)
+			Loops[Songs] = true;
+		AddSong(frames);
+	}
+
+	static int ParseTmcTitle(byte[]! title, int titleLen, byte[] module, int moduleOffset)
+	{
+		int lastOffset = moduleOffset + 29;
+		while (module[lastOffset] == ' ') {
+			if (--lastOffset < moduleOffset)
+				return titleLen;
+		}
+		if (titleLen > 0) {
+			title[titleLen++] = ' ';
+			title[titleLen++] = '|';
+			title[titleLen++] = ' ';
+		}
+		while (moduleOffset <= lastOffset) {
+			int c = module[moduleOffset++] & 0x7f;
+			switch (c) {
+			case 't' - 96:
+				c = '*';
+				break;
+			// Replace Polish letters with their English equivalents.
+			// This is common practice when Polish letters are unavailable.
+			case 'a' - 96:
+			case 'c' - 96:
+			case 'e' - 96:
+			case 'l' - 96:
+			case 'n' - 96:
+			case 'o' - 96:
+			case 's' - 96:
+				c += 96;
+				break;
+			case 'x' - 96:
+			case 'z' - 96:
+				c = 'z';
+				break;
+			default:
+				if (!IsValidChar(c))
+					c = ' ';
+				break;
+			}
+			title[titleLen++] = c;
+		}
+		return titleLen;
+	}
+
+	void ParseTmc!(byte[] module, int moduleLen)
+		throws
+	{
+		if (moduleLen < 0x1d0)
+			throw "Module too short";
+		Type = ASAPModuleType.Tmc;
+		ParseModule(module, moduleLen);
+		Channels = 2;
+		int i = 0;
+		// find first instrument
+		while (module[0x66 + i] == 0) {
+			if (++i >= 64)
+				throw "No instruments";
+		}
+		int lastPos = (module[0x66 + i] << 8) + module[0x26 + i] - GetWord(module, 2) - 0x1b0;
+		if (0x1b5 + lastPos >= moduleLen)
+			throw "Module too short";
+		// skip trailing jumps
+		do {
+			if (lastPos <= 0)
+				throw "No songs found";
+			lastPos -= 16;
+		} while (module[0x1b5 + lastPos] >= 0x80);
+		Songs = 0;
+		ParseTmcSong(module, 0);
+		for (i = 0; i < lastPos && Songs < MaxSongs; i += 16)
+			if (module[0x1b5 + i] >= 0x80)
+				ParseTmcSong(module, i + 16);
+		// must set fastplay after song durations calculations, so they assume 312
+		i = module[0x25];
+		if (i < 1 || i > 4)
+			throw "Unsupported player call rate";
+		Fastplay = 312 / i;
+		byte[MaxTextLength] title;
+		int titleLen = ParseTmcTitle(title, 0, module, 6);
+		Title = Encoding.UTF8.GetString(title, 0, titleLen);
+	}
+
+	void ParseTm2Song!(byte[] module, int pos)
+	{
+		int addrToOffset = GetWord(module, 2) - 6;
+		int tempo = module[0x24] + 1;
+		int playerCalls = 0;
+		int[8] patternOffset;
+		int[8] blankRows;
+		for (;;) {
+			int patternRows = module[0x386 + 16 + pos];
+			if (patternRows == 0)
+				break;
+			if (patternRows >= 0x80) {
+				Loops[Songs] = true;
+				break;
+			}
+			for (int ch = 7; ch >= 0; ch--) {
+				int pat = module[0x386 + 15 + pos - 2 * ch];
+				patternOffset[ch] = module[0x106 + pat] + (module[0x206 + pat] << 8) - addrToOffset;
+				blankRows[ch] = 0;
+			}
+			while (--patternRows >= 0) {
+				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;
+						}
+						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);
+		}
+		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);
+	}
+
+	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++) {
+					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))
+					break;
+				playerCalls += module[2];
+			}
+
+			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);
+		}
+	}
+
+	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(string s, int minVal, int maxVal)
+		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;
+	}
+
+	static int ParseHex(string s)
+		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;
+	}
+
+	/// 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 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";
+
+			// 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;
+			}
+		}
+
+		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;
+	}
+
+	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)
+	{
+		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;
+	}
+
+	static bool IsOurPackedExt(int ext)
+	{
+		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;
+		}
+	}
+
+	/// 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 (ValidateSap(module, moduleLen))
+			return PackExt("SAP");
+		if (ValidateFc(module, moduleLen))
+			return PackExt("FC");
+		if (ValidateRmt(module, moduleLen))
+			return PackExt("RMT");
+		throw "Unknown format";
+	}
+
+	/// 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
+	{
+		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 !ASAP_ONLY_SAP
+
+	/// Returns human-readable description of the filename extension.
+	public static string GetExtDescription(
+		/// Filename extension without the leading dot.
+		string ext)
+		throws
+	{
+		switch (PackExt(ext)) {
+		case PackExt("SAP"): return "Slight Atari Player";
+		case PackExt("CMC"): return "Chaos Music Composer";
+		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("DLT"): return "Delta Music Composer";
+		case PackExt("MPT"): return "Music ProTracker";
+		case PackExt("MPD"): return "MPT DoublePlay";
+		case PackExt("RMT"): return "Raster Music Tracker";
+		case PackExt("TMC"):
+		case PackExt("TM8"): return "Theta Music Composer 1.x";
+		case PackExt("TM2"): return "Theta Music Composer 2.x";
+		case PackExt("FC"): return "Future Composer";
+		case PackExt("XEX"): return "Atari 8-bit executable";
+		default: throw "Unknown extension";
+		}
+	}
+
+	const int RmtInit = 0xc80;
+
+	internal int GetRmtSapOffset(byte[] module, int moduleLen)
+	{
+		if (Player != 0x3403)
+			return -1;
+		int offset = HeaderLen + GetWord(module, HeaderLen + 4) - GetWord(module, HeaderLen + 2) + 7;
+		if (offset + 6 >= moduleLen || module[offset + 4] != 'R' || module[offset + 5] != 'M' || module[offset + 6] != 'T')
+			return -1;
+		return offset;
+	}
+
+	internal ASAPModuleType GetOriginalModuleType(
+		byte[] module,
+		int moduleLen)
+	{
+		switch (Type) {
+		case ASAPModuleType.SapB:
+			if ((Init == 0x3fb || Init == 0x3f9) && Player == 0x503)
+				return ASAPModuleType.Dlt;
+			if (((Init == 0x4f3 || Init == 0x4ef) && Player == 0x503) || (Init == 0xf4f3 && Player == 0xf503))
+				return ASAPModuleType.Mpt;
+			if (Init == RmtInit || GetRmtSapOffset(module, moduleLen) > 0)
+				return ASAPModuleType.Rmt;
+			if ((Init == 0x4f5 || Init == 0xf4f5 || Init == 0x4f2)
+			 || ((Init == 0x4e7 || Init == 0xf4e7 || Init == 0x4e4) && Fastplay == 156)
+			 || ((Init == 0x4e5 || Init == 0xf4e5 || Init == 0x4e2) && (Fastplay == 104 || Fastplay == 78)))
+				return ASAPModuleType.Tmc;
+			if ((Init == 0x1080 && Player == 0x503) || (Init == 0x1380 && Player == 0x803))
+				return ASAPModuleType.Tm2;
+			if (Init == 0x400 && Player == 0x403)
+				return ASAPModuleType.Fc;
+			return Type;
+		case ASAPModuleType.SapC:
+			if ((Player == 0x500 || Player == 0xf500) && moduleLen >= 1024) {
+				if (Channels > 1)
+					return ASAPModuleType.Cms;
+				if (module[moduleLen - 170] == 0x1e)
+					return ASAPModuleType.Cmr;
+				if (module[moduleLen - 909] == 0x30)
+					return ASAPModuleType.Cm3;
+				return ASAPModuleType.Cmc;
+			}
+			return Type;
+		default:
+			return Type;
+		}
+	}
+
+	/// Returns the extension of the original module format.
+	/// For native modules it simply returns their extension.
+	/// For the SAP format it attempts to detect the original module format.
+	public string GetOriginalModuleExt(
+		/// Contents of the file.
+		byte[] module,
+		/// Length of the file.
+		int moduleLen)
+	{
+		switch (GetOriginalModuleType(module, moduleLen)) {
+		case ASAPModuleType.Cmc:
+			return Fastplay == 156 ? "dmc" : "cmc";
+		case ASAPModuleType.Cm3:
+			return "cm3";
+		case ASAPModuleType.Cmr:
+			return "cmr";
+		case ASAPModuleType.Cms:
+			return "cms";
+		case ASAPModuleType.Dlt:
+			return "dlt";
+		case ASAPModuleType.Mpt:
+			return Fastplay == 156 ? "mpd" : "mpt";
+		case ASAPModuleType.Rmt:
+			return "rmt";
+		case ASAPModuleType.Tmc:
+			return "tmc";
+		case ASAPModuleType.Tm2:
+			return "tm2";
+		case ASAPModuleType.Fc:
+			return "fc";
+		default:
+			return null;
+		}
+	}
+
+#endif
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapscan.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapscan.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapscan.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapscan.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,576 @@
+/*
+ * asapscan.c - Atari 8-bit music analyzer
+ *
+ * Copyright (C) 2007-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "asap-asapscan.h"
+
+static bool detect_time = false;
+static int scan_frames;
+static int silence_frames;
+static int loop_check_frames;
+static int loop_min_frames;
+static int frame;
+static unsigned char *registers_dump;
+#define HASH_BITS  8
+static int hash_first[1 << HASH_BITS];
+static int *hash_next;
+static int hash_last[1 << HASH_BITS];
+
+static ASAP *asap;
+static bool dump = false;
+static bool fingerprint = false;
+static bool long_fingerprint = false;
+
+#define FEATURE_CHECK          1
+#define FEATURE_15_KHZ         2
+#define FEATURE_HIPASS_FILTER  4
+#define FEATURE_LOW_OF_16_BIT  8
+#define FEATURE_9_BIT_POLY     16
+#define FEATURE_ULTRASOUND     32
+static int features = 0;
+
+#define CPU_TRACE_PRINT        1
+#define CPU_TRACE_UNOFFICIAL   2
+#define CPU_TRACE_PC_TIME      4
+static int cpu_trace = 0;
+static void trace_cpu(void);
+
+static int print_time_at_pc = -1;
+
+static bool acid = false;
+static int exit_code = 0;
+
+#include "asap-asapscan.c"
+
+#define CYCLES_PER_FRAME (asap->moduleInfo.ntsc ? 262 * 114 : 312 * 114)
+#define MAIN_CLOCK (asap->moduleInfo.ntsc ? 1789772 : 1773447)
+
+static int seconds_to_frames(int seconds)
+{
+	return (int) ((double) seconds * MAIN_CLOCK / CYCLES_PER_FRAME);
+}
+
+static int frames_to_milliseconds(int frames)
+{
+	return (int) ceil(frames * 1000.0 * CYCLES_PER_FRAME / MAIN_CLOCK);
+}
+
+static void print_time(int frames, bool loop)
+{
+	int duration = frames_to_milliseconds(frames);
+	printf("TIME %02d:%02d.%02d%s\n", duration / 60000, duration / 1000 % 60, duration / 10 % 100, loop ? " LOOP" : "");
+}
+
+static const char cpu_mnemonics[256][10] = {
+	"BRK", "ORA (1,X)", "CIM", "ASO (1,X)", "NOP 1", "ORA 1", "ASL 1", "ASO 1",
+	"PHP", "ORA #1", "ASL", "ANC #1", "NOP 2", "ORA 2", "ASL 2", "ASO 2",
+	"BPL 0", "ORA (1),Y", "CIM", "ASO (1),Y", "NOP 1,X", "ORA 1,X", "ASL 1,X", "ASO 1,X",
+	"CLC", "ORA 2,Y", "NOP !", "ASO 2,Y", "NOP 2,X", "ORA 2,X", "ASL 2,X", "ASO 2,X",
+	"JSR 2", "AND (1,X)", "CIM", "RLA (1,X)", "BIT 1", "AND 1", "ROL 1", "RLA 1",
+	"PLP", "AND #1", "ROL", "ANC #1", "BIT 2", "AND 2", "ROL 2", "RLA 2",
+	"BMI 0", "AND (1),Y", "CIM", "RLA (1),Y", "NOP 1,X", "AND 1,X", "ROL 1,X", "RLA 1,X",
+	"SEC", "AND 2,Y", "NOP !", "RLA 2,Y", "NOP 2,X", "AND 2,X", "ROL 2,X", "RLA 2,X",
+
+	"RTI", "EOR (1,X)", "CIM", "LSE (1,X)", "NOP 1", "EOR 1", "LSR 1", "LSE 1",
+	"PHA", "EOR #1", "LSR", "ALR #1", "JMP 2", "EOR 2", "LSR 2", "LSE 2",
+	"BVC 0", "EOR (1),Y", "CIM", "LSE (1),Y", "NOP 1,X", "EOR 1,X", "LSR 1,X", "LSE 1,X",
+	"CLI", "EOR 2,Y", "NOP !", "LSE 2,Y", "NOP 2,X", "EOR 2,X", "LSR 2,X", "LSE 2,X",
+	"RTS", "ADC (1,X)", "CIM", "RRA (1,X)", "NOP 1", "ADC 1", "ROR 1", "RRA 1",
+	"PLA", "ADC #1", "ROR", "ARR #1", "JMP (2)", "ADC 2", "ROR 2", "RRA 2",
+	"BVS 0", "ADC (1),Y", "CIM", "RRA (1),Y", "NOP 1,X", "ADC 1,X", "ROR 1,X", "RRA 1,X",
+	"SEI", "ADC 2,Y", "NOP !", "RRA 2,Y", "NOP 2,X", "ADC 2,X", "ROR 2,X", "RRA 2,X",
+
+	"NOP #1", "STA (1,X)", "NOP #1", "SAX (1,X)", "STY 1", "STA 1", "STX 1", "SAX 1",
+	"DEY", "NOP #1", "TXA", "ANE #1", "STY 2", "STA 2", "STX 2", "SAX 2",
+	"BCC 0", "STA (1),Y", "CIM", "SHA (1),Y", "STY 1,X", "STA 1,X", "STX 1,Y", "SAX 1,Y",
+	"TYA", "STA 2,Y", "TXS", "SHS 2,Y", "SHY 2,X", "STA 2,X", "SHX 2,Y", "SHA 2,Y",
+	"LDY #1", "LDA (1,X)", "LDX #1", "LAX (1,X)", "LDY 1", "LDA 1", "LDX 1", "LAX 1",
+	"TAY", "LDA #1", "TAX", "ANX #1", "LDY 2", "LDA 2", "LDX 2", "LAX 2",
+	"BCS 0", "LDA (1),Y", "CIM", "LAX (1),Y", "LDY 1,X", "LDA 1,X", "LDX 1,Y", "LAX 1,X",
+	"CLV", "LDA 2,Y", "TSX", "LAS 2,Y", "LDY 2,X", "LDA 2,X", "LDX 2,Y", "LAX 2,Y",
+
+	"CPY #1", "CMP (1,X)", "NOP #1", "DCM (1,X)", "CPY 1", "CMP 1", "DEC 1", "DCM 1",
+	"INY", "CMP #1", "DEX", "SBX #1", "CPY 2", "CMP 2", "DEC 2", "DCM 2",
+	"BNE 0", "CMP (1),Y", "CIM", "DCM (1),Y", "NOP 1,X", "CMP 1,X", "DEC 1,X", "DCM 1,X",
+	"CLD", "CMP 2,Y", "NOP !", "DCM 2,Y", "NOP 2,X", "CMP 2,X", "DEC 2,X", "DCM 2,X",
+
+	"CPX #1", "SBC (1,X)", "NOP #1", "INS (1,X)", "CPX 1", "SBC 1", "INC 1", "INS 1",
+	"INX", "SBC #1", "NOP", "SBC #1 !", "CPX 2", "SBC 2", "INC 2", "INS 2",
+	"BEQ 0", "SBC (1),Y", "CIM", "INS (1),Y", "NOP 1,X", "SBC 1,X", "INC 1,X", "INS 1,X",
+	"SED", "SBC 2,Y", "NOP !", "INS 2,Y", "NOP 2,X", "SBC 2,X", "INC 2,X", "INS 2,X"
+};
+
+#define CPU_OPCODE_UNOFFICIAL  1
+#define CPU_OPCODE_USED        2
+static char cpu_opcodes[256] = {
+	1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+	1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1,
+	0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+	0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1,
+	0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1
+};
+
+static void show_instruction(int pc)
+{
+	int addr = pc;
+	int opcode = asap->cpu.memory[pc++];
+	const char *mnemonic = cpu_mnemonics[opcode];
+	for (const char *p = mnemonic + 3; *p != '\0'; p++) {
+		if (*p == '1') {
+			int value = asap->cpu.memory[pc];
+			printf("%04X: %02X %02X     %.*s$%02X%s\n",
+			       addr, opcode, value, (int) (p - mnemonic), mnemonic, value, p + 1);
+			return;
+		}
+		if (*p == '2') {
+			int lo = asap->cpu.memory[pc];
+			int hi = asap->cpu.memory[pc + 1];
+			printf("%04X: %02X %02X %02X  %.*s$%02X%02X%s\n",
+			       addr, opcode, lo, hi, (int) (p - mnemonic), mnemonic, hi, lo, p + 1);
+			return;
+		}
+		if (*p == '0') {
+			int offset = asap->cpu.memory[pc++];
+			int target = (pc + (signed char) offset) & 0xffff;
+			printf("%04X: %02X %02X     %.4s$%04X\n", addr, opcode, offset, mnemonic, target);
+			return;
+		}
+	}
+	printf("%04X: %02X        %s\n", addr, opcode, mnemonic);
+}
+
+static void trace_cpu(void)
+{
+	int pc = asap->cpu.pc;
+	if ((cpu_trace & CPU_TRACE_PRINT) != 0) {
+		int nz = asap->cpu.nz;
+		int vdi = asap->cpu.vdi;
+		printf("%3d %3d A=%02X X=%02X Y=%02X S=%02X P=%c%c*-%c%c%c%c PC=",
+			asap->cpu.cycle / 114, asap->cpu.cycle % 114,
+			asap->cpu.a, asap->cpu.x, asap->cpu.y, asap->cpu.s,
+			nz >= 0x80 ? 'N' : '-', (vdi & 0x40) != 0 ? 'V' : '-', (vdi & 8) != 0 ? 'D' : '-',
+			(vdi & 4) != 0 ? 'I' : '-', (nz & 0xff) == 0 ? 'Z' : '-', asap->cpu.c != 0 ? 'C' : '-');
+		show_instruction(pc);
+	}
+	if (pc == print_time_at_pc)
+		print_time(frame, true);
+	if (pc != 0xd200 && pc != 0xd203) /* don't count 0xd2 used by Do6502Init() and Call6502() */
+		cpu_opcodes[asap->cpu.memory[pc]] |= CPU_OPCODE_USED;
+}
+
+static void print_unofficial_mnemonic(int opcode)
+{
+	const char *mnemonic = cpu_mnemonics[opcode];
+	for (const char *p = mnemonic + 3; *p != '\0'; p++) {
+		if (*p == '1') {
+			printf("%02X: %.*s$xx%s\n", opcode, (int) (p - mnemonic), mnemonic, p + 1);
+			return;
+		}
+		if (*p == '2') {
+			printf("%02X: %.*s$xxxx%s\n", opcode, (int) (p - mnemonic), mnemonic, p + 1);
+			return;
+		}
+		/* there are no undocumented branches ('0') */
+	}
+	printf("%02X: %s\n", opcode, mnemonic);
+}
+
+static void print_help(void)
+{
+	printf(
+		"Usage: asapscan COMMAND [OPTIONS] INPUTFILE\n"
+		"Commands:\n"
+		"-d          Dump POKEY registers\n"
+		"-f          List POKEY features used\n"
+		"-t          Detect silence and loops\n"
+		"-p          Calculate fingerprint\n"
+		"-l          Calculate hash representation (fingerprint is a substring of this)\n"
+		"-c          Dump 6502 trace\n"
+		"-u          List used unofficial 6502 instructions and BRK\n"
+		"-b HEXADDR  Print time the given instruction reached\n"
+		"-a          Run Acid800 test\n"
+		"-v          Display version information\n"
+		"Options:\n"
+		"-s SONG     Process the specified subsong (zero-based)\n"
+	);
+}
+
+static bool store_pokey(unsigned char *p, Pokey *pokey)
+{
+	bool is_silence = true;
+	for (int i = 0; i < 4; i++) {
+		if ((pokey->channels[i].audc & 0xf) != 0) {
+			is_silence = false;
+			p[i * 2] = pokey->channels[i].audf;
+			p[i * 2 + 1] = pokey->channels[i].audc;
+		}
+		else {
+			p[i * 2] = 0;
+			p[i * 2 + 1] = 0;
+		}
+	}
+	p[8] = pokey->audctl;
+	return is_silence;
+}
+
+static bool store_pokeys(int frame)
+{
+	unsigned char *p = registers_dump + 18 * frame;
+	bool is_silence = store_pokey(p, &asap->pokeys.basePokey);
+	is_silence &= store_pokey(p + 9, &asap->pokeys.extraPokey);
+	return is_silence;
+}
+
+static bool has_loop_at(int first_frame, int second_frame)
+{
+	return memcmp(registers_dump + 18 * first_frame, registers_dump + 18 * second_frame, 18 * loop_check_frames) == 0;
+}
+
+static int get_hash(int player_call)
+{
+	for (int i = 1; i < 9; i += 2) {
+		if ((registers_dump[18 * player_call + i] & 0xe0) == 0xe0)
+			registers_dump[18 * player_call + i] &= 0xbf;
+		if ((registers_dump[18 * player_call + i + 9] & 0xe0) == 0xe0)
+			registers_dump[18 * player_call + i + 9] &= 0xbf;
+	}
+	int hash = 0;
+	for (int i = 0; i < 18; i++)
+		hash += registers_dump[18 * player_call + i];
+	return hash;
+}
+
+static int get_byte_hash(int frame)
+{
+	int res = get_hash(frame);
+	res = (res & 0xff) + (res >> 8);
+	res = (res & 0xff) + (res >> 8);
+	return res;
+}
+
+static void compute_entrophy(int frames)
+{
+	if (long_fingerprint) {
+		for (int i = 0; i < frame; i++)
+			printf("%02x", get_byte_hash(i));
+		printf("\n");
+	}
+	else {
+		int entrophy_counters[256] = { 0 };
+		int emaxvalue = 0;
+		int emaxframe = 0;
+		int evalue = 0;
+
+		for (int i = 0; i < frames; i++) {
+			int v = get_byte_hash(i);
+			if (entrophy_counters[v] == 0)
+				evalue++;
+			entrophy_counters[v]++;
+
+#define ENTROPHY_LEN 32
+			if (i >= ENTROPHY_LEN) {
+				v = get_byte_hash(i - ENTROPHY_LEN);
+				entrophy_counters[v]--;
+				if (entrophy_counters[v] == 0)
+					evalue--;
+
+				if (emaxvalue < evalue) {
+					emaxvalue = evalue;
+					emaxframe = i - ENTROPHY_LEN;
+				}
+			}
+		}
+
+		for (int i = 0; i < ENTROPHY_LEN; i++)
+			printf("%02x", get_byte_hash(i + emaxframe));
+		printf("\n");
+	}
+}
+
+static void print_pokey(const Pokey *pokey)
+{
+	for (int i = 0; i < 4; i++)
+		printf("%02X %02X  ", pokey->channels[i].audf, pokey->channels[i].audc);
+	printf("%02X", pokey->audctl);
+}
+
+static bool is_ultrasound(const PokeyChannel *ch)
+{
+	if (ch->periodCycles > 112)
+		return false;
+	if ((ch->audc & 0xf) == 0)
+		return false;
+	return (ch->audc & 0xb0) == 0xa0;
+}
+
+static void scan_song(int song)
+{
+	if (!ASAP_PlaySong(asap, song, -1)) {
+		fprintf(stderr, "asapscan: PlaySong failed\n");
+		return;
+	}
+	int silence_run = 0;
+	int running_hash = 0;
+	if (acid)
+		scan_frames = seconds_to_frames(ASAPInfo_GetDuration(&asap->moduleInfo, song) / 1000);
+	for (int i = 0; i < 1 << HASH_BITS; i++)
+		hash_first[i] = -1;
+	for (frame = 0; frame < scan_frames; frame++) {
+		ASAP_Do6502Frame(asap);
+		if (dump) {
+			printf("%6.2f: ", (double) frame * CYCLES_PER_FRAME / MAIN_CLOCK);
+			print_pokey(&asap->pokeys.basePokey);
+			if (asap->moduleInfo.channels == 2) {
+				printf("  |  ");
+				print_pokey(&asap->pokeys.extraPokey);
+			}
+			printf("\n");
+		}
+		if (features != 0) {
+			int c1 = asap->pokeys.basePokey.audctl;
+			int c2 = asap->pokeys.extraPokey.audctl;
+			if (((c1 | c2) & 1) != 0)
+				features |= FEATURE_15_KHZ;
+			if (((c1 | c2) & 6) != 0)
+				features |= FEATURE_HIPASS_FILTER;
+			if (((c1 & 0x40) != 0 && (asap->pokeys.basePokey.channels[0].audc & 0xf) != 0)
+			|| ((c1 & 0x20) != 0 && (asap->pokeys.basePokey.channels[2].audc & 0xf) != 0))
+				features |= FEATURE_LOW_OF_16_BIT;
+			if (((c1 | c2) & 0x80) != 0)
+				features |= FEATURE_9_BIT_POLY;
+			for (int i = 0; i < 4; i++) {
+				if (is_ultrasound(&asap->pokeys.basePokey.channels[i])) {
+					features |= FEATURE_ULTRASOUND;
+					break;
+				}
+			}
+		}
+		if (detect_time) {
+			if (store_pokeys(frame)) {
+				silence_run++;
+				if (silence_run >= silence_frames && /* do not trigger at the initial silence */ silence_run < frame) {
+					if (fingerprint)
+						compute_entrophy(frame + 1 - silence_run);
+					else
+						print_time(frame + 1 - silence_run, false);
+					return;
+				}
+			}
+			else
+				silence_run = 0;
+			if (frame >= loop_check_frames) {
+				int second_frame = frame - loop_check_frames;
+				running_hash &= (1 << HASH_BITS) - 1;
+				/* Now running_hash is for the last loop_check_player_calls player calls before player_call. */
+				for (int first_frame = hash_first[running_hash]; first_frame >= 0; first_frame = hash_next[first_frame]) {
+					if (has_loop_at(first_frame, second_frame)) {
+						int loop_len = second_frame - first_frame;
+						if (loop_len >= loop_min_frames) {
+							if (fingerprint)
+								compute_entrophy(second_frame);
+							else
+								print_time(second_frame, true);
+							return;
+						}
+						if (loop_len == 1) {
+							/* POKEY registers do not change - probably an ultrasound */
+							if (fingerprint)
+								compute_entrophy(first_frame);
+							else
+								print_time(first_frame, false);
+							return;
+						}
+					}
+				}
+				/* Insert into hashtable. */
+				if (hash_first[running_hash] >= 0)
+					hash_next[hash_last[running_hash]] = second_frame;
+				else
+					hash_first[running_hash] = second_frame;
+				hash_next[second_frame] = -1;
+				hash_last[running_hash] = second_frame;
+				/* Update running_hash. */
+				running_hash -= get_hash(second_frame);
+			}
+			running_hash += get_hash(frame);
+		}
+	}
+	if (detect_time) {
+		if (fingerprint)
+			compute_entrophy(loop_check_frames);
+		else
+			printf("No silence or loop detected in song %d\n", song);
+	}
+	if (acid) {
+#ifdef _WIN32
+		HANDLE so = GetStdHandle(STD_OUTPUT_HANDLE);
+		CONSOLE_SCREEN_BUFFER_INFO csbi;
+		GetConsoleScreenBufferInfo(so, &csbi);
+#define set_color(x) SetConsoleTextAttribute(so, x)
+#else
+#define set_color(x)
+#endif
+		int i;
+		for (i = 0x1000; i <= 0x17ff; i++) {
+			unsigned char c = asap->cpu.memory[i];
+			if (c == 0)
+				break;
+			if (memcmp(asap->cpu.memory + i, "Pass", 4) == 0)
+				set_color((csbi.wAttributes & ~0xf) | 10);
+			else if (memcmp(asap->cpu.memory + i, "FAIL", 4) == 0) {
+				exit_code = 1;
+				set_color((csbi.wAttributes & ~0xf) | 12);
+			}
+			else if (memcmp(asap->cpu.memory + i, "Skipped", 7) == 0) {
+				exit_code = 1;
+				set_color((csbi.wAttributes & ~0xf) | 14);
+			}
+			if (c == 0x9b)
+				c = '\n';
+			putchar(c);
+		}
+		if (asap->cpu.memory[i - 1] != 0x9b) {
+			set_color((csbi.wAttributes & ~0xf) | 13);
+			printf("NO RESPONSE\n");
+			exit_code = 1;
+		}
+		set_color(csbi.wAttributes);
+	}
+}
+
+int main(int argc, char **argv)
+{
+	const char *input_file = NULL;
+	int song = -1;
+	int scan_seconds = 15 * 60;
+	int silence_seconds = 5;
+	int loop_check_seconds = 3 * 60;
+	int loop_min_seconds = 5;
+
+	for (int i = 1; i < argc; i++) {
+		if (strcmp(argv[i], "-d") == 0)
+			dump = true;
+		else if (strcmp(argv[i], "-p") == 0)
+			detect_time = fingerprint = true;
+		else if (strcmp(argv[i], "-l") == 0)
+			detect_time = fingerprint = long_fingerprint = true;
+		else if (strcmp(argv[i], "-f") == 0)
+			features = FEATURE_CHECK;
+		else if (strcmp(argv[i], "-t") == 0)
+			detect_time = true;
+		else if (strcmp(argv[i], "-c") == 0)
+			cpu_trace |= CPU_TRACE_PRINT;
+		else if (strcmp(argv[i], "-u") == 0)
+			cpu_trace |= CPU_TRACE_UNOFFICIAL;
+		else if (strcmp(argv[i], "-b") == 0) {
+			print_time_at_pc = (int) strtol(argv[++i], NULL, 16);
+			cpu_trace |= CPU_TRACE_PC_TIME;
+		}
+		else if (strcmp(argv[i], "-s") == 0)
+			song = atoi(argv[++i]);
+		else if (strcmp(argv[i], "-a") == 0)
+			acid = true;
+		else if (strcmp(argv[i], "-v") == 0) {
+			printf("asapscan " ASAPInfo_VERSION "\n");
+			return 0;
+		}
+		else {
+			if (input_file != NULL) {
+				print_help();
+				return 1;
+			}
+			input_file = argv[i];
+		}
+	}
+	if (dump + features + detect_time + cpu_trace + acid == 0 || input_file == NULL) {
+		print_help();
+		return 1;
+	}
+	FILE *fp = fopen(input_file, "rb");
+	if (fp == NULL) {
+		fprintf(stderr, "asapscan: cannot open %s\n", input_file);
+		return 1;
+	}
+	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len = fread(module, 1, sizeof(module), fp);
+	fclose(fp);
+	asap = ASAP_New();
+	if (!ASAP_Load(asap, input_file, module, module_len)) {
+		fprintf(stderr, "asapscan: %s: format not supported\n", input_file);
+		return 1;
+	}
+	scan_frames = seconds_to_frames(scan_seconds);
+	silence_frames = seconds_to_frames(silence_seconds);
+	loop_check_frames = seconds_to_frames(loop_check_seconds);
+	loop_min_frames = seconds_to_frames(loop_min_seconds);
+	registers_dump = malloc(scan_frames * 18);
+	hash_next = malloc(scan_frames * sizeof(hash_next[0]));
+	if (registers_dump == NULL || hash_next == NULL) {
+		fprintf(stderr, "asapscan: out of memory\n");
+		return 1;
+	}
+	if (song >= 0)
+		scan_song(song);
+	else
+		for (song = 0; song < asap->moduleInfo.songs; song++)
+			scan_song(song);
+	free(registers_dump);
+	if (features != 0) {
+		if ((features & FEATURE_15_KHZ) != 0)
+			printf("15 kHz clock\n");
+		if ((features & FEATURE_HIPASS_FILTER) != 0)
+			printf("Hi-pass filter\n");
+		if ((features & FEATURE_LOW_OF_16_BIT) != 0)
+			printf("Low byte of 16-bit counter\n");
+		if ((features & FEATURE_9_BIT_POLY) != 0)
+			printf("9-bit poly\n");
+		if ((features & FEATURE_ULTRASOUND) != 0)
+			printf("Ultrasound\n");
+	}
+	if ((cpu_trace & CPU_TRACE_UNOFFICIAL) != 0) {
+		for (int i = 0; i < 256; i++) {
+			if (cpu_opcodes[i] == (CPU_OPCODE_UNOFFICIAL | CPU_OPCODE_USED))
+				print_unofficial_mnemonic(i);
+		}
+	}
+	return exit_code;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap-sdl.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap-sdl.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap-sdl.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap-sdl.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,154 @@
+/*
+ * asap-sdl.c - simple SDL ASAP player
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <SDL.h>
+
+#include "asap.h"
+
+static int song = -1;
+
+static void print_help(void)
+{
+	printf(
+		"Usage: asap-sdl [OPTIONS] INPUTFILE\n"
+		"INPUTFILE must be in a supported format:\n"
+		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n"
+		"Options:\n"
+		"-s SONG     --song=SONG        Select subsong number (zero-based)\n"
+		"-h          --help             Display this information\n"
+		"-v          --version          Display version information\n"
+	);
+}
+
+static void fatal_error(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	fprintf(stderr, "asap-sdl: ");
+	vfprintf(stderr, format, args);
+	fputc('\n', stderr);
+	va_end(args);
+	exit(1);
+}
+
+static void sdl_error(const char *fun)
+{
+	fatal_error("%s failed: %s", fun, SDL_GetError());
+}
+
+static void set_song(const char *s)
+{
+	song = 0;
+	do {
+		if (*s < '0' || *s > '9')
+			fatal_error("subsong number must be an integer");
+		song = 10 * song + *s++ - '0';
+		if (song >= ASAPInfo_MAX_SONGS)
+			fatal_error("maximum subsong number is %d", ASAPInfo_MAX_SONGS - 1);
+	} while (*s != '\0');
+}
+
+static void print_header(const char *name, const char *value)
+{
+	if (value[0] != '\0')
+		printf("%s: %s\n", name, value);
+}
+
+static void audio_callback(void *userdata, Uint8 *stream, int len)
+{
+	ASAP_Generate((ASAP *) userdata, stream, len, ASAPSampleFormat_S16_L_E);
+}
+
+static void process_file(const char *input_file)
+{
+	FILE *fp = fopen(input_file, "rb");
+	if (fp == NULL)
+		fatal_error("cannot open %s", input_file);
+	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len = fread(module, 1, sizeof(module), fp);
+	fclose(fp);
+
+	ASAP *asap = ASAP_New();
+	if (!ASAP_Load(asap, input_file, module, module_len))
+		fatal_error("%s: unsupported file", input_file);
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	if (song < 0)
+		song = ASAPInfo_GetDefaultSong(info);
+	if (!ASAP_PlaySong(asap, song, -1))
+		fatal_error("%s: PlaySong failed", input_file);
+	print_header("Name", ASAPInfo_GetTitle(info));
+	print_header("Author", ASAPInfo_GetAuthor(info));
+	print_header("Date", ASAPInfo_GetDate(info));
+
+	if (SDL_Init(SDL_INIT_AUDIO) != 0)
+		sdl_error("SDL_Init");
+	SDL_AudioSpec desired;
+	desired.freq = ASAP_SAMPLE_RATE;
+	desired.format = AUDIO_S16LSB;
+	desired.channels = ASAPInfo_GetChannels(info);
+	desired.samples = 4096;
+	desired.callback = audio_callback;
+	desired.userdata = asap;
+	if (SDL_OpenAudio(&desired, NULL) != 0)
+		sdl_error("SDL_OpenAudio");
+	SDL_PauseAudio(0);
+	printf(" playing - press Enter to quit\n");
+	getchar();
+	SDL_Quit();
+}
+
+int main(int argc, char *argv[])
+{
+	const char *options_error = "no input file";
+	for (int i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (arg[0] != '-') {
+			process_file(arg);
+			options_error = NULL;
+			continue;
+		}
+		options_error = "options must be specified before the input file";
+#define is_opt(c)  (arg[1] == c && arg[2] == '\0')
+		if (is_opt('s'))
+			set_song(argv[++i]);
+		else if (strncmp(arg, "--song=", 7) == 0)
+			set_song(arg + 7);
+		else if (is_opt('h') || strcmp(arg, "--help") == 0) {
+			print_help();
+			options_error = NULL;
+		}
+		else if (is_opt('v') || strcmp(arg, "--version") == 0) {
+			printf("asap-sdl " ASAPInfo_VERSION "\n");
+			options_error = NULL;
+		}
+		else
+			fatal_error("unknown option: %s", arg);
+	}
+	if (options_error != NULL) {
+		fprintf(stderr, "asap-sdl: %s\n", options_error);
+		print_help();
+		return 1;
+	}
+	return 0;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.spec kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.spec
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asap.spec	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asap.spec	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,128 @@
+Name: asap
+Version: 5.0.1
+Release: 1
+Summary: Player of Atari 8-bit music
+License: GPLv2+
+Group: Applications/Multimedia
+Source: http://prdownloads.sourceforge.net/asap/asap-%{version}.tar.gz
+URL: http://asap.sourceforge.net/
+BuildRequires: gcc
+BuildRoot: %{_tmppath}/asap-root
+
+%description
+ASAP is a player of Atari 8-bit music for modern computers.
+It emulates the POKEY sound chip and the 6502 processor.
+ASAP supports the following file formats:
+SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
+
+%package devel
+Summary: Development library providing Atari 8-bit music emulation
+Group: Development/Libraries
+
+%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
+Requires: vlc
+BuildRequires: vlc-devel
+
+%description vlc
+Provides playback of Atari 8-bit music in VLC.
+Supports the following file formats: SAP, RMT, FC.
+
+%global debug_package %{nil}
+
+%prep
+%setup -q
+
+%build
+make asapconv libasap.a asap-xmms asap-vlc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install install-xmms install-vlc
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_bindir}/asapconv
+
+%files devel
+%defattr(-,root,root)
+%{_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
+
+%changelog
+* Sun Jan 19 2020 Piotr Fusik <fox@scene.pl>
+- 5.0.1-1
+
+* Thu Nov 21 2019 Piotr Fusik <fox@scene.pl>
+- 5.0.0-1
+
+* Thu Jan 10 2019 Piotr Fusik <fox@scene.pl>
+- 4.0.0-1
+
+* Sat Aug 12 2017 Piotr Fusik <fox@scene.pl>
+- Discontinued GStreamer
+
+* Mon Jun 23 2014 Piotr Fusik <fox@scene.pl>
+- 3.2.0-1
+
+* Wed Jan 15 2014 Piotr Fusik <fox@scene.pl>
+- 3.1.6-1
+
+* Fri Aug 16 2013 Piotr Fusik <fox@scene.pl>
+- 3.1.5-1
+- Corrected descriptions of GStreamer and VLC plugins - they don't support all the formats
+
+* Mon Apr 29 2013 Piotr Fusik <fox@scene.pl>
+- 3.1.4-1
+- lib64 compatibility
+- Removed the Audacious subpackage
+
+* Tue Dec 4 2012 Piotr Fusik <fox@scene.pl>
+- 3.1.3-1
+- Added subpackages with GStreamer and VLC plugins
+
+* Mon Jun 25 2012 Piotr Fusik <fox@scene.pl>
+- 3.1.2-1
+
+* Wed Oct 26 2011 Piotr Fusik <fox@scene.pl>
+- 3.1.1-1
+
+* Sat Sep 24 2011 Piotr Fusik <fox@scene.pl>
+- 3.1.0-1
+
+* Fri Jul 15 2011 Piotr Fusik <fox@scene.pl>
+- 3.0.1-1
+
+* Thu May 19 2011 Piotr Fusik <fox@scene.pl>
+- 3.0.0-1
+- Added subpackages with Audacious and XMMS plugins
+
+* Wed Nov 3 2010 Piotr Fusik <fox@scene.pl>
+- 2.1.2-1
+- Initial packaging
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapwriter.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapwriter.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/asapwriter.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/asapwriter.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,881 @@
+// asapwriter.ci - format conversions
+//
+// Copyright (C) 2011-2019  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+class ASAPNativeModuleWriter
+{
+	internal ASAPWriter! Writer;
+	internal byte[] SourceModule;
+	internal int SourceOffset;
+	int AddressDiff;
+
+	int GetByte(int offset)
+		=> SourceModule[SourceOffset + offset];
+
+	internal int GetWord(int offset)
+		=> ASAPInfo.GetWord(SourceModule, SourceOffset + offset);
+
+	void Copy(int endOffset)
+		throws
+	{
+		Writer.WriteBytes(SourceModule, SourceOffset + Writer.OutputOffset, SourceOffset + endOffset);
+	}
+
+	void RelocateBytes(int lowOffset, int highOffset, int count, int shift)
+		throws
+	{
+		lowOffset += SourceOffset;
+		highOffset += SourceOffset;
+		for (int i = 0; i < count; i++) {
+			int address = SourceModule[lowOffset + i] + (SourceModule[highOffset + i] << 8);
+			if (address != 0 && address != 0xffff)
+				address += AddressDiff;
+			Writer.WriteByte((address >> shift) & 0xff);
+		}
+	}
+
+	void RelocateLowHigh(int count)
+		throws
+	{
+		int lowOffset = Writer.OutputOffset;
+		RelocateBytes(lowOffset, lowOffset + count, count, 0);
+		RelocateBytes(lowOffset, lowOffset + count, count, 8);
+	}
+
+	void RelocateWords(int count)
+		throws
+	{
+		while (--count >= 0) {
+			int address = GetWord(Writer.OutputOffset);
+			if (address != 0 && address != 0xffff)
+				address += AddressDiff;
+			Writer.WriteWord(address);
+		}
+	}
+
+	internal void Write!(ASAPInfo info, ASAPModuleType type, int moduleLen)
+		throws
+	{
+		int startAddr = GetWord(2);
+		AddressDiff = info.GetMusicAddress() < 0 ? 0 : info.GetMusicAddress() - startAddr;
+		if (GetWord(4) + AddressDiff > 0xffff)
+			throw "Address set too high";
+		switch (type) {
+		case ASAPModuleType.Cmc:
+		case ASAPModuleType.Cm3:
+		case ASAPModuleType.Cmr:
+		case ASAPModuleType.Cms:
+			// * -> CMC
+			RelocateWords(3); // DOS header
+			Copy(6 + 0x14); // CMC header
+			RelocateLowHigh(64); // patterns
+			break;
+		case ASAPModuleType.Dlt:
+			// * -> DLT
+			RelocateWords(3); // DOS header
+			break;
+		case ASAPModuleType.Mpt:
+			// * -> MPT
+			RelocateWords(3 + 32 + 64); // DOS header, instruments, patterns
+			Copy(6 + 64 + 128 + 256); // note lookup tables
+			RelocateLowHigh(4); // tracks
+			break;
+		case ASAPModuleType.Rmt:
+			// * -> RMT
+			Writer.WriteWord(0xffff); // RMT-generated SAPs have a player before the module
+			RelocateWords(2); // DOS header
+			Copy(6 + 8); // RMT header
+			int patternLowAddress = GetWord(0x10);
+			RelocateWords((patternLowAddress - startAddr - 8) >> 1); // 4 pointers, instruments
+			RelocateLowHigh(GetWord(0x12) - patternLowAddress); // patterns
+			int songOffset = 6 + GetWord(0x14) - startAddr;
+			Copy(songOffset);
+			int songEnd = 7 + GetWord(4) - startAddr;
+			while (songOffset + 3 < songEnd) {
+				int nextSongOffset = songOffset + GetByte(9) - '0';
+				if (GetByte(songOffset) == 0xfe) {
+					// song jump
+					Copy(songOffset + 2); // copy 0xfe, line_number
+					RelocateWords(1); // relocate jump address
+				}
+				if (nextSongOffset > songEnd)
+					nextSongOffset = songEnd;
+				Copy(nextSongOffset);
+				songOffset = nextSongOffset;
+			}
+			Copy(songEnd);
+			if (moduleLen >= songEnd + 5)
+				RelocateWords(2); // DOS header of text info: title and instrument names
+			break;
+		case ASAPModuleType.Tmc:
+			// * -> TMC
+			RelocateWords(3); // DOS header
+			Copy(6 + 32); // TMC header
+			RelocateLowHigh(64); // instruments
+			RelocateLowHigh(128); // patterns
+			break;
+		case ASAPModuleType.Tm2:
+			// * -> TM2
+			RelocateWords(3); // DOS header
+			Copy(6 + 128); // TM2 header
+			RelocateBytes(6 + 128, 6 + 128 + 128 + 512, 128, 0); // instruments/low
+			RelocateLowHigh(256); // patterns
+			RelocateBytes(6 + 128, 6 + 128 + 128 + 512, 128, 8); // instruments/high
+			break;
+		default:
+			throw "Impossible conversion";
+		}
+		Copy(moduleLen); // copy remaining bytes
+	}
+}
+
+/// Static methods for writing modules in different formats.
+public class ASAPWriter
+{
+	/// Maximum number of extensions returned by `GetSaveExts`.
+	public const int MaxSaveExts = 3;
+
+	public ASAPWriter()
+	{
+	}
+
+	/// Enumerates possible file types the given module can be written as.
+	/// Returns the number of extensions written to `exts`.
+	public static int GetSaveExts(
+		/// Receives filename extensions without the leading dot.
+		/// Must be `MaxSaveExts` long.
+		string[]! exts,
+		/// File information.
+		ASAPInfo info,
+		/// Contents of the file.
+		byte[] module,
+		/// Length of the file.
+		int moduleLen)
+	{
+		int i = 0;
+		switch (info.Type) {
+		case ASAPModuleType.SapB:
+		case ASAPModuleType.SapC:
+			exts[i++] = "sap";
+			string ext = info.GetOriginalModuleExt(module, moduleLen);
+			if (ext != null)
+				exts[i++] = ext;
+			exts[i++] = "xex";
+			break;
+		case ASAPModuleType.SapD:
+			exts[i++] = "sap";
+			if (info.GetPlayerRateScanlines() == 312)
+				exts[i++] = "xex";
+			break;
+		case ASAPModuleType.SapS:
+			exts[i++] = "sap";
+			break;
+		default:
+			exts[i++] = info.GetOriginalModuleExt(module, moduleLen);
+			exts[i++] = "sap";
+			exts[i++] = "xex";
+			break;
+		}
+		return i;
+	}
+
+	static void TwoDigitsToString(byte[]! result, int offset, int value)
+	{
+		result[offset] = '0' + value / 10;
+		result[offset + 1] = '0' + value % 10;
+	}
+
+	static bool SecondsToString(byte[]! result, int offset, int value)
+	{
+		if (value < 0 || value >= 100 * 60 * 1000)
+			return false;
+		value /= 1000;
+		TwoDigitsToString(result, offset, value / 60);
+		result[offset + 2] = ':';
+		TwoDigitsToString(result, offset + 3, value % 60);
+		return true;
+	}
+
+	/// Maximum length of text representation of a duration.
+	/// Corresponds to the longest format which is `"mm:ss.xxx"`.
+	public const int MaxDurationLength = 9;
+
+	/// Writes text representation of the given duration.
+	/// Returns the number of bytes written to `result`.
+	public static int DurationToString(
+		/// The output buffer.
+		byte[]! result,
+		/// Number of milliseconds.
+		int value)
+	{
+		if (!SecondsToString(result, 0, value))
+			return 0;
+		value %= 1000;
+		if (value == 0)
+			return 5;
+		result[5] = '.';
+		TwoDigitsToString(result, 6, value / 10);
+		value %= 10;
+		if (value == 0)
+			return 8;
+		result[8] = '0' + value;
+		return 9;
+	}
+
+	internal byte[]! Output;
+	internal int OutputOffset;
+	int OutputEnd;
+
+	/// Sets the destination array for `Write`.
+	public void SetOutput!(
+		/// The destination array.
+		byte[]! output,
+		/// The array offset to start writing at.
+		int startIndex,
+		/// The array offset to finish writing before.
+		int endIndex)
+	{
+		Output = output;
+		OutputOffset = startIndex;
+		OutputEnd = endIndex;
+	}
+
+	internal void WriteByte!(int value)
+		throws
+	{
+		if (OutputOffset >= OutputEnd)
+			throw "Output full";
+		Output[OutputOffset++] = value;
+	}
+
+	internal void WriteWord!(int value)
+		throws
+	{
+		WriteByte(value & 0xff);
+		WriteByte(value >> 8);
+	}
+
+	internal void WriteBytes!(byte[] array, int startIndex, int endIndex)
+		throws
+	{
+		int length = endIndex - startIndex;
+		if (OutputOffset + length > OutputEnd)
+			throw "Output full";
+		array.CopyTo(startIndex, Output, OutputOffset, length);
+		OutputOffset += length;
+	}
+
+	void WriteString!(string s)
+		throws
+	{
+		int n = s.Length;
+		for (int i = 0; i < n; i++)
+			WriteByte(s[i]);
+	}
+
+	void WriteDec!(int value)
+		throws
+	{
+		if (value >= 10) {
+			WriteDec(value / 10);
+			value %= 10;
+		}
+		WriteByte('0' + value);
+	}
+
+	void WriteTextSapTag!(string tag, string value)
+		throws
+	{
+		WriteString(tag);
+		WriteByte('"');
+		if (value.Length == 0)
+			value = "<?>";
+		WriteString(value);
+		WriteByte('"');
+		WriteByte('\r');
+		WriteByte('\n');
+	}
+
+	void WriteDecSapTag!(string tag, int value)
+		throws
+	{
+		WriteString(tag);
+		WriteDec(value);
+		WriteByte('\r');
+		WriteByte('\n');
+	}
+
+	void WriteHexSapTag!(string tag, int value)
+		throws
+	{
+		if (value < 0)
+			return;
+		WriteString(tag);
+		for (int i = 12; i >= 0; i -= 4) {
+			int digit = (value >> i) & 0xf;
+			WriteByte(digit + (digit < 10 ? '0' : 'A' - 10));
+		}
+		WriteByte('\r');
+		WriteByte('\n');
+	}
+
+	void WriteSapHeader!(ASAPInfo info, int type, int init, int player)
+		throws
+	{
+		WriteString("SAP\r\n");
+		WriteTextSapTag("AUTHOR ", info.GetAuthor());
+		WriteTextSapTag("NAME ", info.GetTitle());
+		WriteTextSapTag("DATE ", info.GetDate());
+		if (info.GetSongs() > 1) {
+			WriteDecSapTag("SONGS ", info.GetSongs());
+			if (info.GetDefaultSong() > 0)
+				WriteDecSapTag("DEFSONG ", info.GetDefaultSong());
+		}
+		if (info.GetChannels() > 1)
+			WriteString("STEREO\r\n");
+		if (info.IsNtsc())
+			WriteString("NTSC\r\n");
+		WriteString("TYPE ");
+		WriteByte(type);
+		WriteByte('\r');
+		WriteByte('\n');
+		if (info.GetPlayerRateScanlines() != 312 || info.IsNtsc())
+			WriteDecSapTag("FASTPLAY ", info.GetPlayerRateScanlines());
+		if (type == 'C')
+			WriteHexSapTag("MUSIC ", info.GetMusicAddress());
+		WriteHexSapTag("INIT ", init);
+		WriteHexSapTag("PLAYER ", player);
+		WriteHexSapTag("COVOX ", info.GetCovoxAddress());
+		for (int song = 0; song < info.GetSongs(); song++) {
+			if (info.GetDuration(song) < 0)
+				break;
+			WriteString("TIME ");
+			byte[MaxDurationLength] s;
+			WriteBytes(s, 0, DurationToString(s, info.GetDuration(song)));
+			if (info.GetLoop(song))
+				WriteString(" LOOP");
+			WriteByte('\r');
+			WriteByte('\n');
+		}
+	}
+
+	void WriteExecutableHeader!(int[]! initAndPlayer, ASAPInfo info, int type, int init, int player)
+		throws
+	{
+		if (initAndPlayer == null)
+			WriteSapHeader(info, type, init, player);
+		else {
+			initAndPlayer[0] = init;
+			initAndPlayer[1] = player;
+		}
+	}
+
+	void WritePlaTaxLda0!()
+		throws
+	{
+		WriteByte(0x68);
+		WriteByte(0xaa);
+		WriteByte(0xa9);
+		WriteByte(0);
+	}
+
+	void WriteCmcInit!(int[]! initAndPlayer, ASAPInfo info)
+		throws
+	{
+		if (initAndPlayer == null)
+			return; // to SAP
+		const int initCmc = 0xfe0; // cms.obx ends at 0xfbe
+		WriteWord(initCmc);
+		WriteWord(initCmc + 16);
+		WriteByte(0x48); // PHA
+		int music = info.GetMusicAddress();
+		WriteByte(0xa2); WriteByte(music & 0xff); // LDX #<MUSIC
+		WriteByte(0xa0); WriteByte(music >> 8); // LDY #>MUSIC
+		WriteByte(0xa9); WriteByte(0x70); // LDA #$70
+		WriteByte(0x20); WriteWord(initAndPlayer[1] + 3); // JSR PLAYER+3
+		WritePlaTaxLda0(); // PLA; TAX; LDA #0
+		WriteByte(0x4c); WriteWord(initAndPlayer[1] + 3); // JMP PLAYER+3
+		initAndPlayer[0] = initCmc;
+		initAndPlayer[1] += 6;
+	}
+
+	void WriteExecutableFromSap!(int[]! initAndPlayer, ASAPInfo info, int type, byte[] module, int moduleLen)
+		throws
+	{
+		WriteExecutableHeader(initAndPlayer, info, type, info.GetInitAddress(), info.Player);
+		WriteBytes(module, info.HeaderLen, moduleLen);
+	}
+
+	int WriteExecutableHeaderForSongPos!(int[]! initAndPlayer, ASAPInfo info, int player, int codeForOneSong, int codeForManySongs, int playerOffset)
+		throws
+	{
+		if (info.GetSongs() != 1) {
+			WriteExecutableHeader(initAndPlayer, info, 'B', player - codeForManySongs, player + playerOffset);
+			return player - codeForManySongs - info.GetSongs();
+		}
+		WriteExecutableHeader(initAndPlayer, info, 'B', player - codeForOneSong, player + playerOffset);
+		return player - codeForOneSong;
+	}
+
+	internal void WriteExecutable!(int[]! initAndPlayer, ASAPInfo info, byte[] module, int moduleLen)
+		throws
+	{
+		byte[] playerRoutine = ASAP6502.GetPlayerRoutine(info);
+		int player = -1;
+		int playerLastByte = -1;
+		int music = info.GetMusicAddress();
+		if (playerRoutine != null) {
+			player = ASAPInfo.GetWord(playerRoutine, 2);
+			playerLastByte = ASAPInfo.GetWord(playerRoutine, 4);
+			if (music <= playerLastByte)
+				throw "Module address conflicts with the player routine";
+		}
+		int startAddr;
+		switch (info.Type) {
+		case ASAPModuleType.SapB:
+			WriteExecutableFromSap(initAndPlayer, info, 'B', module, moduleLen);
+			break;
+		case ASAPModuleType.SapC:
+			WriteExecutableFromSap(initAndPlayer, info, 'C', module, moduleLen);
+			WriteCmcInit(initAndPlayer, info);
+			break;
+		case ASAPModuleType.SapD:
+			WriteExecutableFromSap(initAndPlayer, info, 'D', module, moduleLen);
+			break;
+		case ASAPModuleType.SapS:
+			WriteExecutableFromSap(initAndPlayer, info, 'S', module, moduleLen);
+			break;
+		case ASAPModuleType.Cmc:
+		case ASAPModuleType.Cm3:
+		case ASAPModuleType.Cmr:
+		case ASAPModuleType.Cms:
+			WriteExecutableHeader(initAndPlayer, info, 'C', -1, player);
+			WriteWord(0xffff); // some modules start with zeros
+			WriteBytes(module, 2, moduleLen);
+			WriteBytes(playerRoutine, 2, playerLastByte - player + 7);
+			WriteCmcInit(initAndPlayer, info);
+			break;
+		case ASAPModuleType.Dlt:
+			startAddr = WriteExecutableHeaderForSongPos(initAndPlayer, info, player, 5, 7, 0x103);
+			if (moduleLen == 0x2c06) {
+				// append zero to the module
+				WriteBytes(module, 0, 4);
+				WriteWord(0x4c00);
+				WriteBytes(module, 6, moduleLen);
+				WriteByte(0);
+			}
+			else
+				WriteBytes(module, 0, moduleLen);
+			WriteWord(startAddr);
+			WriteWord(playerLastByte);
+			if (info.GetSongs() != 1) {
+				WriteBytes(info.SongPos, 0, info.GetSongs());
+				WriteByte(0xaa); // TAX
+				WriteByte(0xbc); WriteWord(startAddr); // LDY SONG2POS,X
+			}
+			else {
+				WriteByte(0xa0); WriteByte(0); // LDY #0
+			}
+			WriteByte(0x4c); WriteWord(player + 0x100); // JMP PLAYER+$100
+			WriteBytes(playerRoutine, 6, playerLastByte - player + 7);
+			break;
+		case ASAPModuleType.Mpt:
+			startAddr = WriteExecutableHeaderForSongPos(initAndPlayer, info, player, 13, 17, 3);
+			WriteBytes(module, 0, moduleLen);
+			WriteWord(startAddr);
+			WriteWord(playerLastByte);
+			if (info.GetSongs() != 1) {
+				WriteBytes(info.SongPos, 0, info.GetSongs());
+				WriteByte(0x48); // PHA
+			}
+			WriteByte(0xa0); WriteByte(music & 0xff); // LDY #<MUSIC
+			WriteByte(0xa2); WriteByte(music >> 8); // LDX #>MUSIC
+			WriteByte(0xa9); WriteByte(0); // LDA #0
+			WriteByte(0x20); WriteWord(player); // JSR PLAYER
+			if (info.GetSongs() != 1) {
+				WriteByte(0x68); WriteByte(0xa8); // PLA; TAY
+				WriteByte(0xbe); WriteWord(startAddr); // LDX SONG2POS,Y
+			}
+			else {
+				WriteByte(0xa2); WriteByte(0); // LDX #0
+			}
+			WriteByte(0xa9); WriteByte(2); // LDA #2
+			WriteBytes(playerRoutine, 6, playerLastByte - player + 7);
+			break;
+		case ASAPModuleType.Rmt:
+			WriteExecutableHeader(initAndPlayer, info, 'B', ASAPInfo.RmtInit, 0x603);
+			WriteBytes(module, 0, ASAPInfo.GetWord(module, 4) - music + 7);
+			WriteWord(ASAPInfo.RmtInit);
+			if (info.GetSongs() != 1) {
+				WriteWord(ASAPInfo.RmtInit + 10 + info.GetSongs());
+				WriteByte(0xa8); // TAY
+				WriteByte(0xb9); WriteWord(ASAPInfo.RmtInit + 11); // LDA SONG2POS,Y
+			}
+			else {
+				WriteWord(ASAPInfo.RmtInit + 8);
+				WriteByte(0xa9); WriteByte(0); // LDA #0
+			}
+			WriteByte(0xa2); WriteByte(music & 0xff); // LDX #<MUSIC
+			WriteByte(0xa0); WriteByte(music >> 8); // LDY #>MUSIC
+			WriteByte(0x4c); WriteWord(0x600); // JMP PLAYER
+			if (info.GetSongs() != 1)
+				WriteBytes(info.SongPos, 0, info.GetSongs());
+			WriteBytes(playerRoutine, 2, playerLastByte - player + 7);
+			break;
+		case ASAPModuleType.Tmc:
+			const int[4] tmcPlayerOffset = { 3, -9, -10, -10 };
+			int player2 = player + tmcPlayerOffset[module[0x25] - 1];
+			const int[4] tmcInitOffset = { -14, -16, -17, -17 };
+			startAddr = player2 + tmcInitOffset[module[0x25] - 1];
+			if (info.GetSongs() != 1)
+				startAddr -= 3;
+			WriteExecutableHeader(initAndPlayer, info, 'B', startAddr, player2);
+			WriteBytes(module, 0, moduleLen);
+			WriteWord(startAddr);
+			WriteWord(playerLastByte);
+			if (info.GetSongs() != 1)
+				WriteByte(0x48); // PHA
+			WriteByte(0xa0); WriteByte(music & 0xff); // LDY #<MUSIC
+			WriteByte(0xa2); WriteByte(music >> 8); // LDX #>MUSIC
+			WriteByte(0xa9); WriteByte(0x70); // LDA #$70
+			WriteByte(0x20); WriteWord(player); // JSR PLAYER
+			if (info.GetSongs() != 1)
+				WritePlaTaxLda0(); // PLA; TAX; LDA #0
+			else {
+				WriteByte(0xa9); WriteByte(0x60); // LDA #$60
+			}
+			switch (module[0x25]) {
+			case 2:
+				WriteByte(0x06); WriteByte(0); // ASL 0
+				WriteByte(0x4c); WriteWord(player); // JMP PLAYER
+				WriteByte(0xa5); WriteByte(0); // LDA 0
+				WriteByte(0xe6); WriteByte(0); // INC 0
+				WriteByte(0x4a); // LSR @
+				WriteByte(0x90); WriteByte(5); // BCC PLAYER+3
+				WriteByte(0xb0); WriteByte(6); // BCS PLAYER+6
+				break;
+			case 3:
+			case 4:
+				WriteByte(0xa0); WriteByte(1); // LDY #1
+				WriteByte(0x84); WriteByte(0); // STY 0
+				WriteByte(0xd0); WriteByte(10); // BNE PLAYER
+				WriteByte(0xc6); WriteByte(0); // DEC 0
+				WriteByte(0xd0); WriteByte(12); // BNE PLAYER+6
+				WriteByte(0xa0); WriteByte(module[0x25]); // LDY #3
+				WriteByte(0x84); WriteByte(0); // STY 0
+				WriteByte(0xd0); WriteByte(3); // BNE PLAYER+3
+				break;
+			}
+			WriteBytes(playerRoutine, 6, playerLastByte - player + 7);
+			break;
+		case ASAPModuleType.Tm2:
+			const int tm2Init = 0x1380;
+			WriteExecutableHeader(initAndPlayer, info, 'B', tm2Init, 0x803);
+			WriteBytes(module, 0, moduleLen);
+			WriteWord(tm2Init);
+			if (info.GetSongs() != 1) {
+				WriteWord(tm2Init + 16);
+				WriteByte(0x48); // PHA
+			}
+			else
+				WriteWord(tm2Init + 14);
+			WriteByte(0xa0); WriteByte(music & 0xff); // LDY #<MUSIC
+			WriteByte(0xa2); WriteByte(music >> 8); // LDX #>MUSIC
+			WriteByte(0xa9); WriteByte(0x70); // LDA #$70
+			WriteByte(0x20); WriteWord(0x800); // JSR PLAYER
+			if (info.GetSongs() != 1)
+				WritePlaTaxLda0(); // PLA; TAX; LDA #0
+			else {
+				WriteByte(0xa9); WriteByte(0); // LDA #0
+				WriteByte(0xaa); // TAX
+			}
+			WriteByte(0x4c); WriteWord(0x800); // JMP PLAYER
+			WriteBytes(playerRoutine, 2, playerLastByte - player + 7);
+			break;
+		case ASAPModuleType.Fc:
+			WriteExecutableHeader(initAndPlayer, info, 'B', player, player + 3);
+			WriteWord(0xffff);
+			WriteWord(music);
+			WriteWord(music + moduleLen - 1);
+			WriteBytes(module, 0, moduleLen);
+			WriteBytes(playerRoutine, 2, playerLastByte - player + 7);
+			break;
+		}
+	}
+
+	const int XexInfoCharactersPerLine = 32;
+
+	static int PadXexInfo(byte[]! dest, int offset, int endColumn)
+	{
+		while (offset % XexInfoCharactersPerLine != endColumn)
+			dest[offset++] = ' ';
+		return offset;
+	}
+
+	static int FormatXexInfoText(byte[]! dest, int destLen, int endColumn, string src, bool author)
+	{
+		int srcLen = src.Length;
+		for (int srcOffset = 0; srcOffset < srcLen; ) {
+			int c = src[srcOffset++];
+			if (c == ' ') {
+				if (author && srcOffset < srcLen && src[srcOffset] == '&') {
+					int authorLen;
+					for (authorLen = 1; srcOffset + authorLen < srcLen; authorLen++) {
+						if (src[srcOffset + authorLen] == ' ' && srcOffset + authorLen + 1 < srcLen && src[srcOffset + authorLen + 1] == '&')
+							break;
+					}
+					if (authorLen <= XexInfoCharactersPerLine && destLen % XexInfoCharactersPerLine + 1 + authorLen > XexInfoCharactersPerLine) {
+						destLen = PadXexInfo(dest, destLen, 1); // align author names after "by" and "&"
+						continue;
+					}
+				}
+				int wordLen;
+				for (wordLen = 0; srcOffset + wordLen < srcLen && src[srcOffset + wordLen] != ' '; wordLen++) {
+				}
+				if (wordLen <= XexInfoCharactersPerLine && destLen % XexInfoCharactersPerLine + 1 + wordLen > XexInfoCharactersPerLine) {
+					destLen = PadXexInfo(dest, destLen, 0);
+					continue;
+				}
+			}
+			dest[destLen++] = c;
+		}
+		return PadXexInfo(dest, destLen, endColumn);
+	}
+
+	void WriteXexInfoTextDl!(int address, int len, int verticalScrollAt)
+		throws
+	{
+		WriteByte(verticalScrollAt == 0 ? 0x62 : 0x42);
+		WriteWord(address);
+		for (int i = XexInfoCharactersPerLine; i < len; i += XexInfoCharactersPerLine)
+			WriteByte(i == verticalScrollAt ? 0x22 : 2);
+	}
+
+	void WriteXexInfo!(ASAPInfo info)
+		throws
+	{
+		byte[256] title;
+		int titleLen = FormatXexInfoText(title, 0, 0, info.GetTitle().Length == 0 ? "(untitled)" : info.GetTitle(), false);
+		byte[256] author;
+		int authorLen;
+		if (info.GetAuthor().Length > 0) {
+			author[0] = 'b';
+			author[1] = 'y';
+			author[2] = ' ';
+			authorLen = FormatXexInfoText(author, 3, 0, info.GetAuthor(), true);
+		}
+		else
+			authorLen = 0;
+		byte[256] other;
+		int otherLen = FormatXexInfoText(other, 0, XexInfoCharactersPerLine - 13, info.GetDate(), false);
+		otherLen = FormatXexInfoText(other, otherLen, XexInfoCharactersPerLine - 5, info.GetChannels() > 1 ? " STEREO" : "   MONO", false);
+		int duration = info.GetDuration(info.GetDefaultSong());
+		if (duration > 0 && SecondsToString(other, otherLen, duration + 999)) // round up to full seconds
+			otherLen += 5;
+		else
+			otherLen = PadXexInfo(other, otherLen, 0);
+
+		const int xexInfoDl = 0xfc50; // must match xexinfo.asx
+		int totalCharacters = titleLen + authorLen + otherLen;
+		int totalLines = totalCharacters / XexInfoCharactersPerLine;
+		int otherAddress = xexInfoDl - otherLen;
+#if HIDE_AUTHOR
+		int authorAddress = otherAddress - authorLen;
+		int hiddenAddress = authorAddress - authorLen;
+		int titleAddress = hiddenAddress - 8 - titleLen;
+#else
+		int titleAddress = otherAddress - authorLen - 8 - titleLen;
+#endif
+		WriteWord(titleAddress);
+		WriteBytes(resource<byte[]>("xexinfo.obx"), 4, 6);
+
+		WriteBytes(title, 0, titleLen);
+		for (int i = 0; i < 8; i++)
+			WriteByte(0x55);
+#if HIDE_AUTHOR
+		if (authorLen > 0) {
+			WriteString("(press space to show author)");
+			for (int i = 28; i < authorLen; i++)
+				WriteByte(' ');
+			WriteBytes(author, 0, authorLen);
+		}
+#else
+		WriteBytes(author, 0, authorLen);
+#endif
+		WriteBytes(other, 0, otherLen);
+		for (int i = totalLines; i < 26; i++)
+			WriteByte(0x70);
+		WriteByte(0x30);
+		WriteXexInfoTextDl(titleAddress, titleLen, titleLen - XexInfoCharactersPerLine);
+		WriteByte(8);
+		WriteByte(0);
+#if HIDE_AUTHOR
+		if (authorLen > 0)
+			WriteXexInfoTextDl(hiddenAddress, authorLen, -1);
+		WriteByte(0x10);
+		WriteXexInfoTextDl(otherAddress, otherLen, -1);
+		WriteByte(0x41);
+		WriteWord(xexInfoDl);
+		if (authorLen > 0) {
+			int dlAuthor = xexInfoDl + 32 - totalLines + titleLen / XexInfoCharactersPerLine;
+			WriteByte(0xa9); WriteByte(authorAddress & 0xff); // LDA #<author
+			WriteByte(0x8d); WriteWord(dlAuthor); // STA dl_author
+			WriteByte(0xa9); WriteByte(authorAddress >> 8); // LDA #>author
+			WriteByte(0x8d); WriteWord(dlAuthor + 1); // STA dl_author+1
+		}
+		else {
+			// pad two bytes because DL is shorter due to no LMS for author
+			// show_author is just RTS, pad with more RTSes
+			for (int i = 0; i < 12; i++)
+				WriteByte(0x60);
+		}
+#else
+		for (int i = 0; i < authorLen; i += XexInfoCharactersPerLine)
+			WriteByte(2);
+		WriteByte(0x10);
+		for (int i = 0; i < otherLen; i += XexInfoCharactersPerLine)
+			WriteByte(2);
+#endif
+		WriteBytes(resource<byte[]>("xexinfo.obx"), 6, resource<byte[]>("xexinfo.obx").Length);
+	}
+
+	void WriteNative!(ASAPInfo info, byte[] module, int moduleLen)
+		throws
+	{
+		ASAPNativeModuleWriter() nativeWriter;
+		nativeWriter.Writer = this;
+		nativeWriter.SourceModule = module;
+
+		ASAPModuleType type = info.Type;
+		switch (type) {
+		case ASAPModuleType.SapB:
+		case ASAPModuleType.SapC:
+			// SAP -> native
+			int offset = info.GetRmtSapOffset(module, moduleLen);
+			if (offset > 0) {
+				// RMT-generated SAP -> RMT
+				nativeWriter.SourceOffset = offset - 2;
+				nativeWriter.Write(info, ASAPModuleType.Rmt, moduleLen - offset + 2);
+				return;
+			}
+			nativeWriter.SourceOffset = info.HeaderLen;
+			int blockLen = nativeWriter.GetWord(4) - nativeWriter.GetWord(2) + 7;
+			if (blockLen < 7 || info.HeaderLen + blockLen >= moduleLen)
+				throw "Cannot extract module from SAP";
+			type = info.GetOriginalModuleType(module, moduleLen);
+			if (type == ASAPModuleType.Fc)
+				WriteBytes(module, info.HeaderLen + 6, info.HeaderLen + blockLen); // SAP -> FC
+			else
+				nativeWriter.Write(info, type, blockLen); // SAP -> native
+			break;
+		case ASAPModuleType.Fc:
+			// FC -> FC
+			WriteBytes(module, 0, moduleLen);
+			return;
+		default:
+			// native -> native
+			nativeWriter.SourceOffset = 0;
+			nativeWriter.Write(info, type, moduleLen);
+			break;
+		}
+	}
+
+	/// Writes the given module in a possibly different file format.
+	public int Write!(
+		/// Output filename, used to determine the format.
+		string targetFilename,
+		/// File information got from the source file with data updated for the output file.
+		ASAPInfo info,
+		/// Contents of the source file.
+		byte[] module,
+		/// Length of the source file.
+		int moduleLen,
+		/// Display information (xex output only).
+		bool tag)
+		throws
+	{
+		int destExt = ASAPInfo.GetPackedExt(targetFilename);
+		switch (destExt) {
+		case ASAPInfo.PackExt("SAP"):
+			// * -> SAP
+			WriteExecutable(null, info, module, moduleLen);
+			return OutputOffset;
+		case ASAPInfo.PackExt("XEX"):
+			// * -> XEX
+			{
+				int[2] initAndPlayer;
+				WriteExecutable(initAndPlayer, info, module, moduleLen);
+				switch (info.Type) {
+				case ASAPModuleType.SapD:
+					if (info.GetPlayerRateScanlines() != 312)
+						throw "Impossible conversion";
+					WriteBytes(resource<byte[]>("xexd.obx"), 2, resource<byte[]>("xexd.obx").Length);
+					WriteWord(initAndPlayer[0]);
+					if (initAndPlayer[1] < 0) {
+						WriteByte(0x60); // RTS
+						WriteByte(0x60); // don't care
+						WriteByte(0x60); // don't care
+					}
+					else {
+						WriteByte(0x4c); // JMP
+						WriteWord(initAndPlayer[1]);
+					}
+					WriteByte(info.GetDefaultSong());
+					break;
+				case ASAPModuleType.SapS:
+					throw "Impossible conversion";
+				default:
+					WriteBytes(resource<byte[]>("xexb.obx"), 2, resource<byte[]>("xexb.obx").Length);
+					WriteWord(initAndPlayer[0]);
+					WriteByte(0x4c); // JMP
+					WriteWord(initAndPlayer[1]);
+					WriteByte(info.GetDefaultSong());
+					int fastplay = info.GetPlayerRateScanlines();
+					WriteByte(fastplay & 1);
+					WriteByte((fastplay >> 1) % 156);
+					WriteByte((fastplay >> 1) % 131);
+					WriteByte(fastplay / 312);
+					WriteByte(fastplay / 262);
+					break;
+				}
+				if (tag)
+					WriteXexInfo(info);
+				WriteWord(0x2e0);
+				WriteWord(0x2e1);
+				WriteWord(tag ? 0x100 : 0x124); // must match xexinfo.asx, xexb.asx, xexd.asx
+				FlashPack() flashPack;
+				flashPack.Compress(this);
+				return OutputOffset;
+			}
+		default:
+			string possibleExt = info.GetOriginalModuleExt(module, moduleLen);
+			if (possibleExt != null) {
+				int packedPossibleExt = ASAPInfo.PackExt(possibleExt);
+				if (destExt == packedPossibleExt
+				 || (destExt == ASAPInfo.PackExt("TM8") && packedPossibleExt == ASAPInfo.PackExt("TMC"))) {
+					// * -> native
+					WriteNative(info, module, moduleLen);
+					return OutputOffset;
+				}
+			}
+			throw "Impossible conversion";
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/astil.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/astil.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/astil.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/astil.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,359 @@
+/*
+ * astil.c - another SID/SAP Tune Information List parser
+ *
+ * Copyright (C) 2011-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "astil.h"
+
+#define ASTIL_MAX_TEXT_LENGTH  100
+#define ASTIL_MAX_COMMENT_LENGTH  1000
+#define ASTIL_MAX_COVERS  10
+
+struct ASTILCover
+{
+	int startSeconds;
+	int endSeconds;
+	char titleAndSource[ASTIL_MAX_TEXT_LENGTH + 1];
+	char artist[ASTIL_MAX_TEXT_LENGTH + 1];
+	char comment[ASTIL_MAX_COMMENT_LENGTH + 1];
+};
+
+struct ASTIL
+{
+	int nCovers;
+	bool isUTF8;
+	char stilFilename[FILENAME_MAX];
+	char title[ASTIL_MAX_TEXT_LENGTH + 1];
+	char author[ASTIL_MAX_TEXT_LENGTH + 1];
+	char directoryComment[ASTIL_MAX_COMMENT_LENGTH + 1];
+	char fileComment[ASTIL_MAX_COMMENT_LENGTH + 1];
+	char songComment[ASTIL_MAX_COMMENT_LENGTH + 1];
+	ASTILCover covers[ASTIL_MAX_COVERS];
+};
+
+ASTIL *ASTIL_New(void)
+{
+	ASTIL *self = (ASTIL *) malloc(sizeof(ASTIL));
+	return self;
+}
+
+void ASTIL_Delete(ASTIL *self)
+{
+	free(self);
+}
+
+static int ASTIL_FindPreviousSlash(const char *filename, int pos)
+{
+	while (pos > 0) {
+		pos--;
+		if (filename[pos] == '/' || filename[pos] == '\\')
+			return pos;
+	}
+	return -1;
+}
+
+static bool ASTIL_ReadUTF8BOM(FILE *fp)
+{
+	if (getc(fp) == 0xef && getc(fp) == 0xbb && getc(fp) == 0xbf)
+		return true;
+	fseek(fp, 0, SEEK_SET);
+	return false;
+}
+
+static int ASTIL_ReadLine(FILE *fp, char *result)
+{
+	int len = 0;
+	for (;;) {
+		int c = getc(fp);
+		switch (c) {
+		case EOF:
+			result[0] = '\0';
+			return -1;
+		case '\n':
+			while (len > 0 && (result[len - 1] == ' ' || result[len - 1] == '\t'))
+				len--;
+			result[len] = '\0';
+			return len;
+		case '\r':
+			break;
+		default:
+			if (len < ASTIL_MAX_TEXT_LENGTH)
+				result[len++] = c;
+			break;
+		}
+	}
+}
+
+static int ASTIL_MatchFilename(const char *line, const char *filename)
+{
+	for (int len = 0; ; len++) {
+		int c = line[len];
+		if (c == filename[len]) {
+			if (c == '\0')
+				return -1;
+		}
+		else if (c == '/' && filename[len] == '\\') {
+		}
+		else
+			return len;
+	}
+}
+
+static void ASTIL_ReadComment(FILE *fp, char *line, char *comment)
+{
+	int len = ASTIL_ReadLine(fp, line);
+	if (len >= 9 && memcmp(line, "COMMENT: ", 9) == 0) {
+		len -= 9;
+		memcpy(comment, line + 9, len + 1);
+		for (;;) {
+			int len2 = ASTIL_ReadLine(fp, line);
+			if (len2 >= 9 && memcmp(line, "         ", 9) == 0) {
+				if (len < ASTIL_MAX_COMMENT_LENGTH - ASTIL_MAX_TEXT_LENGTH) {
+					comment[len++] = '\n';
+					len2 -= 9;
+					memcpy(comment + len, line + 9, len2 + 1);
+					len += len2;
+				}
+			}
+			else
+				break;
+		}
+	}
+}
+
+static int ASTIL_ParseInt(const char *s, int *pos)
+{
+	int result = 0;
+	int i = *pos;
+	while (s[i] >= '0' && s[i] <= '9') {
+		if (result >= 10)
+			return -1;
+		result = 10 * result + s[i++] - '0';
+	}
+	if (i == *pos)
+		return -1;
+	*pos = i;
+	return result;
+}
+
+static bool ASTIL_ReadUntilSongNo(FILE *fp, char *line)
+{
+	while (ASTIL_ReadLine(fp, line) > 0) {
+		if (line[0] == '(' && line[1] == '#')
+			return true;
+	}
+	return false;
+}
+
+static int ASTILCover_ParseTimestamp(const char *s, int *pos)
+{
+	int minutes = ASTIL_ParseInt(s, pos);
+	if (minutes >= 0 && s[(*pos)++] == ':') {
+		int seconds = ASTIL_ParseInt(s, pos);
+		if (seconds >= 0)
+			return 60 * minutes + seconds;
+	}
+	return -1;
+}
+
+static void ASTILCover_SetText(char *result, const char *src)
+{
+	if (strcmp(src, "<?>") == 0)
+		result[0] = '\0';
+	else
+		strcpy(result, src);
+}
+
+static void ASTILCover_Load(ASTILCover *self, FILE *fp, char *line)
+{
+	self->startSeconds = -1;
+	self->endSeconds = -1;
+	const char *ts = strrchr(line, '(');
+	if (ts != NULL) {
+		int i = (int) (ts - line) + 1;
+		int startSeconds = ASTILCover_ParseTimestamp(line, &i);
+		int endSeconds = -1;
+		if (startSeconds >= 0 && line[i] == '-') {
+			i++;
+			endSeconds = ASTILCover_ParseTimestamp(line, &i);
+		}
+		if (line[i] == ')' && line[i + 1] == '\0') {
+			int len = (int) (ts - line);
+			if (line[len - 1] == ' ')
+				len--;
+			line[len] = '\0';
+			self->startSeconds = startSeconds;
+			self->endSeconds = endSeconds;
+		}
+	}
+	ASTILCover_SetText(self->titleAndSource, line + 9);
+	self->artist[0] = '\0';
+	self->comment[0] = '\0';
+	if (ASTIL_ReadLine(fp, line) >= 9 && memcmp(line, " ARTIST: ", 9) == 0) {
+		ASTILCover_SetText(self->artist, line + 9);
+		ASTIL_ReadComment(fp, line, self->comment);
+	}
+}
+
+static void ASTIL_ReadStilBlock(ASTIL *self, FILE *fp, char *line)
+{
+	for (;;) {
+		if (memcmp(line, "   NAME: ", 9) == 0)
+			strcpy(self->title, line + 9);
+		else if (memcmp(line, " AUTHOR: ", 9) == 0)
+			strcpy(self->author, line + 9);
+		else
+			break;
+		if (ASTIL_ReadLine(fp, line) < 9)
+			return;
+	}
+	while (self->nCovers < ASTIL_MAX_COVERS && memcmp(line, "  TITLE: ", 9) == 0) {
+		ASTILCover *cover = self->covers + self->nCovers++;
+		ASTILCover_Load(cover, fp, line);
+	}
+}
+
+bool ASTIL_Load(ASTIL *self, const char *filename, int song)
+{
+	int lastSlash = ASTIL_FindPreviousSlash(filename, (int) strlen(filename));
+	self->nCovers = 0;
+	self->stilFilename[0] = '\0';
+	self->title[0] = '\0';
+	self->author[0] = '\0';
+	self->directoryComment[0] = '\0';
+	self->fileComment[0] = '\0';
+	self->songComment[0] = '\0';
+	if (lastSlash < 0 || lastSlash >= FILENAME_MAX - 14) /* strlen("/Docs/STIL.txt") */
+		return false;
+	memcpy(self->stilFilename, filename, lastSlash + 1);
+	int rootSlash;
+	FILE *fp;
+	for (rootSlash = lastSlash; ; rootSlash = ASTIL_FindPreviousSlash(filename, rootSlash)) {
+		if (rootSlash < 0) {
+			self->stilFilename[0] = '\0';
+			return false;
+		}
+		strcpy(self->stilFilename + rootSlash + 1, "Docs/STIL.txt");
+		self->stilFilename[rootSlash + 5] = self->stilFilename[rootSlash]; /* copy dir separator - slash or backslash */
+		fp = fopen(self->stilFilename, "rb");
+		if (fp != NULL)
+			break;
+		strcpy(self->stilFilename + rootSlash + 1, "STIL.txt");
+		fp = fopen(self->stilFilename, "rb");
+		if (fp != NULL)
+			break;
+	}
+	self->isUTF8 = ASTIL_ReadUTF8BOM(fp);
+	char line[ASTIL_MAX_TEXT_LENGTH + 1];
+	while (ASTIL_ReadLine(fp, line) >= 0) {
+		int len = ASTIL_MatchFilename(line, filename + rootSlash);
+		if (len == -1) {
+			ASTIL_ReadComment(fp, line, self->fileComment);
+			if (line[0] == '(' && line[1] == '#') {
+				do {
+					int i = 2;
+					if (ASTIL_ParseInt(line, &i) - 1 == song && line[i] == ')' && line[i + 1] == '\0') {
+						ASTIL_ReadComment(fp, line, self->songComment);
+						ASTIL_ReadStilBlock(self, fp, line);
+						break;
+					}
+				} while (ASTIL_ReadUntilSongNo(fp, line));
+			}
+			else
+				ASTIL_ReadStilBlock(self, fp, line);
+			break;
+		}
+		if (len == lastSlash - rootSlash + 1 && line[len] == '\0')
+			ASTIL_ReadComment(fp, line, self->directoryComment);
+	}
+	fclose(fp);
+	return true;
+}
+
+const char *ASTIL_GetStilFilename(const ASTIL *self)
+{
+	return self->stilFilename;
+}
+
+bool ASTIL_IsUTF8(const ASTIL *self)
+{
+	return self->isUTF8;
+}
+
+const char *ASTIL_GetTitle(const ASTIL *self)
+{
+	return self->title;
+}
+
+const char *ASTIL_GetAuthor(const ASTIL *self)
+{
+	return self->author;
+}
+
+const char *ASTIL_GetDirectoryComment(const ASTIL *self)
+{
+	return self->directoryComment;
+}
+
+const char *ASTIL_GetFileComment(const ASTIL *self)
+{
+	return self->fileComment;
+}
+
+const char *ASTIL_GetSongComment(const ASTIL *self)
+{
+	return self->songComment;
+}
+
+const ASTILCover *ASTIL_GetCover(const ASTIL *self, int i)
+{
+	if (i < 0 || i >= self->nCovers)
+		return NULL;
+	return &self->covers[i];
+}
+
+int ASTILCover_GetStartSeconds(const ASTILCover *self)
+{
+	return self->startSeconds;
+}
+
+int ASTILCover_GetEndSeconds(const ASTILCover *self)
+{
+	return self->endSeconds;
+}
+
+const char *ASTILCover_GetTitleAndSource(const ASTILCover *self)
+{
+	return self->titleAndSource;
+}
+
+const char *ASTILCover_GetArtist(const ASTILCover *self)
+{
+	return self->artist;
+}
+
+const char *ASTILCover_GetComment(const ASTILCover *self)
+{
+	return self->comment;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/astil.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/astil.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/astil.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/astil.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ * astil.h - another SID/SAP Tune Information List parser
+ *
+ * Copyright (C) 2011-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _ASTIL_H_
+#define _ASTIL_H_
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct ASTIL ASTIL;
+typedef struct ASTILCover ASTILCover;
+
+ASTIL *ASTIL_New(void);
+void ASTIL_Delete(ASTIL *self);
+bool ASTIL_Load(ASTIL *self, const char *filename, int song);
+const char *ASTIL_GetStilFilename(const ASTIL *self);
+/* If true, the following strings are expected to be UTF-8 encoded,
+   otherwise it's an old STIL.txt, ASCII or Windows-1250 maybe? */
+bool ASTIL_IsUTF8(const ASTIL *self);
+const char *ASTIL_GetTitle(const ASTIL *self);
+const char *ASTIL_GetAuthor(const ASTIL *self);
+const char *ASTIL_GetDirectoryComment(const ASTIL *self);
+const char *ASTIL_GetFileComment(const ASTIL *self);
+const char *ASTIL_GetSongComment(const ASTIL *self);
+const ASTILCover *ASTIL_GetCover(const ASTIL *self, int i);
+
+int ASTILCover_GetStartSeconds(const ASTILCover *self);
+int ASTILCover_GetEndSeconds(const ASTILCover *self);
+const char *ASTILCover_GetTitleAndSource(const ASTILCover *self);
+const char *ASTILCover_GetArtist(const ASTILCover *self);
+const char *ASTILCover_GetComment(const ASTILCover *self);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/chksap.pl kodi-audiodecoder-asap-3.0.1/lib/asap-code/chksap.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/chksap.pl	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/chksap.pl	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,718 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+chksap - check, fix or calculate statistics for *.sap files
+
+=head1 SYNOPSIS
+
+  perl chksap.pl option... file...
+
+=head1 DESCRIPTION
+
+I<chksap> processes SAP (Slight Atari Player) files.
+It can operate in one of three modes: check file format conformance,
+fix errors automatically, compute statistics.
+
+You must select a mode using one of the options described below
+and pass names of files or directories to be processed.
+Directories are processed recursively, but only C<*.sap> files
+are analyzed.
+
+=head1 OPTIONS
+
+Exactly one of the following options should be used to select
+the operation:
+
+=over 4
+
+=item B<-c>, B<--check>
+
+Display the errors found for each file.  Does not display anything
+for correct files.
+
+=item B<-f>, B<--fix>
+
+Try to automatically fix errors.  Shows descriptions for the fixed
+errors and the errors that cannot be fixed automatically.
+
+B<Warning:> files are modified in-place and no backup copies are made.
+Make backups yourself before using this option!
+
+=item B<-s>, B<--statistics>
+
+Compute and display statistics.
+
+=back
+
+The following options are available in any mode:
+
+=over 4
+
+=item B<-p>, B<--progress>
+
+Print name of the currently processed file.
+
+=back
+
+In the fix mode the following options are available:
+
+=over 4
+
+=item B<-t>, B<--time>
+
+For files that have no TIME tag detects playback time using an external
+program "asapscan" and stores it in TIME tags.
+
+=item B<-T>, B<--overwrite-time>
+
+Detects playback time using an external program "asapscan" and stores it
+in TIME tags, possibly overwriting the current values.
+
+=back
+
+In the statistics mode the following options are available:
+
+=over 4
+
+=item B<-u>, B<--features>
+
+Lists files with rarely used POKEY and 6502 features.
+
+=back
+
+The following options display some text and terminate the program
+without file operations:
+
+=over 4
+
+=item B<-h>, B<--help>
+
+Display usage summary.
+
+=item B<-v>, B<--version>
+
+Display program version.
+
+=back
+
+=head1 ERRORS FIXED AUTOMATICALLY
+
+=over 4
+
+=item B<line terminators within header are not CRLF>
+
+The lines of the header should be separated with CR/LF pairs
+and not just LF or CR characters.
+
+=item B<header not terminated with CRLF>
+
+The last line of the header is not terminated with CR/LF.
+
+=item B<extra whitespace within header>
+
+There should be exactly one space between the tag name
+and its argument. There should be no spaces after the argument.
+
+=item B<missing AUTHOR, NAME or DATE tag>
+
+Although AUTHOR, NAME and DATE have no meaning to SAP players,
+they should always appear in the file.  If the value is unknown,
+C<<"<?>">> should be used.
+
+=item B<blank AUTHOR, NAME or DATE argument>
+
+If the value is unknown, it should not be empty or consist
+of only question marks - use C<<"<?>">> instead.
+
+=item B<SONGS 1 is superfluous>
+
+C<SONGS> tag with the argument of 1 is meaningless
+because the number of songs defaults to 1.
+
+=item B<DEFSONG 0 is superfluous>
+
+C<DEFSONG> tag with the argument of 0 is meaningless
+because the default song defaults to 0.
+
+=item B<hexadecimal values should be 4-digit>
+
+The arguments of INIT, PLAYER, MUSIC and COVOX should specify all 4 digits.
+
+=item B<hexadecimal values should be uppercase>
+
+The arguments of INIT, PLAYER, MUSIC and COVOX should use C<A-F> letters
+rather than C<a-f>.
+
+=item B<more TIME tags than songs>
+
+There are more TIME tags than specified in the SONGS tag.
+
+=item B<non-standard order of tags>
+
+The order of tags is of little importance, but making some assumptions
+about it makes it easier to create new tools that process SAP files.
+The canonical order is: first SAP, then AUTHOR, then NAME, then DATE.
+After DATE, the following tags should be used in any order: SONGS, TYPE,
+FASTPLAY, STEREO and NTSC.  DEFSONG must appear after SONGS.
+The tags that should appear last are: INIT, PLAYER, MUSIC and COVOX,
+in any order.
+
+=item B<FFFF inside binary part>
+
+Two C<0xFF> bytes start the binary part but are redundant
+inside it.
+
+=item B<garbage bytes at the end>
+
+There are extra bytes after the last binary block, but less than 4 necessary
+to form a new block header.
+
+=item B<truncated binary block>
+
+There are not enough bytes in the file to fill the last binary block.
+
+=back
+
+=head1 ERRORS THAT CANNOT BE FIXED AUTOMATICALLY
+
+=over 4
+
+=item B<filename too long>
+
+For portability, filenames should be limited to 26 characters
+(plus C<.sap>).
+
+=item B<illegal characters in filename>
+
+Filenames should consist of letters (C<A-Z> and C<a-z>),
+digits (C<0-9>) and underscore characters (C<_>).
+
+=item B<file too long>
+
+File should not exceed 63 KB (64512 bytes).  This is because only 62 KB
+base RAM is available for use in Atari XL/XE machines (2 KB is reserved
+for I/O area) and the SAP header should be no longer than 1 KB.
+
+=item B<missing SAP header>
+
+The file does not begin with C<SAP>.
+
+=item B<missing binary part>
+
+Two C<0xFF> bytes were not found in the file.
+
+=item B<unknown header line: ...>
+
+A line of the header does not start with an uppercase tag name.
+
+=item B<unexpected argument of SAP, STEREO or NTSC>
+
+SAP, STEREO and NTSC tags should have no argument.
+
+=item B<invalid argument of AUTHOR, NAME or DATE>
+
+The arguments of these tags should be wrapped in double quotes
+and should consist of ASCII characters between space and lowercase 'z',
+except for the double quote and backtick (0x60) characters.
+Moreover, no argument should be longer than 122 characters
+(including quotes).
+
+=item B<invalid argument of SONGS>
+
+The argument of SONGS must be an integer within the range 2-255.
+
+=item B<invalid argument of DEFSONG>
+
+The argument of DEFSONG must be an integer greater than zero
+and less than the argument of SONGS.
+
+=item B<missing TYPE tag>
+
+This tag is mandatory.
+
+=item B<invalid argument of TYPE>
+
+The currently defined types are: B, C, D, S.
+
+=item B<invalid argument of FASTPLAY>
+
+The argument of FASTPLAY must be an integer within the range 1-32767.
+
+=item B<INIT is meaningless with TYPE C>
+
+C<TYPE C> uses PLAYER and MUSIC tags, but not INIT.
+
+=item B<MUSIC is meaningful only with TYPE C>
+
+The MUSIC tag should be used only with C<TYPE C>.
+
+=item B<missing PLAYER tag>
+
+The PLAYER tag is mandatory for C<TYPE B> and C<TYPE C>.
+
+=item B<invalid argument of INIT, PLAYER, MUSIC or COVOX>
+
+The argument of these tags must be 4-digit hexadecimal number.
+
+=item B<duplicate tag: ...>
+
+The same tag appears several times within the header.
+
+=item B<unknown tag: ...>
+
+Known tags are: SAP, AUTHOR, NAME, DATE, SONGS, DEFSONG, TYPE, FASTPLAY,
+STEREO, NTSC, INIT, PLAYER, MUSIC, COVOX.
+
+=item B<duplicate FFFF in the binary part>
+
+A binary block starts with four C<0xFF> bytes.
+
+=item B<block end address less than start address>
+
+Each binary block begins with a header that specifies the addresses
+of the first and the last byte in the block. The end address must not
+be less than the start address.
+
+=item B<missing TIME tags>
+
+The SAP file contains no TIME tags or less TIME tags than songs.
+
+=back
+
+=head1 BUGS
+
+The checks are more strict than necessary, which is a good thing.
+
+=head1 AUTHOR
+
+Piotr Fusik C<fox@scene.pl>.
+
+=cut
+
+use File::Find;
+use File::Spec;
+use Getopt::Long;
+use Pod::Usage;
+use strict;
+
+my $VERSION = '5.0.1';
+my $asapscan = File::Spec->rel2abs('asapscan');
+my ($check, $fix, $stat) = (0, 0, 0);
+my ($progress, $time, $overwrite_time, $features, $help, $version) = (0, 0, 0, 0, 0, 0);
+my ($total_files, $sap_files, $stereo_files, $ntsc_files) = (0, 0, 0, 0);
+my ($total_length, $min_length, $max_length) = (0, 100_000, 0);
+my ($min_filename, $max_filename);
+my ($time_files, $total_millis) = (0, 0);
+my (@fixed_messages, @notfixed_messages, @fatal_messages);
+my (%stat, %types, %features);
+
+sub process($$) {
+	my ($filename, $fullpath) = @_;
+	my (%fixed, %fatal);
+	my $sap;
+	print STDERR "$fullpath\n" if $progress;
+	open F, '<', $filename and binmode F and read F, $sap, 64513 and close F
+		or die "$filename: $!\n";
+	{
+		++$total_files;
+		my $len = length($sap);
+		if ($len > 64512) {
+			$fatal{'file too long'} = 1;
+			last;
+		}
+		$fatal{'filename too long'} = 1 if length($filename) > 30;
+		if ($filename !~ /^\w+\.sap$/is) {
+			$fatal{'illegal characters in filename'} = 1;
+		}
+		if ($sap !~ /^SAP\W/s) {
+			$fatal{'missing SAP header'} = 1;
+			last;
+		}
+		if ($sap !~ /^(.+?)\xFF\xFF(.{5,})$/s) {
+			$fatal{'missing binary part'} = 1;
+			last;
+		}
+		++$sap_files;
+		$total_length += $len;
+		if ($min_length > $len) {
+			$min_length = $len;
+			$min_filename = $filename;
+		}
+		if ($max_length < $len) {
+			$max_length = $len;
+			$max_filename = $filename;
+		}
+		my ($hdr, $bin) = ($1, $2);
+		if ($hdr =~ /\x0D[^\x0A]|[^\x0D]\x0A/) {
+			$fixed{'line terminators within header are not CRLF'} = 1;
+		}
+		if ($hdr !~ s/\x0D\x0A$//s) {
+			$fixed{'header not terminated with CRLF'} = 1;
+		}
+		my %tags;
+		my @times;
+		for (split /[\x0D\x0A]+/, $hdr) {
+			my ($tag, $spaces1, $arg, $spaces2);
+			unless (($tag, $spaces1, $arg, $spaces2) =
+				/^([A-Z]+)(?:( +)(.+?))?( *)$/s) {
+				$fatal{"unknown header line: $_"} = 1;
+				next;
+			}
+			if (length($spaces1) > 1 || $spaces2) {
+				$fixed{'extra whitespace within header'} = 1;
+			}
+			if (exists($tags{$tag})) {
+				$fatal{"duplicate tag: $tag"} = 1;
+				next;
+			}
+			if ($tag eq 'SAP') {
+				$fatal{'unexpected argument of SAP'} = 1 if $arg ne '';
+			}
+			elsif ($tag eq 'AUTHOR') {
+				++$stat{'AUTHOR'}{$arg};
+				if ($arg !~ /^"[ -_a-z|]{0,120}"$/s) {
+					$fatal{'invalid argument of AUTHOR'} = 1;
+				}
+				elsif ($arg =~ /^"\?*"$/s) {
+					$fixed{'blank AUTHOR argument'} = 1;
+					$arg = '"<?>"';
+				}
+			}
+			elsif ($tag eq 'NAME') {
+				++$stat{'NAME'}{$arg};
+				exists($tags{'AUTHOR'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg !~ /^"[ -_a-z|]{0,120}"$/s) {
+					$fatal{'invalid argument of NAME'} = 1;
+				}
+				elsif ($arg =~ /^"\?*"$/s) {
+					$fixed{'blank NAME argument'} = 1;
+					$arg = '"<?>"';
+				}
+			}
+			elsif ($tag eq 'DATE') {
+				++$stat{'DATE'}{$arg};
+				exists($tags{'NAME'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg !~ /^"[ -_a-z|]{0,120}"$/s) {
+					$fatal{'invalid argument of DATE'} = 1;
+				}
+				elsif ($arg =~ /^"\?*"$/s) {
+					$fixed{'blank DATE argument'} = 1;
+					$arg = '"<?>"';
+				}
+			}
+			elsif ($tag eq 'SONGS') {
+				++$stat{'SONGS'}{$arg};
+				exists($tags{'DATE'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg !~ /^[1-9]\d*$/s || $arg > 255) {
+					$fatal{'invalid argument of SONGS'} = 1;
+				}
+				elsif ($arg eq '1') {
+					$fixed{'SONGS 1 is superfluous'} = 1;
+					next;
+				}
+			}
+			elsif ($tag eq 'DEFSONG') {
+				exists($tags{'SONGS'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg eq '0') {
+					$fixed{'DEFSONG 0 is superfluous'} = 1;
+					next;
+				}
+				if ($arg !~ /^[1-9]\d*$/s) {
+					$fatal{'invalid argument of DEFSONG'} = 1;
+				}
+			}
+			elsif ($tag eq 'TYPE') {
+				exists($tags{'DATE'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg !~ /^[BCDS]$/s) {
+					$fatal{'invalid argument of TYPE'} = 1;
+				}
+			}
+			elsif ($tag eq 'FASTPLAY') {
+				++$stat{'FASTPLAY'}{$arg};
+				exists($tags{'DATE'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg !~ /^[1-9]\d*$/s || $arg > 32767) {
+					$fatal{'invalid argument of FASTPLAY'} = 1;
+				}
+			}
+			elsif ($tag eq 'STEREO') {
+				++$stereo_files;
+				exists($tags{'DATE'})
+					or $fixed{'non-standard order of tags'} = 1;
+				$fatal{'unexpected argument of STEREO'} = 1 if $arg ne '';
+			}
+			elsif ($tag eq 'NTSC') {
+				++$ntsc_files;
+				exists($tags{'DATE'})
+					or $fixed{'non-standard order of tags'} = 1;
+				$fatal{'unexpected argument of NTSC'} = 1 if $arg ne '';
+			}
+			elsif ($tag eq 'INIT' || $tag eq 'PLAYER' || $tag eq 'MUSIC' || $tag eq 'COVOX') {
+				exists($tags{'TYPE'})
+					or $fixed{'non-standard order of tags'} = 1;
+				if ($arg !~ /^[0-9A-Fa-f]{1,4}$/s) {
+					$fatal{"invalid argument of $tag"} = 1;
+				}
+				elsif (length($arg) != 4) {
+					$arg = sprintf('%04X', hex($arg));
+					$fixed{'hexadecimal values should be 4-digit'} = 1;
+				}
+				elsif ($arg =~ y/a-f/A-F/) {
+					$fixed{'hexadecimal values should be uppercase'} = 1;
+				}
+			}
+			elsif ($tag eq 'TIME') {
+				if ($arg !~ /^\d?\d:\d\d(?:\.\d\d\d?)?(?: LOOP)?$/s) {
+					$fatal{'invalid argument of TIME'} = 1;
+				}
+				push @times, $arg;
+				next;
+			}
+			else {
+				$fatal{"unknown tag: $tag"} = 1;
+				next;
+			}
+			$tags{$tag} = $arg;
+		}
+		$fatal{'invalid argument of DEFSONG'} = 1
+			if exists($tags{'SONGS'}) && $tags{'DEFSONG'} >= $tags{'SONGS'};
+		if (@times > ($tags{'SONGS'} || 1)) {
+			splice @times, $tags{'SONGS'} || 1;
+			$fixed{'more TIME tags than songs'} = 1;
+		}
+		elsif (@times < ($tags{'SONGS'} || 1)) {
+			$fatal{'missing TIME tags'} = 1;
+		}
+		if (exists($tags{'TYPE'})) {
+			my $type = $tags{'TYPE'};
+			$fatal{'INIT is meaningless with TYPE C'} = 1
+				if $type eq 'C' && exists($tags{'INIT'});
+			$fatal{'MUSIC is meaningful only with TYPE C'} = 1
+				if $type ne 'C' && exists($tags{'MUSIC'});
+			$fatal{'missing PLAYER tag'} = 1
+				if ($type eq 'B' || $type eq 'C') && !exists($tags{'PLAYER'});
+		}
+		else {
+			$fatal{'missing TYPE tag'} = 1;
+		}
+		++$types{$tags{'TYPE'}}{exists($tags{'STEREO'})?'stereo':'mono'};
+		my $i = 0;
+		for (;;) {
+			my $bh = substr($bin, $i, 5);
+			if (length($bh) < 5) {
+				if ($bh ne '') {
+					substr($bin, $i) = '';
+					$fixed{'garbage bytes at the end'} = 1;
+				}
+				last;
+			}
+			my ($start, $end) = unpack('vv', $bh);
+			if ($start == 0xffff) {
+				$fatal{'duplicate FFFF in the binary part'} = 1;
+				last;
+			}
+			if ($end < $start) {
+				$fatal{'block end address less than start address'} = 1;
+				last;
+			}
+			my $ni = $i + 5 + $end - $start;
+			if ($ni > length($bin)) {
+				substr($bin, $i + 2, 2) =
+					pack('v', $start + length($bin) - $i - 5);
+				$fixed{'truncated binary block'} = 1;
+				last;
+			}
+			$i = $ni;
+			if (substr($bin, $i, 2) eq "\xFF\xFF") {
+				substr($bin, $i, 2) = '';
+				$fixed{'FFFF inside binary part'} = 1;
+			}
+		}
+		if (%fixed || ($fix && $time && !@times) || $overwrite_time) {
+			if (%fatal) {
+				push @notfixed_messages,
+					"$fullpath (" . join('; ', sort(keys(%fixed))) . ")\n";
+			}
+			else {
+				if ($fix) {
+					if (($time && !@times) || $overwrite_time) {
+						my $times = `$asapscan -t $filename`;
+						if (!$times) {
+							$fatal{'error running asapscan'} = 1;
+						}
+						elsif ($times =~ /^(?:TIME \d?\d:\d\d(?:\.\d\d\d?)?(?: LOOP)?\r?\n)+$/s) {
+							my @new_times = $times =~ /\d?\d:\d\d(?:\.\d\d\d?)?(?: LOOP)?/gs;
+							if (!@times) {
+								@times = @new_times;
+								$fixed{'added TIME tags'} = 1;
+							}
+							elsif ("@new_times" ne "@times") {
+								@times = @new_times;
+								$fixed{'changed TIME tags'} = 1;
+							}
+						}
+						else {
+							$fatal{'cannot detect TIME'} = 1;
+						}
+					}
+					if (%fixed) {
+						open F, '>', $filename and binmode F
+							or die "$filename: $!\n";
+						print F "SAP\x0D\x0A";
+						for ('AUTHOR', 'NAME', 'DATE') {
+							if (exists($tags{$_})) {
+								print F "$_ $tags{$_}\x0D\x0A";
+							}
+							else {
+								$fixed{"missing $_ tag"} = 1;
+								print F "$_ \"<?>\"\x0D\x0A";
+							}
+						}
+						print F "SONGS $tags{'SONGS'}\x0D\x0A"
+							if exists($tags{'SONGS'});
+						print F "DEFSONG $tags{'DEFSONG'}\x0D\x0A"
+							if exists($tags{'DEFSONG'});
+						print F "STEREO\x0D\x0A" if exists($tags{'STEREO'});
+						print F "NTSC\x0D\x0A" if exists($tags{'NTSC'});
+						for ('TYPE', 'FASTPLAY', 'INIT', 'MUSIC', 'PLAYER', 'COVOX') {
+							print F "$_ $tags{$_}\x0D\x0A" if exists($tags{$_});
+						}
+						for (@times) {
+							print F "TIME $_\x0D\x0A";
+						}
+						print F "\xFF\xFF", $bin;
+						close F or die "$filename: $!\n";
+					}
+				}
+				if (%fixed) {
+					push @fixed_messages,
+						"$fullpath (" . join('; ', sort(keys(%fixed))) . ")\n";
+				}
+			}
+		}
+		if (@times) {
+			++$time_files;
+			for (@times) {
+				my ($minutes, $seconds, $hundredths, $millis) = /(\d?\d):(\d\d)(?:\.(\d\d)(\d?))?/;
+				$total_millis += 60_000 * $minutes + 1000 * $seconds + $hundredths * 10 + $millis;
+			}
+		}
+	}
+	if ($features) {
+		my @features = `$asapscan -f -u $filename`;
+		if ($?) {
+			$fatal{'error running asapscan'} = 1;
+		}
+		else {
+			s/\s+$//, push @{$features{$_}}, $fullpath for @features;
+		}
+	}
+	if (%fatal) {
+		push @fatal_messages,
+			"$fullpath (" . join('; ', sort(keys(%fatal))) . ")\n";
+	}
+}
+
+sub wanted() {
+	process($_, $File::Find::name) if /\.sap$/is;
+}
+
+Getopt::Long::Configure('bundling');
+GetOptions(
+	'check|c' => \$check,
+	'fix|f' => \$fix,
+	'statistics|s' => \$stat,
+	'progress|p' => \$progress,
+	'time|t' => \$time,
+	'overwrite-time|T' => \$overwrite_time,
+	'features|u' => \$features,
+	'help|h' => \$help,
+	'version|v' => \$version,
+) or pod2usage(2);
+
+pod2usage({ -verbose => 1, -exitval => 0 }) if $help;
+if ($version) {
+	print "chksap $VERSION\n";
+	exit 0;
+}
+
+pod2usage(2) if $check + $fix + $stat != 1 || $time > $fix +$stat || $overwrite_time > $fix || @ARGV == 0;
+
+find(\&wanted, @ARGV);
+
+print "Files processed:              $total_files\n";
+print "Not recognized as valid SAP:  ",
+	$total_files - $sap_files, "\n" if $sap_files != $total_files;
+if ($check) {
+	print "Bad files that can be fixed automatically:    ",
+		scalar(@fixed_messages), "\n";
+	print "Bad files that cannot be fixed automatically: ",
+		scalar(@fatal_messages), "\n";
+	print "\nPossible automatic fixes:\n",
+		@fixed_messages if @fixed_messages;
+	print "\nAutomatic fix not possible:\n",
+		@fatal_messages if @fatal_messages;
+	print "\nCan fix automatically after correcting previous errors:\n",
+		@notfixed_messages if @notfixed_messages;
+}
+elsif ($fix) {
+	print "Bad files fixed automatically:                ",
+		scalar(@fixed_messages), "\n";
+	print "Bad files that cannot be fixed automatically: ",
+		scalar(@fatal_messages), "\n";
+	print "\nFixed:\n",
+		@fixed_messages if @fixed_messages;
+	print "\nCannot fix automatically:\n",
+		@fatal_messages if @fatal_messages;
+	print "\nCan fix after correcting previous errors:\n",
+		@notfixed_messages if @notfixed_messages;
+}
+elsif ($stat) {
+	print "Total file size:              $total_length bytes\n";
+	printf "Average file size:            %.0f bytes\n", $total_length / $sap_files if $sap_files;
+	print "Smallest SAP file:            $min_filename ($min_length bytes)\n" if $min_filename;
+	print "Biggest SAP file:             $max_filename ($max_length bytes)\n" if $max_filename;
+	my $ref = $stat{'SONGS'};
+	if ($ref) {
+		print "\nFiles with subsongs:\n";
+		my ($files_with_subsongs, $extra_subsongs);
+		for (sort { $a <=> $b } keys(%$ref)) {
+			next if $_ == 1;
+			my $files = $ref->{$_};
+			printf "%3s subsongs:%4d file%s\n", $_, $files, $files != 1 ? 's' : '';
+			$files_with_subsongs += $files;
+			$extra_subsongs += $files * ($_ - 1);
+		}
+		print "Total: $extra_subsongs extra subsongs in $files_with_subsongs files\n";
+	}
+	printf "\nFiles tagged with TIME:       $time_files (%d days %d hours %d minutes %g seconds)\n",
+		$total_millis / 86_400_000, $total_millis / 3600_000 % 24,
+		$total_millis / 60_000 % 60, $total_millis / 1000 % 60;
+	print "\nStereo SAP files:             $stereo_files\n";
+	print "NTSC SAP files:               $ntsc_files\n";
+	for (sort keys %types) {
+		printf "Type %s:    mono:%5d    stereo:%5d    total:%5d\n", $_,
+			$types{$_}{'mono'}, $types{$_}{'stereo'}, $types{$_}{'mono'} + $types{$_}{'stereo'};
+	}
+	for ('FASTPLAY', 'AUTHOR', 'DATE', 'NAME') {
+		$ref = $stat{$_};
+		if ($ref) {
+			print "\n$_ values:\n";
+			for (sort keys(%$ref)) {
+				printf "%4dx: %s\n", $ref->{$_}, $_;
+			}
+		}
+	}
+	if ($features) {
+		for (sort keys %features) {
+			print "\nFiles which use $_:\n";
+			print "$_\n" for sort @{$features{$_}};
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/COPYING kodi-audiodecoder-asap-3.0.1/lib/asap-code/COPYING
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/COPYING	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/cpu6502.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/cpu6502.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/cpu6502.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/cpu6502.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,1049 @@
+// cpu6502.ci - 6502 CPU emulator
+//
+// Copyright (C) 2010-2020  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// How 6502 registers are stored in this emulator:
+// All variables are int, because modern processors (and Java bytecode)
+// tend to operate more effectively on these type than narrower ones.
+// Pc is really an unsigned 16-bit integer.
+// A, X, Y and S are unsigned 8-bit integers.
+// Flags are decomposed into three variables for improved performance.
+// C is either 0 or 1.
+// Nz contains 6502 flags N and Z.
+// N is set if (Nz >= 0x80). Z is set if ((Nz & 0xff) == 0).
+// Usually nz is simply assigned the unsigned 8-bit operation result.
+// There are just a few operations (BIT, PLP and RTI) where both N and Z may
+// be set. In these cases, N is reflected by the 8th (not 7th) bit of Nz.
+// Vdi contains rarely used flags V, D and I, as a combination
+// of VFlag, DFlag and IFlag. Other Vdi bits are clear.
+
+// "Unofficial" opcodes are those not documented as "legal" 6502 opcodes.
+// Their operation has been reverse-engineered on Atari 800XL and Atari 65XE.
+// Unofficial opcodes are identical to C64's 6510, except for 0x8b and 0xab.
+// The operation of "unstable" opcodes is partially uncertain.
+// Explanation is welcome.
+
+// Emulation of POKEY timer interrupts is included.
+
+class Cpu6502
+{
+	internal ASAP! Asap;
+	internal byte[65536] Memory;
+	internal int Cycle;
+
+	internal int Pc;
+	internal int A;
+	internal int X;
+	internal int Y;
+	internal int S;
+	int Nz;
+	int C;
+	int Vdi;
+
+	const int VFlag = 0x40;
+	const int DFlag = 0x08;
+	const int IFlag = 0x04;
+	const int ZFlag = 0x02;
+
+	internal void Reset!()
+	{
+		Cycle = 0;
+		Nz = 0;
+		C = 0;
+		Vdi = 0;
+	}
+
+	int Peek(int addr)
+	{
+		if ((addr & 0xf900) == 0xd000)
+			return Asap.PeekHardware(addr);
+		else
+			return Memory[addr];
+	}
+
+	void Poke!(int addr, int data)
+	{
+		if ((addr & 0xf900) == 0xd000)
+			Asap.PokeHardware(addr, data);
+		else
+			Memory[addr] = data;
+	}
+
+	int PeekReadModifyWrite!(int addr)
+	{
+		if (addr >> 8 == 0xd2) {
+			Cycle--;
+			int data = Asap.PeekHardware(addr);
+			Asap.PokeHardware(addr, data);
+			Cycle++;
+			return data;
+		}
+		return Memory[addr];
+	}
+
+	int Pull!()
+	{
+		int s = (S + 1) & 0xff;
+		S = s;
+		return Memory[0x0100 + s];
+	}
+
+	void PullFlags!()
+	{
+		int data = Pull();
+		Nz = ((data & 0x80) << 1) + (~data & ZFlag);
+		C = data & 1;
+		Vdi = data & (VFlag | DFlag | IFlag);
+	}
+
+	void Push!(int data)
+	{
+		int s = S;
+		Memory[0x0100 + s] = data;
+		S = (s - 1) & 0xff;
+	}
+
+	internal void PushPc!()
+	{
+		Push(Pc >> 8);
+		Push(Pc & 0xff);
+	}
+
+	void PushFlags!(int b)
+	{
+		int nz = Nz;
+		b += ((nz | nz >> 1) & 0x80) + Vdi + C;
+		if ((nz & 0xff) == 0)
+			b += ZFlag;
+		Push(b);
+	}
+
+	void AddWithCarry!(int data)
+	{
+		int a = A;
+		int vdi = Vdi;
+		int tmp = a + data + C;
+		Nz = tmp & 0xff;
+		if ((vdi & DFlag) == 0) {
+			// binary mode
+			Vdi = (vdi & (DFlag | IFlag)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & VFlag);
+			C = tmp >> 8;
+			A = Nz;
+		}
+		else {
+			// decimal mode
+			int al = (a & 0x0f) + (data & 0x0f) + C;
+			if (al >= 10) {
+				tmp += al < 26 ? 6 : -10;
+				// Set N from tmp, leave Z unchanged. Zero can only change to 6, this doesn't affect N.
+				if (Nz != 0)
+					Nz = (tmp & 0x80) + 1;
+			}
+			Vdi = (vdi & (DFlag | IFlag)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & VFlag);
+			if (tmp >= 0xa0) {
+				C = 1;
+				A = (tmp - 0xa0) & 0xff;
+			}
+			else {
+				C = 0;
+				A = tmp;
+			}
+		}
+	}
+
+	void SubtractWithCarry!(int data)
+	{
+		int a = A;
+		int vdi = Vdi;
+		int borrow = C - 1;
+		int tmp = a - data + borrow;
+		int al = (a & 0x0f) - (data & 0x0f) + borrow;
+		Vdi = (vdi & (DFlag | IFlag)) + ((((data ^ a) & (a ^ tmp)) >> 1) & VFlag);
+		C = tmp >= 0 ? 1 : 0;
+		Nz = A = tmp & 0xff;
+		if ((vdi & DFlag) != 0) {
+			// decimal mode
+			if (al < 0)
+				A += al < -10 ? 10 : -6;
+			if (C == 0)
+				A = (A - 0x60) & 0xff;
+		}
+	}
+
+	int ArithmeticShiftLeft!(int addr)
+	{
+		int data = PeekReadModifyWrite(addr);
+		C = data >> 7;
+		data = (data << 1) & 0xff;
+		Poke(addr, data);
+		return data;
+	}
+
+	int RotateLeft!(int addr)
+	{
+		int data = (PeekReadModifyWrite(addr) << 1) + C;
+		C = data >> 8;
+		data &= 0xff;
+		Poke(addr, data);
+		return data;
+	}
+
+	int LogicalShiftRight!(int addr)
+	{
+		int data = PeekReadModifyWrite(addr);
+		C = data & 1;
+		data >>= 1;
+		Poke(addr, data);
+		return data;
+	}
+
+	int RotateRight!(int addr)
+	{
+		int data = (C << 8) + PeekReadModifyWrite(addr);
+		C = data & 1;
+		data >>= 1;
+		Poke(addr, data);
+		return data;
+	}
+
+	int Decrement!(int addr)
+	{
+		int data = PeekReadModifyWrite(addr) - 1 & 0xff;
+		Poke(addr, data);
+		return data;
+	}
+
+	int Increment!(int addr)
+	{
+		int data = PeekReadModifyWrite(addr) + 1 & 0xff;
+		Poke(addr, data);
+		return data;
+	}
+
+	void ExecuteIrq!(int b)
+	{
+		PushPc();
+		PushFlags(b);
+		Vdi |= IFlag;
+		Pc = Memory[0xfffe] + (Memory[0xffff] << 8);
+	}
+
+	void CheckIrq!()
+	{
+		if ((Vdi & IFlag) == 0 && Asap.IsIrq()) {
+			Cycle += 7;
+			ExecuteIrq(0x20); // B flag clear
+		}
+	}
+
+	void Shx!(int addr, int data)
+	{
+		addr += Memory[Pc++];
+		int hi = Memory[Pc++];
+		data &= hi + 1;
+		if (addr >= 0x100)
+			hi = data - 1;
+		addr += hi << 8;
+		Poke(addr, data);
+	}
+
+	/// Runs 6502 emulation for the specified number of Atari scanlines.
+	/// Each scanline is 114 cycles of which 9 is taken by ANTIC for memory refresh.
+	internal void DoFrame!(int cycleLimit)
+	{
+		while (Cycle < cycleLimit) {
+
+			if (Cycle >= Asap.NextEventCycle) {
+				Asap.HandleEvent();
+				CheckIrq();
+			}
+#if ASAPSCAN
+			native {
+				if (cpu_trace != 0)
+					trace_cpu();
+			}
+#endif
+			int data = Memory[Pc++];
+			const byte[256] opcodeCycles = {
+			//	0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+				7, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 4, 4, 6, 6, // 0x
+				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 1x
+				6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 4, 4, 6, 6, // 2x
+				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 3x
+				6, 6, 2, 8, 3, 3, 5, 5, 3, 2, 2, 2, 3, 4, 6, 6, // 4x
+				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 5x
+				6, 6, 2, 8, 3, 3, 5, 5, 4, 2, 2, 2, 5, 4, 6, 6, // 6x
+				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // 7x
+				2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4, // 8x
+				2, 6, 2, 6, 4, 4, 4, 4, 2, 5, 2, 5, 5, 5, 5, 5, // 9x
+				2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 2, 4, 4, 4, 4, // Ax
+				2, 5, 2, 5, 4, 4, 4, 4, 2, 4, 2, 4, 4, 4, 4, 4, // Bx
+				2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6, // Cx
+				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7, // Dx
+				2, 6, 2, 8, 3, 3, 5, 5, 2, 2, 2, 2, 4, 4, 6, 6, // Ex
+				2, 5, 2, 8, 4, 4, 6, 6, 2, 4, 2, 7, 4, 4, 7, 7  // Fx
+			};
+			Cycle += opcodeCycles[data];
+			int addr = 0; // This initialization is only to avoid false "uninitialized value used" warnings and errors.
+
+			// First dispatch on opcode.
+			// Handles execution of instructions with fixed addressing modes (code ends with `continue`)
+			// and computes effective address for instructions with variable addressing mode
+			// (code ends with `break" to pass to the second `switch`).
+			switch (data) {
+			case 0x00: // BRK
+				Pc++;
+				ExecuteIrq(0x30); // B flag set
+				continue;
+			case 0x01: // ORA (ab,x)
+			case 0x03: // ASO (ab,x) [unofficial]
+			case 0x21: // AND (ab,x)
+			case 0x23: // RLA (ab,x) [unofficial]
+			case 0x41: // EOR (ab,x)
+			case 0x43: // LSE (ab,x) [unofficial]
+			case 0x61: // ADC (ab,x)
+			case 0x63: // RRA (ab,x) [unofficial]
+			case 0x81: // STA (ab,x)
+			case 0x83: // SAX (ab,x) [unofficial]
+			case 0xa1: // LDA (ab,x)
+			case 0xa3: // LAX (ab,x) [unofficial]
+			case 0xc1: // CMP (ab,x)
+			case 0xc3: // DCM (ab,x) [unofficial]
+			case 0xe1: // SBC (ab,x)
+			case 0xe3: // INS (ab,x) [unofficial]
+				addr = (Memory[Pc++] + X) & 0xff;
+				addr = Memory[addr] + (Memory[addr + 1 & 0xff] << 8);
+				break;
+			case 0x02: // CIM [unofficial]
+			case 0x12:
+			case 0x22:
+			case 0x32:
+			case 0x42:
+			case 0x52:
+			case 0x62:
+			case 0x72:
+			case 0x92:
+			case 0xb2:
+			case 0xd2:
+			case 0xf2:
+				Pc--;
+				Cycle = Asap.NextEventCycle;
+				continue;
+			case 0x04: // NOP ab [unofficial]
+			case 0x44:
+			case 0x64:
+			case 0x14: // NOP ab,x [unofficial]
+			case 0x34:
+			case 0x54:
+			case 0x74:
+			case 0xd4:
+			case 0xf4:
+			case 0x80: // NOP #ab [unofficial]
+			case 0x82:
+			case 0x89:
+			case 0xc2:
+			case 0xe2:
+				Pc++;
+				continue;
+			case 0x05: // ORA ab
+			case 0x06: // ASL ab
+			case 0x07: // ASO ab [unofficial]
+			case 0x24: // BIT ab
+			case 0x25: // AND ab
+			case 0x26: // ROL ab
+			case 0x27: // RLA ab [unofficial]
+			case 0x45: // EOR ab
+			case 0x46: // LSR ab
+			case 0x47: // LSE ab [unofficial]
+			case 0x65: // ADC ab
+			case 0x66: // ROR ab
+			case 0x67: // RRA ab [unofficial]
+			case 0x84: // STY ab
+			case 0x85: // STA ab
+			case 0x86: // STX ab
+			case 0x87: // SAX ab [unofficial]
+			case 0xa4: // LDY ab
+			case 0xa5: // LDA ab
+			case 0xa6: // LDX ab
+			case 0xa7: // LAX ab [unofficial]
+			case 0xc4: // CPY ab
+			case 0xc5: // CMP ab
+			case 0xc6: // DEC ab
+			case 0xc7: // DCM ab [unofficial]
+			case 0xe4: // CPX ab
+			case 0xe5: // SBC ab
+			case 0xe6: // INC ab
+			case 0xe7: // INS ab [unofficial]
+				addr = Memory[Pc++];
+				break;
+			case 0x08: // PHP
+				PushFlags(0x30); // B flag set
+				continue;
+			case 0x09: // ORA #ab
+			case 0x29: // AND #ab
+			case 0x49: // EOR #ab
+			case 0x69: // ADC #ab
+			case 0xa0: // LDY #ab
+			case 0xa2: // LDX #ab
+			case 0xa9: // LDA #ab
+			case 0xc0: // CPY #ab
+			case 0xc9: // CMP #ab
+			case 0xe0: // CPX #ab
+			case 0xe9: // SBC #ab
+			case 0xeb: // SBC #ab [unofficial]
+				addr = Pc++;
+				break;
+			case 0x0a: // ASL
+				C = A >> 7;
+				Nz = A = (A << 1) & 0xff;
+				continue;
+			case 0x0b: // ANC #ab [unofficial]
+			case 0x2b:
+				Nz = A &= Memory[Pc++];
+				C = Nz >> 7;
+				continue;
+			case 0x0c: // NOP abcd [unofficial]
+				Pc += 2;
+				continue;
+			case 0x0d: // ORA abcd
+			case 0x0e: // ASL abcd
+			case 0x0f: // ASO abcd [unofficial]
+			case 0x2c: // BIT abcd
+			case 0x2d: // AND abcd
+			case 0x2e: // ROL abcd
+			case 0x2f: // RLA abcd [unofficial]
+			case 0x4d: // EOR abcd
+			case 0x4e: // LSR abcd
+			case 0x4f: // LSE abcd [unofficial]
+			case 0x6c: // JMP (abcd)
+			case 0x6d: // ADC abcd
+			case 0x6e: // ROR abcd
+			case 0x6f: // RRA abcd [unofficial]
+			case 0x8c: // STY abcd
+			case 0x8d: // STA abcd
+			case 0x8e: // STX abcd
+			case 0x8f: // SAX abcd [unofficial]
+			case 0xac: // LDY abcd
+			case 0xad: // LDA abcd
+			case 0xae: // LDX abcd
+			case 0xaf: // LAX abcd [unofficial]
+			case 0xcc: // CPY abcd
+			case 0xcd: // CMP abcd
+			case 0xce: // DEC abcd
+			case 0xcf: // DCM abcd [unofficial]
+			case 0xec: // CPX abcd
+			case 0xed: // SBC abcd
+			case 0xee: // INC abcd
+			case 0xef: // INS abcd [unofficial]
+				addr = Memory[Pc++];
+				addr += Memory[Pc++] << 8;
+				break;
+			case 0x10: // BPL
+				if (Nz < 0x80)
+					break;
+				Pc++;
+				continue;
+			case 0x11: // ORA (ab),y
+			case 0x31: // AND (ab),y
+			case 0x51: // EOR (ab),y
+			case 0x71: // ADC (ab),y
+			case 0xb1: // LDA (ab),y
+			case 0xb3: // LAX (ab),y [unofficial]
+			case 0xd1: // CMP (ab),y
+			case 0xf1: // SBC (ab),y
+				int zp = Memory[Pc++];
+				addr = Memory[zp] + Y;
+				if (addr >= 0x100)
+					Cycle++;
+				addr = (addr + (Memory[zp + 1 & 0xff] << 8)) & 0xffff;
+				break;
+			case 0x13: // ASO (ab),y [unofficial]
+			case 0x33: // RLA (ab),y [unofficial]
+			case 0x53: // LSE (ab),y [unofficial]
+			case 0x73: // RRA (ab),y [unofficial]
+			case 0x91: // STA (ab),y
+			case 0xd3: // DCM (ab),y [unofficial]
+			case 0xf3: // INS (ab),y [unofficial]
+				addr = Memory[Pc++];
+				addr = (Memory[addr] + (Memory[addr + 1 & 0xff] << 8) + Y) & 0xffff;
+				break;
+			case 0x15: // ORA ab,x
+			case 0x16: // ASL ab,x
+			case 0x17: // ASO ab,x [unofficial]
+			case 0x35: // AND ab,x
+			case 0x36: // ROL ab,x
+			case 0x37: // RLA ab,x [unofficial]
+			case 0x55: // EOR ab,x
+			case 0x56: // LSR ab,x
+			case 0x57: // LSE ab,x [unofficial]
+			case 0x75: // ADC ab,x
+			case 0x76: // ROR ab,x
+			case 0x77: // RRA ab,x [unofficial]
+			case 0x94: // STY ab,x
+			case 0x95: // STA ab,x
+			case 0xb4: // LDY ab,x
+			case 0xb5: // LDA ab,x
+			case 0xd5: // CMP ab,x
+			case 0xd6: // DEC ab,x
+			case 0xd7: // DCM ab,x [unofficial]
+			case 0xf5: // SBC ab,x
+			case 0xf6: // INC ab,x
+			case 0xf7: // INS ab,x [unofficial]
+				addr = (Memory[Pc++] + X) & 0xff;
+				break;
+			case 0x18: // CLC
+				C = 0;
+				continue;
+			case 0x19: // ORA abcd,y
+			case 0x39: // AND abcd,y
+			case 0x59: // EOR abcd,y
+			case 0x79: // ADC abcd,y
+			case 0xb9: // LDA abcd,y
+			case 0xbb: // LAS abcd,y [unofficial, unstable]
+			case 0xbe: // LDX abcd,y
+			case 0xbf: // LAX abcd,y [unofficial]
+			case 0xd9: // CMP abcd,y
+			case 0xf9: // SBC abcd,y
+				addr = Memory[Pc++] + Y;
+				if (addr >= 0x100)
+					Cycle++;
+				addr = (addr + (Memory[Pc++] << 8)) & 0xffff;
+				break;
+			case 0x1b: // ASO abcd,y [unofficial]
+			case 0x3b: // RLA abcd,y [unofficial]
+			case 0x5b: // LSE abcd,y [unofficial]
+			case 0x7b: // RRA abcd,y [unofficial]
+			case 0x99: // STA abcd,y
+			case 0xdb: // DCM abcd,y [unofficial]
+			case 0xfb: // INS abcd,y [unofficial]
+				addr = Memory[Pc++] + Y;
+				addr = (addr + (Memory[Pc++] << 8)) & 0xffff;
+				break;
+			case 0x1c: // NOP abcd,x [unofficial]
+			case 0x3c:
+			case 0x5c:
+			case 0x7c:
+			case 0xdc:
+			case 0xfc:
+				if (Memory[Pc] + X >= 0x100)
+					Cycle++;
+				Pc += 2;
+				continue;
+			case 0x1d: // ORA abcd,x
+			case 0x3d: // AND abcd,x
+			case 0x5d: // EOR abcd,x
+			case 0x7d: // ADC abcd,x
+			case 0xbc: // LDY abcd,x
+			case 0xbd: // LDA abcd,x
+			case 0xdd: // CMP abcd,x
+			case 0xfd: // SBC abcd,x
+				addr = Memory[Pc++] + X;
+				if (addr >= 0x100)
+					Cycle++;
+				addr = (addr + (Memory[Pc++] << 8)) & 0xffff;
+				break;
+			case 0x1e: // ASL abcd,x
+			case 0x1f: // ASO abcd,x [unofficial]
+			case 0x3e: // ROL abcd,x
+			case 0x3f: // RLA abcd,x [unofficial]
+			case 0x5e: // LSR abcd,x
+			case 0x5f: // LSE abcd,x [unofficial]
+			case 0x7e: // ROR abcd,x
+			case 0x7f: // RRA abcd,x [unofficial]
+			case 0x9d: // STA abcd,x
+			case 0xde: // DEC abcd,x
+			case 0xdf: // DCM abcd,x [unofficial]
+			case 0xfe: // INC abcd,x
+			case 0xff: // INS abcd,x [unofficial]
+				addr = Memory[Pc++] + X;
+				addr = (addr + (Memory[Pc++] << 8)) & 0xffff;
+				break;
+			case 0x20: // JSR abcd
+				addr = Memory[Pc++];
+				PushPc();
+				Pc = addr + (Memory[Pc] << 8);
+				continue;
+			case 0x28: // PLP
+				PullFlags();
+				CheckIrq();
+				continue;
+			case 0x2a: // ROL
+				A = (A << 1) + C;
+				C = A >> 8;
+				Nz = A &= 0xff;
+				continue;
+			case 0x30: // BMI
+				if (Nz >= 0x80)
+					break;
+				Pc++;
+				continue;
+			case 0x38: // SEC
+				C = 1;
+				continue;
+			case 0x40: // RTI
+				PullFlags();
+				Pc = Pull();
+				Pc += Pull() << 8;
+				CheckIrq();
+				continue;
+			case 0x48: // PHA
+				Push(A);
+				continue;
+			case 0x4a: // LSR
+				C = A & 1;
+				Nz = A >>= 1;
+				continue;
+			case 0x4b: // ALR #ab [unofficial]
+				A &= Memory[Pc++];
+				C = A & 1;
+				Nz = A >>= 1;
+				continue;
+			case 0x4c: // JMP abcd
+				addr = Memory[Pc++];
+				Pc = addr + (Memory[Pc] << 8);
+				continue;
+			case 0x50: // BVC
+				if ((Vdi & VFlag) == 0)
+					break;
+				Pc++;
+				continue;
+			case 0x58: // CLI
+				Vdi &= VFlag | DFlag;
+				CheckIrq();
+				continue;
+			case 0x60: // RTS
+				Pc = Pull();
+				Pc += (Pull() << 8) + 1;
+				continue;
+			case 0x68: // PLA
+				Nz = A = Pull();
+				continue;
+			case 0x6a: // ROR
+				Nz = (C << 7) + (A >> 1);
+				C = A & 1;
+				A = Nz;
+				continue;
+			case 0x6b: // ARR #ab [unofficial]
+				data = A & Memory[Pc++];
+				Nz = A = (data >> 1) + (C << 7);
+				Vdi = (Vdi & (DFlag | IFlag)) + ((A ^ data) & VFlag);
+				if ((Vdi & DFlag) == 0)
+					C = data >> 7;
+				else {
+					if ((data & 0xf) >= 5)
+						A = (A & 0xf0) + ((A + 6) & 0xf);
+					if (data >= 0x50) {
+						A = (A + 0x60) & 0xff;
+						C = 1;
+					}
+					else
+						C = 0;
+				}
+				continue;
+			case 0x70: // BVS
+				if ((Vdi & VFlag) != 0)
+					break;
+				Pc++;
+				continue;
+			case 0x78: // SEI
+				Vdi |= IFlag;
+				continue;
+			case 0x88: // DEY
+				Nz = Y = (Y - 1) & 0xff;
+				continue;
+			case 0x8a: // TXA
+				Nz = A = X;
+				continue;
+			case 0x8b: // ANE #ab [unofficial]
+				data = Memory[Pc++];
+				A &= (data | 0xef) & X;
+				Nz = A & data;
+				continue;
+			case 0x90: // BCC
+				if (C == 0)
+					break;
+				Pc++;
+				continue;
+			case 0x93: // SHA (ab),y [unofficial, unstable]
+				{
+					addr = Memory[Pc++];
+					int hi = Memory[addr + 1 & 0xff];
+					addr = Memory[addr];
+					data = (hi + 1) & A & X;
+					addr += Y;
+					if (addr >= 0x100)
+						hi = data - 1;
+					addr += hi << 8;
+					Poke(addr, data);
+				}
+				continue;
+			case 0x96: // STX ab,y
+			case 0x97: // SAX ab,y [unofficial]
+			case 0xb6: // LDX ab,y
+			case 0xb7: // LAX ab,y [unofficial]
+				addr = (Memory[Pc++] + Y) & 0xff;
+				break;
+			case 0x98: // TYA
+				Nz = A = Y;
+				continue;
+			case 0x9a: // TXS
+				S = X;
+				continue;
+			case 0x9b: // SHS abcd,y [unofficial, unstable]
+				// S seems to be stable, only memory values vary
+				S = A & X;
+				Shx(Y, S);
+				continue;
+			case 0x9c: // SHY abcd,x [unofficial]
+				Shx(X, Y);
+				continue;
+			case 0x9e: // SHX abcd,y [unofficial]
+				Shx(Y, X);
+				continue;
+			case 0x9f: // SHA abcd,y [unofficial, unstable]
+				Shx(Y, A & X);
+				continue;
+			case 0xa8: // TAY
+				Nz = Y = A;
+				continue;
+			case 0xaa: // TAX
+				Nz = X = A;
+				continue;
+			case 0xab: // ANX #ab [unofficial]
+				Nz = X = A &= Memory[Pc++];
+				continue;
+			case 0xb0: // BCS
+				if (C != 0)
+					break;
+				Pc++;
+				continue;
+			case 0xb8: // CLV
+				Vdi &= DFlag | IFlag;
+				continue;
+			case 0xba: // TSX
+				Nz = X = S;
+				continue;
+			case 0xc8: // INY
+				Nz = Y = (Y + 1) & 0xff;
+				continue;
+			case 0xca: // DEX
+				Nz = X = (X - 1) & 0xff;
+				continue;
+			case 0xcb: // SBX #ab [unofficial]
+				Nz = Memory[Pc++];
+				X &= A;
+				C = X >= Nz ? 1 : 0;
+				Nz = X = (X - Nz) & 0xff;
+				continue;
+			case 0xd0: // BNE
+				if ((Nz & 0xff) != 0)
+					break;
+				Pc++;
+				continue;
+			case 0xd8: // CLD
+				Vdi &= VFlag | IFlag;
+				continue;
+			case 0xe8: // INX
+				Nz = X = (X + 1) & 0xff;
+				continue;
+			case 0xea: // NOP
+			case 0x1a: // NOP [unofficial]
+			case 0x3a:
+			case 0x5a:
+			case 0x7a:
+			case 0xda:
+			case 0xfa:
+				continue;
+			case 0xf0: // BEQ
+				if ((Nz & 0xff) == 0)
+					break;
+				Pc++;
+				continue;
+			case 0xf8: // SED
+				Vdi |= DFlag;
+				continue;
+			default: // we handled all the 256 cases, yet gcc 4.8.3 still complains about the uninitialized `addr`
+				continue;
+			}
+
+			// Second dispatch on opcode.
+			// Handles execution of instructions with variable addressing mode.
+			// The address has been decoded to `addr`.
+			switch (data) {
+			case 0x01: // ORA (ab,x)
+			case 0x05: // ORA ab
+			case 0x09: // ORA #ab
+			case 0x0d: // ORA abcd
+			case 0x11: // ORA (ab),y
+			case 0x15: // ORA ab,x
+			case 0x19: // ORA abcd,y
+			case 0x1d: // ORA abcd,x
+				Nz = A |= Peek(addr);
+				break;
+			case 0x03: // ASO (ab,x) [unofficial]
+			case 0x07: // ASO ab [unofficial]
+			case 0x0f: // ASO abcd [unofficial]
+			case 0x13: // ASO (ab),y [unofficial]
+			case 0x17: // ASO ab,x [unofficial]
+			case 0x1b: // ASO abcd,y [unofficial]
+			case 0x1f: // ASO abcd,x [unofficial]
+				Nz = A |= ArithmeticShiftLeft(addr);
+				break;
+			case 0x06: // ASL ab
+			case 0x0e: // ASL abcd
+			case 0x16: // ASL ab,x
+			case 0x1e: // ASL abcd,x
+				Nz = ArithmeticShiftLeft(addr);
+				break;
+			case 0x10: // BPL
+			case 0x30: // BMI
+			case 0x50: // BVC
+			case 0x70: // BVS
+			case 0x90: // BCC
+			case 0xb0: // BCS
+			case 0xd0: // BNE
+			case 0xf0: // BEQ
+				addr = (Memory[Pc] ^ 0x80) - 0x80;
+				Pc++;
+				addr += Pc;
+				Cycle += (addr ^ Pc) >> 8 != 0 ? 2 : 1;
+				Pc = addr;
+				break;
+			case 0x21: // AND (ab,x)
+			case 0x25: // AND ab
+			case 0x29: // AND #ab
+			case 0x2d: // AND abcd
+			case 0x31: // AND (ab),y
+			case 0x35: // AND ab,x
+			case 0x39: // AND abcd,y
+			case 0x3d: // AND abcd,x
+				Nz = A &= Peek(addr);
+				break;
+			case 0x23: // RLA (ab,x) [unofficial]
+			case 0x27: // RLA ab [unofficial]
+			case 0x2f: // RLA abcd [unofficial]
+			case 0x33: // RLA (ab),y [unofficial]
+			case 0x37: // RLA ab,x [unofficial]
+			case 0x3b: // RLA abcd,y [unofficial]
+			case 0x3f: // RLA abcd,x [unofficial]
+				Nz = A &= RotateLeft(addr);
+				break;
+			case 0x24: // BIT ab
+			case 0x2c: // BIT abcd
+				Nz = Peek(addr);
+				Vdi = (Vdi & (DFlag | IFlag)) + (Nz & VFlag);
+				Nz = ((Nz & 0x80) << 1) + (Nz & A);
+				break;
+			case 0x26: // ROL ab
+			case 0x2e: // ROL abcd
+			case 0x36: // ROL ab,x
+			case 0x3e: // ROL abcd,x
+				Nz = RotateLeft(addr);
+				break;
+			case 0x41: // EOR (ab,x)
+			case 0x45: // EOR ab
+			case 0x49: // EOR #ab
+			case 0x4d: // EOR abcd
+			case 0x51: // EOR (ab),y
+			case 0x55: // EOR ab,x
+			case 0x59: // EOR abcd,y
+			case 0x5d: // EOR abcd,x
+				Nz = A ^= Peek(addr);
+				break;
+			case 0x43: // LSE (ab,x) [unofficial]
+			case 0x47: // LSE ab [unofficial]
+			case 0x4f: // LSE abcd [unofficial]
+			case 0x53: // LSE (ab),y [unofficial]
+			case 0x57: // LSE ab,x [unofficial]
+			case 0x5b: // LSE abcd,y [unofficial]
+			case 0x5f: // LSE abcd,x [unofficial]
+				Nz = A ^= LogicalShiftRight(addr);
+				break;
+			case 0x46: // LSR ab
+			case 0x4e: // LSR abcd
+			case 0x56: // LSR ab,x
+			case 0x5e: // LSR abcd,x
+				Nz = LogicalShiftRight(addr);
+				break;
+			case 0x61: // ADC (ab,x)
+			case 0x65: // ADC ab
+			case 0x69: // ADC #ab
+			case 0x6d: // ADC abcd
+			case 0x71: // ADC (ab),y
+			case 0x75: // ADC ab,x
+			case 0x79: // ADC abcd,y
+			case 0x7d: // ADC abcd,x
+				AddWithCarry(Peek(addr));
+				break;
+			case 0x63: // RRA (ab,x) [unofficial]
+			case 0x67: // RRA ab [unofficial]
+			case 0x6f: // RRA abcd [unofficial]
+			case 0x73: // RRA (ab),y [unofficial]
+			case 0x77: // RRA ab,x [unofficial]
+			case 0x7b: // RRA abcd,y [unofficial]
+			case 0x7f: // RRA abcd,x [unofficial]
+				AddWithCarry(RotateRight(addr));
+				break;
+			case 0x66: // ROR ab
+			case 0x6e: // ROR abcd
+			case 0x76: // ROR ab,x
+			case 0x7e: // ROR abcd,x
+				Nz = RotateRight(addr);
+				break;
+			case 0x6c: // JMP (abcd)
+				Pc = Memory[addr];
+				if ((++addr & 0xff) == 0)
+					addr -= 0xff;
+				Pc += Memory[addr] << 8;
+				break;
+			case 0x81: // STA (ab,x)
+			case 0x85: // STA ab
+			case 0x8d: // STA abcd
+			case 0x91: // STA (ab),y
+			case 0x95: // STA ab,x
+			case 0x99: // STA abcd,y
+			case 0x9d: // STA abcd,x
+				Poke(addr, A);
+				break;
+			case 0x83: // SAX (ab,x) [unofficial]
+			case 0x87: // SAX ab [unofficial]
+			case 0x8f: // SAX abcd [unofficial]
+			case 0x97: // SAX ab,y [unofficial]
+				Poke(addr, A & X);
+				break;
+			case 0x84: // STY ab
+			case 0x8c: // STY abcd
+			case 0x94: // STY ab,x
+				Poke(addr, Y);
+				break;
+			case 0x86: // STX ab
+			case 0x8e: // STX abcd
+			case 0x96: // STX ab,y
+				Poke(addr, X);
+				break;
+			case 0xa0: // LDY #ab
+			case 0xa4: // LDY ab
+			case 0xac: // LDY abcd
+			case 0xb4: // LDY ab,x
+			case 0xbc: // LDY abcd,x
+				Nz = Y = Peek(addr);
+				break;
+			case 0xa1: // LDA (ab,x)
+			case 0xa5: // LDA ab
+			case 0xa9: // LDA #ab
+			case 0xad: // LDA abcd
+			case 0xb1: // LDA (ab),y
+			case 0xb5: // LDA ab,x
+			case 0xb9: // LDA abcd,y
+			case 0xbd: // LDA abcd,x
+				Nz = A = Peek(addr);
+				break;
+			case 0xa2: // LDX #ab
+			case 0xa6: // LDX ab
+			case 0xae: // LDX abcd
+			case 0xb6: // LDX ab,y
+			case 0xbe: // LDX abcd,y
+				Nz = X = Peek(addr);
+				break;
+			case 0xa3: // LAX (ab,x) [unofficial]
+			case 0xa7: // LAX ab [unofficial]
+			case 0xaf: // LAX abcd [unofficial]
+			case 0xb3: // LAX (ab),y [unofficial]
+			case 0xb7: // LAX ab,y [unofficial]
+			case 0xbf: // LAX abcd,y [unofficial]
+				Nz = X = A = Peek(addr);
+				break;
+			case 0xbb: // LAS abcd,y [unofficial, unstable]
+				// only Z is unstable
+				Nz = X = A = S &= Peek(addr);
+				break;
+			case 0xc0: // CPY #ab
+			case 0xc4: // CPY ab
+			case 0xcc: // CPY abcd
+				Nz = Peek(addr);
+				C = Y >= Nz ? 1 : 0;
+				Nz = (Y - Nz) & 0xff;
+				break;
+			case 0xc1: // CMP (ab,x)
+			case 0xc5: // CMP ab
+			case 0xc9: // CMP #ab
+			case 0xcd: // CMP abcd
+			case 0xd1: // CMP (ab),y
+			case 0xd5: // CMP ab,x
+			case 0xd9: // CMP abcd,y
+			case 0xdd: // CMP abcd,x
+				Nz = Peek(addr);
+				C = A >= Nz ? 1 : 0;
+				Nz = (A - Nz) & 0xff;
+				break;
+			case 0xc3: // DCM (ab,x) [unofficial]
+			case 0xc7: // DCM ab [unofficial]
+			case 0xcf: // DCM abcd [unofficial]
+			case 0xd3: // DCM (ab),y [unofficial]
+			case 0xd7: // DCM ab,x [unofficial]
+			case 0xdb: // DCM abcd,y [unofficial]
+			case 0xdf: // DCM abcd,x [unofficial]
+				data = Decrement(addr);
+				C = A >= data ? 1 : 0;
+				Nz = (A - data) & 0xff;
+				break;
+			case 0xc6: // DEC ab
+			case 0xce: // DEC abcd
+			case 0xd6: // DEC ab,x
+			case 0xde: // DEC abcd,x
+				Nz = Decrement(addr);
+				break;
+			case 0xe0: // CPX #ab
+			case 0xe4: // CPX ab
+			case 0xec: // CPX abcd
+				Nz = Peek(addr);
+				C = X >= Nz ? 1 : 0;
+				Nz = (X - Nz) & 0xff;
+				break;
+			case 0xe1: // SBC (ab,x)
+			case 0xe5: // SBC ab
+			case 0xe9: // SBC #ab
+			case 0xeb: // SBC #ab [unofficial]
+			case 0xed: // SBC abcd
+			case 0xf1: // SBC (ab),y
+			case 0xf5: // SBC ab,x
+			case 0xf9: // SBC abcd,y
+			case 0xfd: // SBC abcd,x
+				SubtractWithCarry(Peek(addr));
+				break;
+			case 0xe3: // INS (ab,x) [unofficial]
+			case 0xe7: // INS ab [unofficial]
+			case 0xef: // INS abcd [unofficial]
+			case 0xf3: // INS (ab),y [unofficial]
+			case 0xf7: // INS ab,x [unofficial]
+			case 0xfb: // INS abcd,y [unofficial]
+			case 0xff: // INS abcd,x [unofficial]
+				SubtractWithCarry(Increment(addr));
+				break;
+			case 0xe6: // INC ab
+			case 0xee: // INC abcd
+			case 0xf6: // INC ab,x
+			case 0xfe: // INC abcd,x
+				Nz = Increment(addr);
+				break;
+			}
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/csharp/asap2wav.cs kodi-audiodecoder-asap-3.0.1/lib/asap-code/csharp/asap2wav.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/csharp/asap2wav.cs	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/csharp/asap2wav.cs	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,165 @@
+/*
+ * asap2wav.cs - converter of ASAP-supported formats to WAV files
+ *
+ * Copyright (C) 2008-2012  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+using System;
+using System.IO;
+
+using Sf.Asap;
+
+public class Asap2Wav
+{
+	static string OutputFilename = null;
+	static bool OutputHeader = true;
+	static int Song = -1;
+	static ASAPSampleFormat Format = ASAPSampleFormat.S16LE;
+	static int Duration = -1;
+	static int MuteMask = 0;
+
+	static void PrintHelp()
+	{
+		Console.Write(
+			"Usage: asap2wav [OPTIONS] INPUTFILE...\n" +
+			"Each INPUTFILE must be in a supported format:\n" +
+			"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
+			"Options:\n" +
+			"-o FILE     --output=FILE      Set output file name\n" +
+			"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
+			"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
+			"-b          --byte-samples     Output 8-bit samples\n" +
+			"-w          --word-samples     Output 16-bit samples (default)\n" +
+			"            --raw              Output raw audio (no WAV header)\n" +
+			"-m CHANNELS --mute=CHANNELS    Mute POKEY chanels (1-8)\n" +
+			"-h          --help             Display this information\n" +
+			"-v          --version          Display version information\n"
+		);
+	}
+
+	static void SetSong(string s)
+	{
+		Song = int.Parse(s);
+	}
+
+	static void SetTime(string s)
+	{
+		Duration = ASAPInfo.ParseDuration(s);
+	}
+
+	static void SetMuteMask(string s)
+	{
+		int mask = 0;
+		foreach (char c in s) {
+			if (c >= '1' && c <= '8')
+				mask |= 1 << (c - '1');
+		}
+		MuteMask = mask;
+	}
+
+	static void ProcessFile(string inputFilename)
+	{
+		byte[] module = new byte[ASAPInfo.MaxModuleLength];
+		int moduleLen;
+		using (Stream s = File.OpenRead(inputFilename)) {
+			moduleLen = s.Read(module, 0, module.Length);
+		}
+		ASAP asap = new ASAP();
+		asap.Load(inputFilename, module, moduleLen);
+		ASAPInfo info = asap.GetInfo();
+		if (Song < 0)
+			Song = info.GetDefaultSong();
+		if (Duration < 0) {
+			Duration = info.GetDuration(Song);
+			if (Duration < 0)
+				Duration = 180 * 1000;
+		}
+		asap.PlaySong(Song, Duration);
+		asap.MutePokeyChannels(MuteMask);
+		if (OutputFilename == null) {
+			int i = inputFilename.LastIndexOf('.');
+			OutputFilename = inputFilename.Substring(0, i + 1) + (OutputHeader ? "wav" : "raw");
+		}
+		using (Stream s = File.Create(OutputFilename)) {
+			byte[] buffer = new byte[8192];
+			int nBytes;
+			if (OutputHeader) {
+				nBytes = asap.GetWavHeader(buffer, Format, false);
+				s.Write(buffer, 0, nBytes);
+			}
+			do {
+				nBytes = asap.Generate(buffer, buffer.Length, Format);
+				s.Write(buffer, 0, nBytes);
+			} while (nBytes == buffer.Length);
+		}
+		OutputFilename = null;
+		Song = -1;
+		Duration = -1;
+	}
+
+	public static int Main(string[] args)
+	{
+		bool noInputFiles = true;
+		for (int i = 0; i < args.Length; i++) {
+			string arg = args[i];
+			if (arg[0] != '-') {
+				ProcessFile(arg);
+				noInputFiles = false;
+			}
+			else if (arg == "-o")
+				OutputFilename = args[++i];
+			else if (arg.StartsWith("--output="))
+				OutputFilename = arg.Substring(9);
+			else if (arg == "-s")
+				SetSong(args[++i]);
+			else if (arg.StartsWith("--song="))
+				SetSong(arg.Substring(7));
+			else if (arg == "-t")
+				SetTime(args[++i]);
+			else if (arg.StartsWith("--time="))
+				SetTime(arg.Substring(7));
+			else if (arg == "-b" || arg == "--byte-samples")
+				Format = ASAPSampleFormat.U8;
+			else if (arg == "-w" || arg == "--word-samples")
+				Format = ASAPSampleFormat.S16LE;
+			else if (arg == "--raw")
+				OutputHeader = false;
+			else if (arg == "-m")
+				SetMuteMask(args[++i]);
+			else if (arg.StartsWith("--mute="))
+				SetMuteMask(arg.Substring(7));
+			else if (arg == "-h" || arg == "--help") {
+				PrintHelp();
+				noInputFiles = false;
+			}
+			else if (arg == "-v" || arg == "--version") {
+				Console.WriteLine("ASAP2WAV (.NET) " + ASAPInfo.Version);
+				noInputFiles = false;
+			}
+			else
+				throw new ArgumentException("unknown option: " + arg);
+		}
+		if (noInputFiles) {
+			PrintHelp();
+			return 1;
+		}
+		return 0;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/csharp/asapplay.cs kodi-audiodecoder-asap-3.0.1/lib/asap-code/csharp/asapplay.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/csharp/asapplay.cs	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/csharp/asapplay.cs	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,209 @@
+/*
+ * asapplay.cs - .NET ASAP player
+ *
+ * Copyright (C) 2010-2012  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+using System;
+using System.IO;
+using System.Media;
+
+using Sf.Asap;
+
+public class ASAPWavStream : Stream
+{
+	readonly ASAP Asap = new ASAP();
+	readonly byte[] Buffer = new byte[8192];
+	int BufferPos = 0;
+	int BufferLen;
+
+	public ASAPWavStream(string inputFilename, int song, int duration)
+	{
+		byte[] module = new byte[ASAPInfo.MaxModuleLength];
+		int moduleLen;
+		using (Stream s = File.OpenRead(inputFilename)) {
+			moduleLen = s.Read(module, 0, module.Length);
+		}
+		Asap.Load(inputFilename, module, moduleLen);
+		ASAPInfo info = Asap.GetInfo();
+		if (song < 0)
+			song = info.GetDefaultSong();
+		if (duration < 0) {
+			duration = info.GetDuration(song);
+			if (duration < 0)
+				duration = 180 * 1000;
+		}
+		Asap.PlaySong(song, duration);
+		BufferLen = Asap.GetWavHeader(Buffer, ASAPSampleFormat.S16LE, false);
+	}
+
+	public override int Read(byte[] outputBuffer, int offset, int count)
+	{
+		int i = BufferPos;
+		if (i >= BufferLen) {
+			BufferLen = Asap.Generate(Buffer, Buffer.Length, ASAPSampleFormat.S16LE);
+			if (BufferLen == 0)
+				return 0;
+			i = 0;
+		}
+		if (count > BufferLen - i)
+			count = BufferLen - i;
+		Array.Copy(Buffer, i, outputBuffer, offset, count);
+		BufferPos = i + count;
+		return count;
+	}
+
+	public override bool CanRead
+	{
+		get
+		{
+			return true;
+		}
+	}
+
+	public override bool CanSeek
+	{
+		get
+		{
+			return false;
+		}
+	}
+
+	public override bool CanWrite
+	{
+		get
+		{
+			return false;
+		}
+	}
+
+	public override void Flush()
+	{
+		throw new NotSupportedException();
+	}
+
+	public override long Length
+	{
+		get
+		{
+			throw new NotSupportedException();
+		}
+	}
+
+	public override long Position
+	{
+		get
+		{
+			throw new NotSupportedException();
+		}
+		set
+		{
+			throw new NotSupportedException();
+		}
+	}
+
+	public override long Seek(long offset, SeekOrigin origin)
+	{
+		throw new NotSupportedException();
+	}
+
+	public override void SetLength(long value)
+	{
+		throw new NotSupportedException();
+	}
+
+	public override void Write(byte[] buffer, int offset, int count)
+	{
+		throw new NotSupportedException();
+	}
+}
+
+public class asapplay
+{
+	static int song = -1;
+	static int duration = -1;
+
+	static void PrintHelp()
+	{
+		Console.Write(
+			"Usage: asapplay [OPTIONS] INPUTFILE...\n" +
+			"Each INPUTFILE must be in a supported format:\n" +
+			"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
+			"Options:\n" +
+			"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
+			"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
+			"-h          --help             Display this information\n" +
+			"-v          --version          Display version information\n"
+		);
+	}
+
+	static void SetSong(string s)
+	{
+		song = int.Parse(s);
+	}
+
+	static void SetTime(string s)
+	{
+		duration = ASAPInfo.ParseDuration(s);
+	}
+
+	static void ProcessFile(string inputFilename)
+	{
+		Stream s = new ASAPWavStream(inputFilename, song, duration);
+		new SoundPlayer(s).PlaySync();
+		song = -1;
+		duration = -1;
+	}
+
+	public static int Main(string[] args)
+	{
+		bool noInputFiles = true;
+		for (int i = 0; i < args.Length; i++) {
+			string arg = args[i];
+			if (arg[0] != '-') {
+				ProcessFile(arg);
+				noInputFiles = false;
+			}
+			else if (arg == "-s")
+				SetSong(args[++i]);
+			else if (arg.StartsWith("--song="))
+				SetSong(arg.Substring(7));
+			else if (arg == "-t")
+				SetTime(args[++i]);
+			else if (arg.StartsWith("--time="))
+				SetTime(arg.Substring(7));
+			else if (arg == "-h" || arg == "--help") {
+				PrintHelp();
+				noInputFiles = false;
+			}
+			else if (arg == "-v" || arg == "--version") {
+				Console.WriteLine("asapplay (.NET) " + ASAPInfo.Version);
+				noInputFiles = false;
+			}
+			else
+				throw new ArgumentException("unknown option: " + arg);
+		}
+		if (noInputFiles) {
+			PrintHelp();
+			return 1;
+		}
+		return 0;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/csharp/csharp.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/csharp/csharp.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/csharp/csharp.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/csharp/csharp.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,32 @@
+CSC = $(DO)"C:/Windows/Microsoft.NET/Framework/v4.0.30319/csc.exe" -nologo -o+ -out:$@ $(if $(filter %.dll,$@),-t:library) $(subst /,\\,$^)
+NDOC = $(DO)"C:/Program Files (x86)/NDoc3/bin/NDoc3Console.exe"
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "csharp.mk")
+endif
+
+csharp: csharp/asap2wav.exe csharp/asapplay.exe
+.PHONY: csharp
+
+csharp/asap2wav.exe: $(srcdir)csharp/asap2wav.cs csharp/asap.cs
+	$(CSC)
+CLEAN += csharp/asap2wav.exe
+
+csharp/asapplay.exe: $(srcdir)csharp/asapplay.cs csharp/asap.cs
+	$(CSC)
+CLEAN += csharp/asapplay.exe
+
+csharp/asap.cs: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
+	$(CITO) -n Sf.Asap
+CLEAN += csharp/asap.cs
+
+csharp/doc/ASAP.chm: csharp/doc/ASAP.dll
+	$(NDOC) -documenter:MSDN -CleanIntermediates=true -DocumentInheritedFrameworkMembers=false \
+		-OutputDirectory=csharp/doc -OutputTarget=HtmlHelp -HtmlHelpName=ASAP -Title="ASAP .NET API" $<
+CLEAN += csharp/doc/ASAP.chm
+
+csharp/doc/ASAP.dll: csharp/asap.cs
+	$(CSC) -t:library -doc:csharp/doc/ASAP.xml
+CLEAN += csharp/doc/ASAP.dll csharp/doc/ASAP.xml
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/asap-dev.install kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/asap-dev.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/asap-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/asap-dev.install	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/include/asap.h
+usr/lib/libasap.a
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/asap.install kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/asap.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/asap.install	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/asap.install	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1 @@
+usr/bin/asapconv
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/asap-vlc.install kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/asap-vlc.install
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/asap-vlc.install	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/asap-vlc.install	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/vlc/plugins/demux/libasap_plugin.so
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/changelog kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/changelog
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/changelog	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/changelog	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,42 @@
+asap (5.0.1-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Sun, 19 Jan 2020 18:46:41 +0100
+
+asap (5.0.0-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Thu, 21 Nov 2019 10:12:29 +0100
+
+asap (4.0.0-2) UNRELEASED; urgency=low
+
+  * Fix VLC plugin location.
+
+ -- Piotr Fusik <fox@scene.pl>  Sun, 13 Jan 2019 14:26:27 +0100
+
+asap (4.0.0-1) UNRELEASED; urgency=low
+
+  * New release.
+  * Discontinued GStreamer.
+
+ -- Piotr Fusik <fox@scene.pl>  Thu, 10 Jan 2019 17:27:07 +0100
+
+asap (3.2.0-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Mon, 23 Jun 2014 16:05:58 +0200
+
+asap (3.1.6-1) UNRELEASED; urgency=low
+
+  * New release.
+
+ -- Piotr Fusik <fox@scene.pl>  Wed, 15 Jan 2014 21:09:45 +0100
+
+asap (3.1.5-1) UNRELEASED; urgency=low
+
+  * First deb packaging.
+
+ -- Piotr Fusik <fox@scene.pl>  Fri, 16 Aug 2013 15:08:15 +0200
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/compat kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/compat
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/compat	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/compat	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/control kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/control
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/control	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/control	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,23 @@
+Source: asap
+Maintainer: Piotr Fusik <fox@scene.pl>
+Section: contrib/sound
+Priority: optional
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 7), libvlccore-dev
+
+Package: asap
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Provides "asapconv" command-line converter of Atari 8-bit music
+ to WAV files. Supports the following file formats:
+ SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
+
+Package: asap-dev
+Architecture: any
+Description: Development library providing Atari 8-bit music emulation.
+
+Package: asap-vlc
+Architecture: any
+Depends: vlc, ${shlibs:Depends}
+Description: Provides playback of Atari 8-bit music in VLC.
+ Supports the following file formats: SAP, RMT, FC.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/copyright kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/copyright
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/copyright	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/copyright	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,7 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Name: asap
+Source: http://asap.sourceforge.net
+
+Files: *
+Copyright: 2005-2020 Piotr Fusik <fox@scene.pl>
+License: GPL-2+
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/rules kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/rules
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/debian/rules	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/debian/rules	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+%:
+	dh $@
+
+# skip "make clean" to avoid dependency on xasm, mads and cito
+override_dh_auto_clean:
+
+override_dh_auto_build:
+	$(MAKE) asapconv lib asap-vlc
+
+# skip "make check" to avoid dependency on Acid800
+override_dh_auto_test:
+
+override_dh_auto_install:
+	$(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install install-vlc
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/flashpack.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/flashpack.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/flashpack.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/flashpack.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,360 @@
+// flashpack.ci - Atari 8-bit executable compression
+//
+// Copyright (C) 2011-2019  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+enum FlashPackItemType
+{
+	Literal,
+	CopyTwoBytes,
+	CopyThreeBytes,
+	CopyManyBytes,
+	SetAddress,
+	EndOfStream
+}
+
+class FlashPackItem
+{
+	internal FlashPackItemType Type;
+	internal int Value;
+
+	internal int WriteValueTo(byte[]! buffer, int index)
+	{
+		switch (Type) {
+		case FlashPackItemType.Literal:
+			buffer[index] = Value;
+			return 1;
+		case FlashPackItemType.CopyTwoBytes:
+			buffer[index] = (0x80 - Value) << 1;
+			return 1;
+		case FlashPackItemType.CopyThreeBytes:
+			buffer[index] = ((0x80 - Value) << 1) + 1;
+			return 1;
+		case FlashPackItemType.CopyManyBytes:
+			buffer[index] = 1;
+			buffer[index + 1] = Value;
+			return 2;
+		case FlashPackItemType.SetAddress:
+			int value = Value - 0x80;
+			buffer[index] = 0;
+			buffer[index + 1] = value & 0xff;
+			buffer[index + 2] = value >> 8;
+			return 3;
+		default: // case FlashPackItemType.EndOfStream:
+			buffer[index] = 1;
+			buffer[index + 1] = 0;
+			return 2;
+		}
+	}
+}
+
+class FlashPack
+{
+	int[65536] Memory; // TODO: short
+
+	const int MinLoadAddress = 0x2000; // safe for most of Atari DOSes
+
+	int FindHole()
+		throws
+	{
+		const int holeSize = 0x400; // FIXME: just a guess
+		int end = 0xbc1f; // below the Display List for standard text mode
+		for (;;) {
+			while (Memory[end] >= 0)
+				if (--end < MinLoadAddress + holeSize)
+					throw "Too much data to compress";
+			int start = end;
+			while (Memory[--start] < 0)
+				if (end - start >= holeSize - 1)
+					return end;
+			end = start;
+		}
+	}
+
+	byte[65536] Compressed;
+	int CompressedLength;
+
+	FlashPackItem()[64] Items;
+	int ItemsCount;
+
+	int GetInnerFlags(int index)
+	{
+		int flags = 1;
+		do {
+			flags <<= 1;
+			if (index < ItemsCount && Items[index++].Type != FlashPackItemType.Literal)
+				flags++;
+		} while (flags < 0x100);
+		return flags & 0xff;
+	}
+
+	void PutItems!()
+	{
+		int outerFlags = 0;
+		for (int i = 0; i < ItemsCount; i += 8) {
+			if (GetInnerFlags(i) != 0)
+				outerFlags |= 0x80 >> (i >> 3);
+		}
+		Compressed[CompressedLength++] = outerFlags;
+		for (int i = 0; i < ItemsCount; i++) {
+			if ((i & 7) == 0) {
+				int flags = GetInnerFlags(i);
+				if (flags != 0)
+					Compressed[CompressedLength++] = flags;
+			}
+			CompressedLength += Items[i].WriteValueTo(Compressed, CompressedLength);
+		}
+	}
+
+	void PutItem!(FlashPackItemType type, int value)
+	{
+		if (ItemsCount >= 64) {
+			PutItems();
+			ItemsCount = 0;
+		}
+		Items[ItemsCount].Type = type;
+		Items[ItemsCount].Value = value;
+		ItemsCount++;
+	}
+
+	bool IsLiteralPreferred()
+		=> (ItemsCount & 7) == 7 && GetInnerFlags(ItemsCount - 7) == 0;
+
+	void CompressMemoryArea!(int startAddress, int endAddress)
+	{
+		int lastDistance = -1;
+
+		for (int address = startAddress; address <= endAddress; ) {
+			while (Memory[address] < 0)
+				if (++address > endAddress)
+					return;
+			PutItem(FlashPackItemType.SetAddress, address);
+
+			while (address <= endAddress && Memory[address] >= 0) {
+				int bestMatch = 0;
+				int bestDistance = -1;
+				// brute force matching, think about hashtables
+				for (int backAddress = address - 1; backAddress >= startAddress && address - backAddress < 0x80; backAddress--) {
+					int match;
+					for (match = 0; address + match <= endAddress; match++) {
+						int data = Memory[address + match];
+						if (data < 0 || data != Memory[backAddress + match])
+							break;
+					}
+					if (bestMatch < match) {
+						bestMatch = match;
+						bestDistance = address - backAddress;
+					}
+					else if (bestMatch == match && address - backAddress == lastDistance)
+						bestDistance = lastDistance;
+				}
+
+				switch (bestMatch) {
+				case 0:
+				case 1:
+					PutItem(FlashPackItemType.Literal, Memory[address++]);
+					continue;
+				case 2:
+					PutItem(FlashPackItemType.CopyTwoBytes, bestDistance);
+					break;
+				case 3:
+					PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+					break;
+				case 4:
+					if (bestDistance == lastDistance)
+						PutItem(FlashPackItemType.CopyManyBytes, 4);
+					else if (IsLiteralPreferred()) {
+						PutItem(FlashPackItemType.Literal, Memory[address]);
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+					}
+					else {
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+						PutItem(FlashPackItemType.Literal, Memory[address + 3]);
+					}
+					break;
+				case 5:
+					if (bestDistance == lastDistance)
+						PutItem(FlashPackItemType.CopyManyBytes, 5);
+					else {
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+						PutItem(FlashPackItemType.CopyTwoBytes, bestDistance);
+					}
+					break;
+				case 6:
+					if (bestDistance == lastDistance)
+						PutItem(FlashPackItemType.CopyManyBytes, 6);
+					else {
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+					}
+					break;
+				default:
+					int length = bestMatch;
+					if (bestDistance != lastDistance) {
+						if (IsLiteralPreferred() && length % 255 == 4) {
+							PutItem(FlashPackItemType.Literal, Memory[address]);
+							length--;
+						}
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+						length -= 3;
+					}
+					else if (IsLiteralPreferred() && length % 255 == 1) {
+						PutItem(FlashPackItemType.Literal, Memory[address]);
+						length--;
+					}
+					for (; length > 255; length -= 255)
+						PutItem(FlashPackItemType.CopyManyBytes, 255);
+					switch (length) {
+					case 0:
+						break;
+					case 1:
+						PutItem(FlashPackItemType.Literal, Memory[address + bestMatch - 1]);
+						break;
+					case 2:
+						PutItem(FlashPackItemType.CopyTwoBytes, bestDistance);
+						break;
+					case 3:
+						PutItem(FlashPackItemType.CopyThreeBytes, bestDistance);
+						break;
+					default:
+						PutItem(FlashPackItemType.CopyManyBytes, length);
+						break;
+					}
+					break;
+				}
+				address += bestMatch;
+				lastDistance = bestDistance;
+			}
+		}
+	}
+
+	void PutPoke!(int address, int value)
+	{
+		PutItem(FlashPackItemType.SetAddress, address);
+		PutItem(FlashPackItemType.Literal, value);
+	}
+
+	internal void Compress!(ASAPWriter! w)
+		throws
+	{
+		// Load executable from w.Output up to w.OutputOffset into Memory
+		for (int i = 0; i < 65536; i++)
+			Memory[i] = -1;
+		for (int i = 0; i + 5 <= w.OutputOffset; ) {
+			int startAddress = w.Output[i] + (w.Output[i + 1] << 8);
+			if (startAddress == 0xffff) {
+				i += 2;
+				startAddress = w.Output[i] + (w.Output[i + 1] << 8);
+			}
+			int endAddress = w.Output[i + 2] + (w.Output[i + 3] << 8);
+			if (startAddress > endAddress)
+				throw "Start address greater than end address";
+			i += 4;
+			if (i + endAddress - startAddress >= w.OutputOffset)
+				throw "Truncated block";
+			while (startAddress <= endAddress)
+				Memory[startAddress++] = w.Output[i++];
+		}
+
+		if (Memory[0x2e0] < 0 || Memory[0x2e1] < 0)
+			throw "Missing run address";
+		if (Memory[0xfc] >= 0 || Memory[0xfd] >= 0 || Memory[0xfe] >= 0 || Memory[0xff] >= 0)
+			throw "Conflict with decompressor variables";
+		int runAddress = Memory[0x2e0] + (Memory[0x2e1] << 8);
+		Memory[0x2e0] = Memory[0x2e1] = -1;
+
+		int depackerEndAddress = FindHole();
+		CompressedLength = 0;
+		ItemsCount = 0;
+		PutPoke(0xd40e, 0); // disable NMI
+		PutPoke(0xd20e, 0); // disable IRQ
+		PutPoke(0xd400, 0); // disable screen
+		PutPoke(0xd301, 0xfe); // disable ROM
+		PutPoke(0x244, 0xff); // cold start after Reset
+		CompressMemoryArea(depackerEndAddress, 0xffff);
+		CompressMemoryArea(0, depackerEndAddress);
+		PutItem(FlashPackItemType.EndOfStream, 0);
+		PutItems();
+
+		int depackerStartAddress = depackerEndAddress - (0x58 - 1);
+		int compressedStartAddress = depackerStartAddress - CompressedLength;
+		if (compressedStartAddress < MinLoadAddress)
+			throw "Too much compressed data";
+		w.OutputOffset = 0;
+		w.WriteWord(0xffff);
+		// turn off the built-in BASIC
+		w.WriteWord(0xd301);
+		w.WriteWord(0xd301);
+		w.WriteByte(0xff);
+
+		w.WriteWord(compressedStartAddress);
+		w.WriteWord(depackerEndAddress);
+		w.WriteBytes(Compressed, 0, CompressedLength);
+
+		w.WriteByte(0xad); w.WriteWord(compressedStartAddress); // LDA compressed
+		w.WriteByte(0xee); w.WriteWord(depackerStartAddress + 1); // INC getByte+1
+		w.WriteByte(0xd0); w.WriteByte(0x03); // SNE
+		w.WriteByte(0xee); w.WriteWord(depackerStartAddress + 2); // INC getByte+2
+		w.WriteByte(0x60); // RTS
+		w.WriteByte(0x4c); w.WriteWord(runAddress); // JMP run
+		w.WriteByte(0x85); w.WriteByte(0xfe); // STA outPtr
+		w.WriteByte(0x8a); // TXA
+		w.WriteByte(0x2a); // ROL @
+		w.WriteByte(0xaa); // TAX
+		w.WriteByte(0xf0); w.WriteByte(0xf6); // BEQ exit
+		w.WriteByte(0xb1); w.WriteByte(0xfe); // LDA (outPtr),Y
+		w.WriteByte(0x99); w.WriteByte(0x80); w.WriteByte(0x80); // STA $8080,Y
+		w.WriteByte(0xc8); // INY
+		w.WriteByte(0xd0); w.WriteByte(0x09); // BNE samePage
+		w.WriteByte(0x98); // TYA
+		w.WriteByte(0x38); // SEC
+		w.WriteByte(0x65); w.WriteByte(0xff); // ADC outPtr+1
+		w.WriteByte(0x85); w.WriteByte(0xff); // STA outPtr+1
+		w.WriteByte(0x8d); w.WriteWord(depackerStartAddress + 0x1a); // STA putByte+2
+		w.WriteByte(0xca); // DEX
+		w.WriteByte(0xd0); w.WriteByte(0xec); // BNE copy
+		w.WriteByte(0x06); w.WriteByte(0xfd); // ASL innerFlags
+		w.WriteByte(0xd0); w.WriteByte(0x15); // BNE gotInnerFlags
+		w.WriteByte(0x06); w.WriteByte(0xfc); // ASL outerFlags
+		w.WriteByte(0xd0); w.WriteByte(0x07); // BNE gotOuterFlags
+		w.WriteByte(0x38); // SEC
+		w.WriteByte(0x20); w.WriteWord(depackerStartAddress); // JSR getByte
+		w.WriteByte(0x2a); // ROL @
+		w.WriteByte(0x85); w.WriteByte(0xfc); // STA outerFlags
+		w.WriteByte(0xa9); w.WriteByte(0x01); // LDA #1
+		w.WriteByte(0x90); w.WriteByte(0x04); // BCC setInnerFlags
+		w.WriteByte(0x20); w.WriteWord(depackerStartAddress); // JSR getByte
+		w.WriteByte(0x2a); // ROL @
+		w.WriteByte(0x85); w.WriteByte(0xfd); // STA innerFlags
+		w.WriteByte(0x20); w.WriteWord(depackerStartAddress); // JSR getByte
+		w.WriteByte(0xa2); w.WriteByte(0x01); // LDX #1
+		w.WriteByte(0x90); w.WriteByte(0xce); // BCC putByte
+		w.WriteByte(0x4a); // LSR @
+		w.WriteByte(0xd0); w.WriteByte(0xc2); // BNE copyTwoOrThree
+		w.WriteByte(0x20); w.WriteWord(depackerStartAddress); // JSR getByte
+		w.WriteByte(0xb0); w.WriteByte(0xc1); // BCS copyMany
+		w.WriteByte(0xa8); // TAY
+		w.WriteByte(0x20); w.WriteWord(depackerStartAddress); // JSR getByte
+		w.WriteByte(0x90); w.WriteByte(0xca); // BCC setPage
+
+		w.WriteWord(0x2e0);
+		w.WriteWord(0x2e1);
+		w.WriteWord(depackerStartAddress + 0x32);
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/INSTALL kodi-audiodecoder-asap-3.0.1/lib/asap-code/INSTALL
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/INSTALL	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/INSTALL	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,210 @@
+Build instructions
+==================
+
+Required tools
+--------------
+
+1. The core of ASAP is written in the Ć programming language.
+You'll need 'cito' (https://github.com/pfusik/cito).
+For your convenience, this is not needed for most of the C and C++ ports.
+
+2. GNU Make.
+On Windows, install from MSYS2 (https://www.msys2.org/).
+
+3. If compiling from Git:
+xasm (https://github.com/pfusik/xasm)
+and MADS (http://mads.atari8.info).
+
+Make sure these tools are on your 'PATH'.
+
+
+Getting the source code
+-----------------------
+
+a. Download and uncompress 'asap-*.tar.gz'
+
+b. git clone git://git.code.sf.net/p/asap/code asap-code
+
+
+Building asapconv and libasap on Unix-like systems
+--------------------------------------------------
+
+From a directory which contains 'asap.c' run:
+
+    make
+    sudo make install
+
+The latter command installs the command-line converter and the C library
+in '/usr/local'.  Add '--prefix=DIR' to install somewhere else.
+
+
+Building the MOC plugin on Unix-like systems
+--------------------------------------------
+
+You need the source code of MOC.
+The plugin is compatible with MOC 2.4.x and MOC 2.5.0.
+From the directory with MOC sources run:
+
+    ./configure
+
+Make sure it finishes successfully.
+
+Check MOC_INCLUDE and MOC_PLUGIN_DIR in the 'moc/moc.mk' file.
+These should be the directory with MOC sources
+and the directory with the installed MOC plugins, respectively.
+
+If the defaults are correct, use the following commands:
+
+    make asap-moc
+    sudo make install-moc
+
+If you need to specify different directories, use:
+
+    make asap-moc MOC_INCLUDE=path/to/moc/sources
+    sudo make install-moc MOC_PLUGIN_DIR=/path/to/moc/plugins
+
+
+Building the VLC plugin on Linux
+--------------------------------
+
+Install 'libvlccore-dev' (Debian/Ubuntu) or 'vlc-devel' (Fedora).
+Verify the paths at the top of 'vlc/vlc.mk'.  Run:
+
+    make asap-vlc
+    sudo make install-vlc
+
+
+Building the VLC plugin on macOS
+--------------------------------
+
+Install the Xcode Command Line Tools.
+
+You need 'vlc_plugin.h' and other header files.
+Unfortunately they are not installed with the VLC on Mac.
+You can find them in VLC source code.
+Make sure 'VLC_OSX_CFLAGS' in 'vlc/vlc.mk' points to the directory
+with these header files.
+Run:
+
+    make asap-vlc-osx
+    make install-vlc-osx
+
+
+Building the XMMS plugin on Unix-like systems
+---------------------------------------------
+
+You need 'xmms' and 'xmms-devel' packages.
+Compile:
+
+   make asap-xmms
+
+Install the plugin in your home directory:
+
+    make install-xmms-user
+
+or for all users:
+
+    sudo make install-xmms
+
+If you have another XMMS plugin that supports Atari 8-bit music,
+remove it in order to avoid conflicts.
+
+
+Building asapconv, WASAP, Winamp/XMPlay/BASS plugins, RMT DLL,
+asapscan, shell extension and libasap on Windows
+---------------------------------------------------------------------
+
+Install MSYS2 (https://www.msys2.org/), then additional packages:
+
+    pacman -S make mingw-w64-i686-gcc mingw-w64-x86_64-gcc
+
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make mingw
+
+
+Building the foobar2000 plugin on Windows
+-----------------------------------------
+
+In addition to the common prerequisites you need:
+1. A Microsoft C++ compiler and a Windows SDK.
+   I use Visual Studio Community 2019.
+2. foobar2000 SDK (http://www.foobar2000.org/SDK).
+   Extract it to a new directory called 'foobar2000_SDK'
+   next to (not inside!) the ASAP directory.
+
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make win32/foo_asap.dll
+
+
+Building the VLC plugin on Windows
+----------------------------------
+
+TODO: where to get VLC SDK.
+
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make win32/libasap_plugin.dll
+
+
+Building Java ASAP2WAV
+----------------------
+
+You need Java Development Kit (JDK).
+
+If necessary, edit the paths at the top of 'java/java.mk'
+so that they point to your installed tools.
+
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make java/asap2wav.jar
+
+
+Building AndroidASAP
+--------------------
+
+Install Android Studio (https://developer.android.com/studio).
+
+Edit the paths at the top of 'java/android/android.mk'
+so that they point to your installed Android SDK.
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make android-debug
+
+AndroidASAP integrates with file managers.
+It reads phone state only to pause playback on incoming phone calls.
+
+
+Building C# ASAP2WAV and asapplay on Windows
+--------------------------------------------
+
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make csharp
+
+
+Building JavaScript command-line ASAP2WAV and the web browser player
+--------------------------------------------------------------------
+
+Open the command prompt in the root directory of ASAP sources and run:
+
+    make javascript
+
+'asap2wav.js' is the command-line script.
+'asapweb.js' plus 'asap.js' are the browser player
+(you'll probably need 'binaryHttpRequest.js' as well).
+
+
+Using asapconv
+--------------
+
+Run the program from the command line to see the syntax.
+The '-o/--output' option selects the output format and is mandatory.
+
+
+Using libasap
+-------------
+
+The library is documented in the 'asap.h' header file.
+Be warned there might be breaking changes in the future versions of the library.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/AATRFileInputStream.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/AATRFileInputStream.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/AATRFileInputStream.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/AATRFileInputStream.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ * AATRFileInputStream.java - ASAP for Android
+ *
+ * Copyright (C) 2015-2018  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.IOException;
+
+public class AATRFileInputStream extends InputStream
+{
+	private final JavaAATR atr;
+	private final AATRFileStream fileStream = new AATRFileStream();
+	private byte[] byteBuffer = null;
+
+	public AATRFileInputStream(AATRDirectory directory)
+	{
+		atr = null;
+		fileStream.open(directory);
+	}
+
+	public AATRFileInputStream(JavaAATR atr, String filename) throws IOException
+	{
+		AATRDirectory directory = new AATRDirectory();
+		directory.openRoot(atr);
+		if (!directory.findEntryRecursively(filename) || directory.isEntryDirectory())
+			throw new FileNotFoundException(filename);
+		fileStream.open(directory);
+		this.atr = atr;
+	}
+
+	@Override
+	public int read() throws IOException
+	{
+		if (byteBuffer == null)
+			byteBuffer = new byte[1];
+		return fileStream.read(byteBuffer, 0, 1) > 0 ? byteBuffer[0] : -1;
+	}
+
+	@Override
+	public int read(byte[] b, int off, int len) throws IOException
+	{
+		if (b == null)
+			throw new NullPointerException();
+		if (off < 0 || len < 0 || len > b.length - off)
+			throw new IndexOutOfBoundsException();
+		int result = fileStream.read(b, off, len);
+		if (result == 0 && len != 0)
+			return -1;
+		return result;
+	}
+
+	@Override
+	public void close() throws IOException
+	{
+		if (atr != null)
+			atr.close();
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/AndroidManifest.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/AndroidManifest.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/AndroidManifest.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="net.sf.asap" android:versionCode="501" android:versionName="5.0.1" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<application android:label="@string/app_name" android:icon="@drawable/icon" android:description="@string/app_description" android:theme="@style/Theme">
+		<activity android:name=".ArchiveSelector" android:label="@string/app_name">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<action android:name="android.intent.action.SEARCH" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
+		</activity>
+		<activity android:name=".FileSelector" />
+		<activity android:name=".Player" android:label="@string/play_in_asap" android:launchMode="singleTop" android:configChanges="mcc|mnc|keyboard|keyboardHidden|orientation|screenSize">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:mimeType="*/*" />
+				<data android:scheme="file" android:host="*" />
+				<data android:pathPattern=".*\\.sap" />
+				<data android:pathPattern=".*\\.cmc" />
+				<data android:pathPattern=".*\\.cm3" />
+				<data android:pathPattern=".*\\.cmr" />
+				<data android:pathPattern=".*\\.cms" />
+				<data android:pathPattern=".*\\.dmc" />
+				<data android:pathPattern=".*\\.dlt" />
+				<data android:pathPattern=".*\\.mpt" />
+				<data android:pathPattern=".*\\.mpd" />
+				<data android:pathPattern=".*\\.rmt" />
+				<data android:pathPattern=".*\\.tmc" />
+				<data android:pathPattern=".*\\.tm8" />
+				<data android:pathPattern=".*\\.tm2" />
+				<data android:pathPattern=".*\\.fc" />
+				<data android:pathPattern=".*\\.atr" />
+			</intent-filter>
+		</activity>
+		<provider android:name=".ArchiveSuggestionsProvider" android:authorities="net.sf.asap.ArchiveSuggestionsProvider" />
+		<service android:name=".PlayerService" android:label="@string/player_service" />
+		<receiver android:name=".MediaButtonEventReceiver">
+			<intent-filter>
+				<action android:name="android.intent.action.MEDIA_BUTTON" />
+			</intent-filter>
+		</receiver>
+	</application>
+</manifest>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/android.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/android.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/android.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/android.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,120 @@
+ASMA_DIR = ../asma
+ANDROID_SDK = C:/Users/fox/AppData/Local/Android/Sdk
+ANDROID_JAR = $(ANDROID_SDK)/platforms/android-28/android.jar
+ANDROID_BUILD_TOOLS = $(ANDROID_SDK)/build-tools/28.0.3
+PROGUARD_JAR = $(ANDROID_SDK)/tools/proguard/lib/proguard.jar
+
+JAVA = $(DO)java
+AAPT = $(ANDROID_BUILD_TOOLS)/aapt
+DX = $(DO)java -jar "$(ANDROID_BUILD_TOOLS)/lib/dx.jar" --no-strict
+PROGUARD = $(DO)java -jar $(PROGUARD_JAR)
+JARSIGNER = $(DO)jarsigner -sigalg SHA1withRSA -digestalg SHA1
+ZIPALIGN = $(DO)$(ANDROID_BUILD_TOOLS)/zipalign
+ADB = $(ANDROID_SDK)/platform-tools/adb
+ANDROID = $(ANDROID_SDK)/tools/android.bat
+EMULATOR = $(ANDROID_SDK)/tools/emulator
+
+# NDK is only needed for the command-line asapconv
+# It ended up in this Makefile even though it's not Java
+ANDROID_NDK = C:/bin/android-ndk-r8c
+ANDROID_NDK_PLATFORM = $(ANDROID_NDK)/platforms/android-3/arch-arm
+ANDROID_CC = $(DO)$(ANDROID_NDK)/toolchains/arm-linux-androideabi-4.6/prebuilt/windows/bin/arm-linux-androideabi-gcc --sysroot=$(ANDROID_NDK_PLATFORM) -s -O2 -Wall -o $@ $(INCLUDEOPTS) $(filter %.c,$^)
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "android.mk")
+endif
+
+ANDROID_RELEASE = release/asap-$(VERSION)-android.apk
+ANDROID_JAVA_SRC = $(addprefix $(srcdir)java/android/, AATRFileInputStream.java ArchiveSelector.java ArchiveSuggestionsProvider.java BaseSelector.java \
+	FileContainer.java FileInfo.java FileSelector.java JavaAATR.java MediaButtonEventReceiver.java Player.java PlayerService.java Util.java ZipInputStream.java)
+
+android-release: $(ANDROID_RELEASE)
+.PHONY: android-release
+
+android-install-emu: $(ANDROID_RELEASE)
+	$(ADB) -e install -r $<
+.PHONY: android-install-emu
+
+android-install-dev: $(ANDROID_RELEASE)
+	$(ADB) -d install -r $<
+.PHONY: android-install-dev
+
+android-log-emu:
+	$(ADB) -e logcat -d
+.PHONY: android-log-emu
+
+android-log-dev:
+	$(ADB) -d logcat
+.PHONY: android-log-dev
+
+android-shell-emu:
+	$(ADB) -e shell
+.PHONY: android-shell-emu
+
+android-shell-dev:
+	$(ADB) -d shell
+.PHONY: android-shell-dev
+
+android-emu:
+	$(EMULATOR) -avd kit &
+.PHONY: android-emu
+
+android-push-release: $(ANDROID_RELEASE)
+	$(ADB) -d push $(ANDROID_RELEASE) /sdcard/sap/
+.PHONY: android-push-release
+
+android-push-sap:
+	$(ADB) -e push ../Drunk_Chessboard.sap /sdcard/
+.PHONY: android-push-sap
+
+android-create-avd:
+	$(ANDROID) create avd -n kit -t android-19 -c 16M
+.PHONY: android-create-avd
+
+$(ANDROID_RELEASE): java/android/AndroidASAP-unaligned.apk
+	$(ZIPALIGN) -f 4 $< $@
+
+java/android/AndroidASAP-unaligned.apk: java/android/AndroidASAP-unsigned.apk
+	$(JARSIGNER) -storepass walsie -signedjar $@ $< pfusik
+CLEAN += java/android/AndroidASAP-unaligned.apk
+
+java/android/AndroidASAP-unsigned.apk: java/android/AndroidASAP-resources.apk java/android/classes.dex
+	$(DO)cp $< $@ && $(SEVENZIP) -tzip $@ ./java/android/classes.dex
+CLEAN += java/android/AndroidASAP-unsigned.apk
+
+java/android/classes.dex: java/android/classes/net/sf/asap/Player.class
+	$(DX) --dex --output=$@ java/android/classes
+CLEAN += java/android/classes.dex
+
+#java/android/classes.dex: java/android/classes.jar
+#	$(DX) --dex --output=$@ $<
+
+java/android/classes.jar: $(srcdir)java/android/proguard.cfg java/android/classes/net/sf/asap/Player.class
+	$(PROGUARD) -injars java/android/classes -outjars $@ -libraryjars $(ANDROID_JAR) @$<
+
+java/android/classes/net/sf/asap/Player.class: $(ANDROID_JAVA_SRC) java/android/AndroidASAP-resources.apk java/src/net/sf/asap/ASAP.java
+	$(JAVAC) -d java/android/classes -source 1.7 -target 1.7 -bootclasspath $(ANDROID_JAR) $(ANDROID_JAVA_SRC) java/android/gen/net/sf/asap/R.java java/src/net/sf/asap/*.java
+CLEANDIR += java/android/classes
+
+# Also generates java/android/gen/net/sf/asap/R.java
+java/android/AndroidASAP-resources.apk: $(addprefix $(srcdir)java/android/,AndroidManifest.xml res/drawable/ic_menu_browse.png res/drawable/icon.png res/layout/fileinfo_list_item.xml res/layout/filename_list_item.xml res/layout/playing.xml res/menu/archive_selector.xml res/menu/file_selector.xml res/values/strings.xml res/values/themes.xml res/xml/searchable.xml) $(ASMA_DIR)/index.txt $(JAVA_OBX)
+	$(DO)mkdir -p java/android/gen && $(AAPT) p -f -m -M $< -I $(ANDROID_JAR) -S $(srcdir)java/android/res -A $(ASMA_DIR) --ignore-assets Docs:new.m3u -F $@ -J java/android/gen java/obx
+CLEAN += java/android/AndroidASAP-resources.apk java/android/gen/net/sf/asap/R.java
+
+$(ASMA_DIR)/index.txt: java/android/Indexer.class
+	$(JAVA) -classpath "java/android;java/classes" Indexer $(ASMA_DIR) | dos2unix >$@
+CLEAN += $(ASMA_DIR)/index.txt
+
+java/android/Indexer.class: $(srcdir)java/android/Indexer.java java/classes/net/sf/asap/ASAP.class
+	$(JAVAC) -d $(@D) -classpath java/classes $<
+CLEAN += java/android/Indexer.class
+
+android-push-asapconv: java/android/asapconv
+	$(ADB) -d push java/android/asapconv /data/local/tmp/
+.PHONY: android-push-asapconv
+
+java/android/asapconv: $(call src,asapconv.c asap.[ch])
+	$(ANDROID_CC)
+CLEAN += java/android/asapconv
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/ArchiveSelector.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/ArchiveSelector.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/ArchiveSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/ArchiveSelector.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ * ArchiveSelector.java - ASAP for Android
+ *
+ * Copyright (C) 2015-2020  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.app.SearchManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.SearchView;
+
+public class ArchiveSelector extends BaseSelector
+{
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		Intent intent = getIntent();
+		if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+			finish();
+			startActivity(new Intent(Intent.ACTION_VIEW, intent.getData(), this, Player.class));
+		}
+		else {
+			uri = Util.asmaRoot;
+			String query = Intent.ACTION_SEARCH.equals(intent.getAction()) ? intent.getStringExtra(SearchManager.QUERY) : null;
+			setListAdapter(new FileInfoAdapter(this, R.layout.fileinfo_list_item, FileInfo.listIndex(this, query)));
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		getMenuInflater().inflate(R.menu.archive_selector, menu);
+
+		SearchManager searchManager = (SearchManager) getSystemService(SEARCH_SERVICE);
+		SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
+		searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId()) {
+		case R.id.menu_browse:
+			startActivity(new Intent(Intent.ACTION_VIEW, null, this, FileSelector.class));
+			return true;
+		default:
+			return false;
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/ArchiveSuggestionsProvider.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/ArchiveSuggestionsProvider.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/ArchiveSuggestionsProvider.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/ArchiveSuggestionsProvider.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,133 @@
+/*
+ * ArchiveSuggestionsProvider.java - ASAP for Android
+ *
+ * Copyright (C) 2020  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class ArchiveSuggestionsProvider extends ContentProvider
+{
+	private static final String[] COLUMN_NAMES = {
+		BaseColumns._ID,
+		SearchManager.SUGGEST_COLUMN_TEXT_1,
+		SearchManager.SUGGEST_COLUMN_TEXT_2,
+		SearchManager.SUGGEST_COLUMN_INTENT_ACTION,
+		SearchManager.SUGGEST_COLUMN_INTENT_DATA,
+		SearchManager.SUGGEST_COLUMN_QUERY };
+
+	@Override
+	public boolean onCreate()
+	{
+		return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
+	{
+		String query = uri.getLastPathSegment();
+		MatrixCursor cursor = new MatrixCursor(COLUMN_NAMES);
+		TreeMap<String, Integer> authorToCount = new TreeMap<String, Integer>();
+		Context context = getContext();
+		Object[] columnValues = new Object[6];
+		try (LineNumberReader r = Util.openIndex(context)) {
+			for (int id = 1; ; id++) {
+				String name = r.readLine();
+				if (name == null)
+					break;
+				String title = r.readLine();
+				String authors = r.readLine();
+				/*String date =*/ r.readLine();
+				/*String songs =*/ r.readLine();
+				if (Util.matches(title, query)) {
+					columnValues[0] = id;
+					columnValues[1] = title;
+					columnValues[2] = authors;
+					columnValues[3] = Intent.ACTION_VIEW;
+					columnValues[4] = "asma:" + Uri.encode(name);
+					columnValues[5] = null;
+					cursor.addRow(columnValues);
+				}
+				for (String author : authors.split(" & ")) {
+					if (Util.matches(author, query)) {
+						if (author.endsWith(" <?>"))
+							author = author.substring(0, author.length() - 4);
+						Integer count = authorToCount.get(author);
+						authorToCount.put(author, count == null ? 1 : count + 1);
+					}
+				}
+			}
+		}
+		catch (IOException ex) {
+			// shouldn't happen
+		}
+
+		int id = -1;
+		for (Map.Entry<String, Integer> entry : authorToCount.entrySet()) {
+			columnValues[0] = id--;
+			columnValues[1] = entry.getKey();
+			columnValues[2] = context.getString(R.string.author_suggestion_songs, entry.getValue());
+			columnValues[3] = Intent.ACTION_SEARCH;
+			columnValues[4] = null;
+			columnValues[5] = entry.getKey();
+			cursor.addRow(columnValues);
+		}
+
+		return cursor;
+	}
+
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs)
+	{
+		return 0;
+	}
+
+	@Override
+	public String getType(Uri uri)
+	{
+		return null;
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values)
+	{
+		return null;
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs)
+	{
+		return 0;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/BaseSelector.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/BaseSelector.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/BaseSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/BaseSelector.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ * BaseSelector.java - ASAP for Android
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.app.ListActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+abstract class BaseSelector extends ListActivity
+{
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
+	}
+
+	protected Uri uri;
+
+	protected static class FileInfoAdapter extends ArrayAdapter<FileInfo>
+	{
+		private LayoutInflater layoutInflater;
+
+		protected FileInfoAdapter(Context context, int rowViewResourceId, FileInfo[] infos)
+		{
+			super(context, rowViewResourceId, infos);
+			layoutInflater = LayoutInflater.from(context);
+		}
+
+		private static class ViewHolder
+		{
+			private TextView title;
+			private TextView author;
+			private TextView date;
+			private TextView songs;
+		}
+
+		public View getView(int position, View convertView, ViewGroup parent)
+		{
+			ViewHolder holder;
+			if (convertView == null) {
+				convertView = layoutInflater.inflate(R.layout.fileinfo_list_item, null);
+				holder = new ViewHolder();
+				holder.title = (TextView) convertView.findViewById(R.id.title);
+				holder.author = (TextView) convertView.findViewById(R.id.author);
+				holder.date = (TextView) convertView.findViewById(R.id.date);
+				holder.songs = (TextView) convertView.findViewById(R.id.songs);
+				convertView.setTag(holder);
+			}
+			else
+				holder = (ViewHolder) convertView.getTag();
+
+			FileInfo info = getItem(position);
+			holder.title.setText(info.title);
+			holder.author.setText(info.author);
+			holder.date.setText(info.date);
+			holder.songs.setText(info.songs > 1 ? getContext().getString(R.string.songs_format, info.songs) : null);
+
+			return convertView;
+		}
+	}
+
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id)
+	{
+		Intent intent;
+		FileInfo info = (FileInfo) l.getItemAtPosition(position);
+		String name = info.filename;
+		if (name == null) {
+			// shuffle all
+			intent = new Intent(Intent.ACTION_VIEW, uri, this, Player.class);
+		}
+		else {
+			Class klass = ASAPInfo.isOurFile(name) ? Player.class : FileSelector.class;
+			intent = new Intent(Intent.ACTION_VIEW, Util.buildUri(uri, name), this, klass);
+			if (Util.endsWithIgnoreCase(uri.toString(), ".m3u"))
+				intent.putExtra(PlayerService.EXTRA_PLAYLIST, uri.toString());
+		}
+		startActivity(intent);
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/FileContainer.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/FileContainer.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/FileContainer.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/FileContainer.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,222 @@
+/*
+ * FileContainer.java - ASAP for Android
+ *
+ * Copyright (C) 2013-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.content.Context;
+import android.net.Uri;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipEntry;
+
+/*
+ * Container of files: either a directory, a ZIP directory or an M3U playlist.
+ */
+abstract class FileContainer
+{
+	protected abstract void onSongFile(String name, InputStream is);
+
+	// directory, m3u, zip, atr
+	protected void onContainer(String name)
+	{
+	}
+
+	private void listAsma(Context context)
+	{
+		FileInfo[] infos = FileInfo.listIndex(context, null);
+		for (int i = 1 /* skip "shuffle all" */; i < infos.length; i++)
+			onSongFile(infos[i].filename, null);
+	}
+
+	private void listDirectory(File dir, boolean inputStreams) throws IOException
+	{
+		File[] files = dir.listFiles();
+		if (files == null)
+			throw new FileNotFoundException();
+		for (File file : files) {
+			String name = file.getName();
+			if (file.isDirectory())
+				onContainer(name + '/');
+			else if (ASAPInfo.isOurFile(name)) {
+				try {
+					onSongFile(name, inputStreams ? new FileInputStream(file) : null);
+				}
+				catch (IOException ex) {
+					// ignore files we cannot read
+				}
+			}
+			else if (Util.endsWithIgnoreCase(name, ".zip")
+				  || Util.endsWithIgnoreCase(name, ".m3u")
+				  || Util.endsWithIgnoreCase(name, ".atr")) {
+				onContainer(name);
+			}
+		}
+	}
+
+	private void listM3u(Uri uri, boolean inputStreams) throws IOException
+	{
+		String path = uri.getPath();
+		InputStream m3uIs;
+		ZipInputStream zis;
+		if (Util.endsWithIgnoreCase(path, ".zip")) {
+			String zipFilename = path;
+			path = uri.getFragment();
+			m3uIs = zis = new ZipInputStream(zipFilename, path);
+		}
+		else {
+			m3uIs = new FileInputStream(uri.getPath());
+			zis = null;
+		}
+		path = Util.getParent(path);
+		BufferedReader lineReader = new BufferedReader(new InputStreamReader(m3uIs));
+
+		try {
+			for (;;) {
+				String line = lineReader.readLine();
+				if (line == null)
+					break;
+				if (line.length() == 0 || line.charAt(0) == '#')
+					continue;
+				line = line.replace('\\', '/');
+
+				if (ASAPInfo.isOurFile(line)) {
+					InputStream is;
+					if (inputStreams) {
+						try {
+							if (zis != null)
+								is = zis.openInputStream(path + line);
+							else
+								is = new FileInputStream(path + line);
+						}
+						catch (IOException ex) {
+							// ignore files we cannot read
+							continue;
+						}
+					}
+					else
+						is = null;
+					onSongFile(line, is);
+				}
+			}
+		}
+		finally {
+			lineReader.close();
+		}
+	}
+
+	private void listZipDirectory(File zipFile, String zipPath, boolean inputStreams, boolean recurseZip) throws IOException
+	{
+		if (zipPath == null)
+			zipPath = "";
+		int zipPathLen = zipPath.length();
+		ZipFile zip = new ZipFile(zipFile);
+		try {
+			Enumeration<? extends ZipEntry> zipEntries = zip.entries();
+			while (zipEntries.hasMoreElements()) {
+				final ZipEntry zipEntry = zipEntries.nextElement();
+				if (!zipEntry.isDirectory()) {
+					String name = zipEntry.getName();
+					if (name.startsWith(zipPath) && (ASAPInfo.isOurFile(name) || Util.endsWithIgnoreCase(name, ".m3u"))) {
+						if (!recurseZip) {
+							int i = name.indexOf('/', zipPathLen);
+							if (i >= 0) {
+								// file in a subdirectory - add subdirectory with the trailing slash
+								onContainer(name.substring(zipPathLen, i + 1));
+								continue;
+							}
+						}
+						// file
+						name = name.substring(zipPathLen);
+						if (Util.endsWithIgnoreCase(name, ".m3u"))
+							onContainer(name);
+						else {
+							try {
+								onSongFile(name, inputStreams ? zip.getInputStream(zipEntry) : null);
+							}
+							catch (IOException ex) {
+								// ignore files we cannot read
+							}
+						}
+					}
+				}
+			}
+		}
+		finally {
+			zip.close();
+		}
+	}
+
+	private void listAtr(String atrFilename, String atrPath, boolean inputStreams) throws IOException
+	{
+		JavaAATR atr = new JavaAATR(atrFilename);
+		try {
+			AATRDirectory directory = new AATRDirectory();
+			directory.openRoot(atr);
+			if (atrPath != null) {
+				if (atrPath.endsWith("/"))
+					atrPath = atrPath.substring(0, atrPath.length() - 1);
+				if (!directory.findEntryRecursively(atrPath) || !directory.isEntryDirectory())
+					throw new FileNotFoundException();
+				directory.open(directory);
+			}
+			for (;;) {
+				String name = directory.nextEntry();
+				if (name == null)
+					break;
+				if (directory.isEntryDirectory())
+					onContainer(name + '/');
+				else if (ASAPInfo.isOurFile(name))
+					onSongFile(name, inputStreams ? new AATRFileInputStream(directory) : null);
+			}
+		}
+		finally {
+			atr.close();
+		}
+	}
+
+	void list(Context context, Uri uri, boolean inputStreams, boolean recurseZip) throws IOException
+	{
+		if (Util.isAsma(uri))
+			listAsma(context);
+		else {
+			String path = uri.getPath();
+			File file = new File(path);
+			if (file.isDirectory())
+				listDirectory(file, inputStreams);
+			else if (Util.endsWithIgnoreCase(uri.toString(), ".m3u"))
+				listM3u(uri, inputStreams);
+			else if (Util.endsWithIgnoreCase(path, ".zip"))
+				listZipDirectory(file, uri.getFragment(), inputStreams, recurseZip);
+			else if (Util.endsWithIgnoreCase(path, ".atr"))
+				listAtr(path, uri.getFragment(), inputStreams);
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/FileInfo.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/FileInfo.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/FileInfo.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/FileInfo.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,135 @@
+/*
+ * FileInfo.java - ASAP for Android
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.content.Context;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Comparator;
+
+class FileInfo implements Comparable<FileInfo>
+{
+	String filename;
+	String title;
+	String author;
+	String date;
+	int songs;
+
+	FileInfo(String filename)
+	{
+		this.title = this.filename = filename;
+	}
+
+	@Override
+	public String toString()
+	{
+		return title;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (!(obj instanceof FileInfo))
+			return false;
+		FileInfo that = (FileInfo) obj;
+		if (this.filename == null)
+			return that.filename == null;
+		return this.filename.equals(that.filename);
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return filename == null ? 0 : filename.hashCode();
+	}
+
+	private static Comparator<? super String> comparator;
+
+	private static Comparator<? super String> getComparator()
+	{
+		if (comparator == null) {
+			synchronized (FileInfo.class) {
+				if (comparator == null)
+					comparator = Collator.getInstance();
+			}
+		}
+		return comparator;
+	}
+
+	public int compareTo(FileInfo that)
+	{
+		if (this.filename == null)
+			return -1;
+		if (that.filename == null)
+			return 1;
+		boolean dir1 = this.filename.endsWith("/");
+		boolean dir2 = that.filename.endsWith("/");
+		if (dir1 != dir2)
+			return dir1 ? -1 : 1;
+		Comparator<? super String> comparator = getComparator();
+		int titleCmp = comparator.compare(this.title, that.title);
+		if (titleCmp != 0)
+			return titleCmp;
+		return comparator.compare(this.filename, that.filename);
+	}
+
+	static FileInfo getShuffleAll(Context context)
+	{
+		FileInfo info = new FileInfo(null);
+		info.title = context.getString(R.string.shuffle_all);
+		return info;
+	}
+
+	static FileInfo[] listIndex(Context context, String query)
+	{
+		ArrayList<FileInfo> coll = new ArrayList<FileInfo>();
+		if (query == null)
+			coll.add(getShuffleAll(context));
+		try (LineNumberReader r = Util.openIndex(context)) {
+			for (;;) {
+				String name = r.readLine();
+				if (name == null)
+					break;
+				String title = r.readLine();
+				String author = r.readLine();
+				String date = r.readLine();
+				String songs = r.readLine();
+				if (query == null || Util.matches(title, query) || Util.matches(author, query)) {
+					FileInfo info = new FileInfo(name);
+					info.title = title;
+					info.author = author;
+					info.date = date;
+					info.songs = Integer.parseInt(songs);
+					coll.add(info);
+				}
+			}
+		}
+		catch (IOException ex) {
+			// shouldn't happen
+		}
+		return coll.toArray(new FileInfo[coll.size()]);
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/FileSelector.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/FileSelector.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/FileSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/FileSelector.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,190 @@
+/*
+ * FileSelector.java - ASAP for Android
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.Manifest;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
+import android.widget.Toast;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.TreeSet;
+
+public class FileSelector extends BaseSelector
+{
+	private boolean isSearch;
+	private boolean isDetails;
+
+	private class FileInfoList extends FileContainer
+	{
+		private Collection<FileInfo> coll;
+		private int songFiles;
+
+		@Override
+		protected void onSongFile(String name, InputStream is)
+		{
+			FileInfo fi = new FileInfo(name);
+			if (is != null) {
+				ASAPInfo info = new ASAPInfo();
+				try {
+					byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
+					int moduleLen = Util.readAndClose(is, module);
+					info.load(name, module, moduleLen);
+				}
+				catch (Exception ex) {
+					// ignore files we cannot read or understand
+					return;
+				}
+				fi.title = info.getTitleOrFilename();
+				fi.author = info.getAuthor();
+				fi.date = info.getDate();
+				fi.songs = info.getSongs();
+			}
+			coll.add(fi);
+			songFiles++;
+		}
+
+		@Override
+		protected void onContainer(String name)
+		{
+			coll.add(new FileInfo(name));
+		}
+
+		FileInfo[] list() throws IOException
+		{
+			boolean isM3u = Util.endsWithIgnoreCase(uri.toString(), ".m3u");
+			coll = isM3u ? new ArrayList<FileInfo>() : new TreeSet<FileInfo>();
+			songFiles = 0;
+			list(FileSelector.this, uri, isDetails, false);
+
+			// "(shuffle all)" if any song files or non-empty ZIP directory
+			if (songFiles > 1 || (!coll.isEmpty() && Util.endsWithIgnoreCase(uri.getPath(), ".zip"))) {
+				FileInfo shuffleAll = FileInfo.getShuffleAll(FileSelector.this);
+				if (isM3u)
+					((ArrayList<FileInfo>) coll).add(0, shuffleAll); // insert at the beginning
+				else
+					coll.add(shuffleAll);
+			}
+
+			return coll.toArray(new FileInfo[coll.size()]);
+		}
+	}
+
+	private void reload()
+	{
+		uri = getIntent().getData();
+		if (uri == null)
+			uri = Uri.fromFile(Environment.getExternalStorageDirectory());
+
+		String title = uri.getPath();
+		String fragment = uri.getFragment();
+		if (fragment != null)
+			title += "#" + fragment;
+		setTitle(getString(R.string.selector_title, title));
+
+		FileInfo[] infos;
+		try {
+			infos = new FileInfoList().list();
+		}
+		catch (IOException ex) {
+			infos = new FileInfo[0];
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+			 && checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED)
+				requestPermissions(new String[] { Manifest.permission.READ_EXTERNAL_STORAGE }, 1);
+			else
+				Toast.makeText(this, R.string.access_denied, Toast.LENGTH_SHORT).show();
+		}
+
+		ListAdapter adapter = isDetails
+			? new FileInfoAdapter(this, R.layout.fileinfo_list_item, infos)
+			: new ArrayAdapter<FileInfo>(this, R.layout.filename_list_item, infos);
+		setListAdapter(adapter);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		getActionBar().setDisplayHomeAsUpEnabled(true);
+		getListView().setTextFilterEnabled(true);
+		isDetails = getPreferences(MODE_PRIVATE).getBoolean("fileDetails", false);
+		reload();
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
+	{
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)
+			reload();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		getMenuInflater().inflate(R.menu.file_selector, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId()) {
+		case android.R.id.home:
+			finish();
+			return true;
+		case R.id.menu_search:
+			InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+			if (isSearch) {
+				imm.hideSoftInputFromWindow(getListView().getWindowToken(), 0);
+				getListView().clearTextFilter();
+				isSearch = false;
+			}
+			else {
+				imm.showSoftInput(getListView(), 0);
+				isSearch = true;
+			}
+			return true;
+		case R.id.menu_toggle_details:
+			isDetails = !isDetails;
+			getPreferences(MODE_PRIVATE).edit().putBoolean("fileDetails", isDetails).commit();
+			reload();
+			return true;
+		default:
+			return false;
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/Indexer.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/Indexer.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/Indexer.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/Indexer.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ * Indexer.java - prepares text-file index of SAP files
+ *
+ * Copyright (C) 2014  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import net.sf.asap.ASAPInfo;
+
+class Indexer
+{
+	private static String rootPath;
+
+	/**
+	 * Reads bytes from the stream into the byte array
+	 * until end of stream or array is full.
+	 * @param is source stream
+	 * @param b output array
+	 * @return number of bytes read
+	 */
+	private static int readAndClose(InputStream is, byte[] b) throws IOException
+	{
+		int got = 0;
+		int len = b.length;
+		try {
+			while (got < len) {
+				int i = is.read(b, got, len - got);
+				if (i <= 0)
+					break;
+				got += i;
+			}
+		}
+		finally {
+			is.close();
+		}
+		return got;
+	}
+
+	private static void process(File dir) throws Exception
+	{
+		File[] children = dir.listFiles();
+		Arrays.sort(children);
+		for (File file : children) {
+			if (file.isDirectory())
+				process(file);
+			else {
+				String path = file.getPath();
+				if (ASAPInfo.isOurFile(path)) {
+					if (!path.startsWith(rootPath))
+						throw new IllegalArgumentException(path);
+					path = path.substring(rootPath.length()).replace(File.separatorChar, '/');
+					byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
+					int moduleLen = readAndClose(new FileInputStream(file), module);
+					ASAPInfo info = new ASAPInfo();
+					info.load(path, module, moduleLen);
+					System.out.println(path);
+					System.out.println(info.getTitleOrFilename());
+					System.out.println(info.getAuthor());
+					System.out.println(info.getDate());
+					System.out.println(info.getSongs());
+				}
+			}
+		}
+	}
+	
+	public static void main(String[] args) throws Exception
+	{
+		if (args.length != 1)
+			throw new IllegalArgumentException("Usage: java Indexer PATH_TO_ASMA >asma.txt");
+		File rootDir = new File(args[0]);
+		rootPath = rootDir.getPath() + File.separatorChar;
+		process(rootDir);
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/JavaAATR.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/JavaAATR.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/JavaAATR.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/JavaAATR.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ * JavaAATR.java - ASAP for Android
+ *
+ * Copyright (C) 2013-2018  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+class JavaAATR extends AATR
+{
+	private final RandomAccessFile stream;
+
+	JavaAATR(String filename) throws IOException
+	{
+		stream = new RandomAccessFile(filename, "r");
+		if (!open())
+			throw new IOException("Invalid ATR file");
+	}
+
+	@Override
+	protected boolean read(int offset, byte[] buffer, int length)
+	{
+		try {
+			stream.seek(offset);
+			stream.readFully(buffer, 0, length);
+			return true;
+		}
+		catch (IOException ex) {
+			return false;
+		}
+	}
+
+	void close() throws IOException
+	{
+		stream.close();
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/MediaButtonEventReceiver.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/MediaButtonEventReceiver.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/MediaButtonEventReceiver.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/MediaButtonEventReceiver.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * MediaButtonEventReceiver.java - ASAP for Android
+ *
+ * Copyright (C) 2013  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.view.KeyEvent;
+
+public class MediaButtonEventReceiver extends BroadcastReceiver
+{
+	@Override
+	public void onReceive(Context context, Intent intent)
+	{
+		IBinder binder = peekService(context, new Intent(context, PlayerService.class));
+		if (binder == null)
+			return;
+		PlayerService service = ((PlayerService.LocalBinder) binder).getService();
+
+		KeyEvent event = (KeyEvent) intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
+		if (event.getAction() != KeyEvent.ACTION_DOWN)
+			return;
+		switch (event.getKeyCode()) {
+		case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+		case KeyEvent.KEYCODE_HEADSETHOOK:
+			service.togglePause();
+			break;
+		case KeyEvent.KEYCODE_MEDIA_PAUSE:
+			service.pause();
+			break;
+		case KeyEvent.KEYCODE_MEDIA_PLAY:
+			service.start();
+			break;
+		case KeyEvent.KEYCODE_MEDIA_NEXT:
+			service.playNextSong();
+			break;
+		case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+			service.playPreviousSong();
+			break;
+		default:
+			break;
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/Player.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/Player.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/Player.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/Player.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,173 @@
+/*
+ * Player.java - ASAP for Android
+ *
+ * Copyright (C) 2010-2018  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.net.Uri;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.MediaController;
+import android.widget.TextView;
+
+public class Player extends Activity
+{
+	private PlayerService service;
+	private final ServiceConnection connection = new ServiceConnection() {
+			public void onServiceConnected(ComponentName className, IBinder service)
+			{
+				Player.this.service = ((PlayerService.LocalBinder) service).getService();
+				showInfo();
+			}
+			public void onServiceDisconnected(ComponentName className)
+			{
+				Player.this.service = null;
+			}
+		};
+
+	private MediaController mediaController;
+
+	private View getContentView()
+	{
+		return findViewById(android.R.id.content);
+	}
+
+	private void setTag(int controlId, String value)
+	{
+		TextView control = (TextView) findViewById(controlId);
+		if (value.length() == 0)
+			control.setVisibility(View.GONE);
+		else {
+			control.setText(value);
+			control.setVisibility(View.VISIBLE);
+		}
+	}
+
+	private void showInfo()
+	{
+		final PlayerService service = this.service;
+		if (service == null)
+			return;
+		ASAPInfo info = service.info;
+		if (info == null)
+			return;
+		setTag(R.id.name, info.getTitleOrFilename());
+		setTag(R.id.author, info.getAuthor());
+		setTag(R.id.date, info.getDate());
+		int songs = info.getSongs();
+		if (songs > 1)
+			setTag(R.id.song, getString(R.string.song_format, service.song + 1, songs));
+		else
+			setTag(R.id.song, "");
+
+		mediaController.setMediaPlayer(service);
+		mediaController.setPrevNextListeners(new OnClickListener() {
+				public void onClick(View v) { service.playNextSong(); }
+			},
+			new OnClickListener() {
+				public void onClick(View v) { service.playPreviousSong(); }
+			});
+	}
+
+	static final String ACTION_SHOW_INFO = "net.sf.asap.action.SHOW_INFO";
+
+	private BroadcastReceiver receiver = new BroadcastReceiver() {
+			@Override
+			public void onReceive(Context context, Intent intent) {
+				showInfo();
+			}
+		};
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		getActionBar().setDisplayHomeAsUpEnabled(true);
+		setTitle(R.string.playing_title);
+		setContentView(R.layout.playing);
+		mediaController = new MediaController(this, false);
+		mediaController.setAnchorView(getContentView());
+
+		Uri uri = getIntent().getData();
+		Intent intent = new Intent(Intent.ACTION_VIEW, uri, this, PlayerService.class);
+		if (uri != null)
+			startService(intent);
+		bindService(intent, connection, Context.BIND_AUTO_CREATE);
+
+		findViewById(R.id.stop_button).setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					if (service != null)
+						service.stopSelf();
+					finish();
+				}
+			});
+
+		registerReceiver(receiver, new IntentFilter(ACTION_SHOW_INFO));
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId()) {
+		case android.R.id.home:
+			finish();
+			return true;
+		default:
+			return super.onOptionsItemSelected(item);
+		}
+	}
+
+	@Override
+	protected void onResume()
+	{
+		super.onResume();
+		if (service != null)
+			mediaController.show(0);
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent event)
+	{
+		if (service != null)
+			mediaController.show(0);
+		return true;
+	}
+
+	@Override
+	protected void onDestroy()
+	{
+		super.onDestroy();
+		unregisterReceiver(receiver);
+		unbindService(connection);
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/PlayerService.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/PlayerService.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/PlayerService.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/PlayerService.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,528 @@
+/*
+ * PlayerService.java - ASAP for Android
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.os.Handler;
+import android.os.IBinder;
+import android.widget.MediaController;
+import android.widget.Toast;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class PlayerService extends Service implements Runnable, AudioManager.OnAudioFocusChangeListener, MediaController.MediaPlayerControl
+{
+	// User interface -----------------------------------------------------------------------------------------
+
+	private static final int NOTIFICATION_ID = 1;
+
+	private final Handler toastHandler = new Handler();
+
+	private void showError(final int messageId)
+	{
+		toastHandler.post(new Runnable() {
+			public void run() {
+				Toast.makeText(PlayerService.this, messageId, Toast.LENGTH_SHORT).show();
+			}
+		});
+	}
+
+	private void showInfo()
+	{
+		sendBroadcast(new Intent(Player.ACTION_SHOW_INFO));
+	}
+
+	private void showNotification()
+	{
+		PendingIntent intent = PendingIntent.getActivity(this, 0, new Intent(this, Player.class), 0);
+		Notification.Builder builder = new Notification.Builder(this)
+			.setSmallIcon(R.drawable.icon)
+			.setContentTitle(info.getTitleOrFilename())
+			.setContentText(info.getAuthor())
+			.setContentIntent(intent)
+			.setOngoing(true);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			builder.setVisibility(Notification.VISIBILITY_PUBLIC);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				final String CHANNEL_ID = "NOW_PLAYING";
+				NotificationChannel channel = new NotificationChannel(CHANNEL_ID, getString(R.string.notification_channel), NotificationManager.IMPORTANCE_LOW);
+				((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).createNotificationChannel(channel);
+				builder.setChannelId(CHANNEL_ID);
+			}
+		}
+		startForeground(NOTIFICATION_ID, builder.getNotification());
+	}
+
+
+	// Playlist -----------------------------------------------------------------------------------------------
+
+	static final String EXTRA_PLAYLIST = "asap.intent.extra.PLAYLIST";
+
+	private final ArrayList<Uri> playlist = new ArrayList<Uri>();
+
+	private void setPlaylist(final Uri uri, boolean shuffle)
+	{
+		playlist.clear();
+		FileContainer container = new FileContainer() {
+				@Override
+				protected void onSongFile(String name, InputStream is) {
+					playlist.add(Util.buildUri(uri, name));
+				}
+			};
+		try {
+			container.list(this, uri, false, true);
+			if (shuffle)
+				Collections.shuffle(playlist);
+			else if (!Util.isAsma(uri) && !Util.endsWithIgnoreCase(uri.toString(), ".m3u"))
+				Collections.sort(playlist);
+		}
+		catch (IOException ex) {
+			// playlist is not essential
+		}
+	}
+
+	private int getPlaylistIndex()
+	{
+		return playlist.indexOf(uri);
+	}
+
+
+	// Playback -----------------------------------------------------------------------------------------------
+
+	private static final int ACTION_STOP = 0;
+	private static final int ACTION_LOAD = 1;
+	private static final int ACTION_PLAY = 2;
+	private static final int ACTION_PAUSE = 3;
+	private static final int ACTION_NEXT = 4;
+	private static final int ACTION_PREV = 5;
+	private int action = ACTION_STOP;
+	private Thread thread = null;
+
+	private synchronized void setAction(int action)
+	{
+		this.action = action;
+		if (thread != null && thread.isAlive())
+			notify();
+		else {
+			thread = new Thread(this);
+			thread.start();
+		}
+	}
+
+	private void stop()
+	{
+		if (thread != null) {
+			setAction(ACTION_STOP);
+			try {
+				thread.join();
+			}
+			catch (InterruptedException ex) {
+			}
+			thread = null;
+		}
+	}
+
+	private Uri uri;
+	int song;
+	private static final int SONG_DEFAULT = -1;
+	private static final int SONG_LAST = -2;
+	private int seekPosition;
+
+	private final ASAP asap = new ASAP();
+	ASAPInfo info;
+
+	private boolean load()
+	{
+		// read file
+		String filename;
+		byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
+		int moduleLen;
+		try {
+			String scheme = uri.getScheme();
+			InputStream stream;
+			if ("asma".equals(scheme)) {
+				filename = uri.getSchemeSpecificPart();
+				stream = getAssets().open(filename);
+			}
+			else if ("file".equals(scheme)) {
+				filename = uri.getPath();
+				if (Util.endsWithIgnoreCase(filename, ".zip")) {
+					String zipFilename = filename;
+					filename = uri.getFragment();
+					stream = new ZipInputStream(zipFilename, filename);
+				}
+				else if (Util.endsWithIgnoreCase(filename, ".atr")) {
+					JavaAATR atr = new JavaAATR(filename);
+					filename = uri.getFragment();
+					stream = new AATRFileInputStream(atr, filename);
+				}
+				else {
+					stream = new FileInputStream(filename);
+				}
+			}
+			else {
+				showError(R.string.error_reading_file);
+				return false;
+			}
+			moduleLen = Util.readAndClose(stream, module);
+		}
+		catch (IOException ex) {
+			showError(R.string.error_reading_file);
+			return false;
+		}
+
+		// load into ASAP
+		try {
+			asap.load(filename, module, moduleLen);
+			info = asap.getInfo();
+			switch (song) {
+			case SONG_DEFAULT:
+				song = info.getDefaultSong();
+				break;
+			case SONG_LAST:
+				song = info.getSongs() - 1;
+				break;
+			default:
+				break;
+			}
+			asap.playSong(song, info.getDuration(song));
+		}
+		catch (Exception ex) {
+			showError(R.string.invalid_file);
+			return false;
+		}
+
+		return true;
+	}
+
+	private synchronized boolean handleLoadAction()
+	{
+		switch (action) {
+		case ACTION_LOAD:
+			return load();
+
+		case ACTION_NEXT:
+			if (info != null && song >= 0 && song + 1 < info.getSongs())
+				song++;
+			else {
+				int playlistIndex = getPlaylistIndex();
+				if (playlistIndex < 0)
+					return false;
+				if (++playlistIndex >= playlist.size())
+					playlistIndex = 0;
+				song = 0;
+				uri = playlist.get(playlistIndex);
+			}
+			return load();
+
+		case ACTION_PREV:
+			if (song > 0)
+				song--;
+			else {
+				int playlistIndex = getPlaylistIndex();
+				if (playlistIndex < 0)
+					return false;
+				if (playlistIndex == 0)
+					playlistIndex = playlist.size();
+				song = SONG_LAST;
+				uri = playlist.get(playlistIndex - 1);
+			}
+			return load();
+
+		default:
+			return false;
+		}
+	}
+
+	private boolean handlePlayAction(AudioTrack audioTrack)
+	{
+		int pos;
+		synchronized (this) {
+			if (action == ACTION_PAUSE) {
+				audioTrack.pause();
+				while (action == ACTION_PAUSE) {
+					try {
+						wait();
+					}
+					catch (InterruptedException ex) {
+					}
+				}
+				if (action == ACTION_PLAY)
+					audioTrack.play();
+			}
+			if (action != ACTION_PLAY) {
+				audioTrack.stop();
+				return false;
+			}
+
+			pos = seekPosition;
+			seekPosition = -1;
+		}
+		if (pos >= 0) {
+			try {
+				asap.seek(pos);
+			}
+			catch (Exception ex) {
+			}
+		}
+		return true;
+	}
+
+	private void playLoop()
+	{
+		action = ACTION_PLAY;
+		seekPosition = -1;
+
+		int channelConfig = info.getChannels() == 1 ? AudioFormat.CHANNEL_CONFIGURATION_MONO : AudioFormat.CHANNEL_CONFIGURATION_STEREO;
+		int bufferLen = AudioTrack.getMinBufferSize(ASAP.SAMPLE_RATE, channelConfig, AudioFormat.ENCODING_PCM_16BIT) >> 1;
+		if (bufferLen < 16384)
+			bufferLen = 16384;
+		byte[] byteBuffer = new byte[bufferLen << 1];
+		short[] shortBuffer = new short[bufferLen];
+		AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, ASAP.SAMPLE_RATE, channelConfig, AudioFormat.ENCODING_PCM_16BIT, bufferLen << 1, AudioTrack.MODE_STREAM);
+		audioTrack.play();
+
+		while (handlePlayAction(audioTrack)) {
+			bufferLen = asap.generate(byteBuffer, byteBuffer.length, ASAPSampleFormat.S16_L_E) >> 1;
+			for (int i = 0; i < bufferLen; i++)
+				shortBuffer[i] = (short) ((byteBuffer[i << 1] & 0xff) | byteBuffer[i << 1 | 1] << 8);
+			audioTrack.write(shortBuffer, 0, bufferLen);
+			if (bufferLen < shortBuffer.length)
+				action = ACTION_NEXT;
+		}
+		audioTrack.release();
+	}
+
+	public void run()
+	{
+		if (!gainFocus())
+			return;
+		while (handleLoadAction()) {
+			showInfo();
+			showNotification();
+			playLoop();
+		}
+		stopForeground(true);
+		releaseFocus();
+	}
+
+	private boolean isPaused()
+	{
+		return action == ACTION_PAUSE;
+	}
+
+	public boolean isPlaying()
+	{
+		return action != ACTION_PAUSE;
+	}
+
+	public boolean canPause()
+	{
+		return true;
+	}
+
+	public boolean canSeekBackward()
+	{
+		return false;
+	}
+
+	public boolean canSeekForward()
+	{
+		return false;
+	}
+
+	public int getBufferPercentage()
+	{
+		return 100;
+	}
+
+	public void pause()
+	{
+		setAction(ACTION_PAUSE);
+	}
+
+	public void start()
+	{
+		setAction(ACTION_PLAY);
+	}
+
+	synchronized void togglePause()
+	{
+		if (isPaused())
+			start();
+		else
+			pause();
+	}
+
+	void playNextSong()
+	{
+		setAction(ACTION_NEXT);
+	}
+
+	void playPreviousSong()
+	{
+		setAction(ACTION_PREV);
+	}
+
+	public int getDuration()
+	{
+		if (info == null || song < 0)
+			return -1;
+		return info.getDuration(song);
+	}
+
+	public int getCurrentPosition()
+	{
+		return asap.getPosition();
+	}
+
+	public synchronized void seekTo(int pos)
+	{
+		seekPosition = pos;
+		start();
+	}
+
+	public int getAudioSessionId()
+	{
+		// return audioTrack != null ? audioTrack.getAudioSessionId() : 0;
+		return 0;
+	}
+
+	private AudioManager getAudioManager()
+	{
+		return (AudioManager) getSystemService(AUDIO_SERVICE);
+	}
+
+	@Override
+	public void onAudioFocusChange(int focusChange)
+	{
+		switch (focusChange) {
+		case AudioManager.AUDIOFOCUS_LOSS:
+		case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+			pause();
+			break;
+		case AudioManager.AUDIOFOCUS_GAIN:
+			start();
+			break;
+		default:
+			break;
+		}
+	}
+
+	private boolean gainFocus()
+	{
+		return getAudioManager().requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED;
+	}
+
+	private void releaseFocus()
+	{
+		getAudioManager().abandonAudioFocus(this);
+	}
+
+	private final BroadcastReceiver headsetReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent)
+		{
+			if (!isInitialStickyBroadcast() && intent.getIntExtra("state", -1) == 0) {
+				pause();
+				showInfo(); // just to update the MediaController
+			}
+		}
+	};
+
+	@Override
+	public void onStart(Intent intent, int startId)
+	{
+		super.onStart(intent, startId);
+
+		registerReceiver(headsetReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
+
+		ComponentName eventReceiver = new ComponentName(getPackageName(), MediaButtonEventReceiver.class.getName());
+		getAudioManager().registerMediaButtonEventReceiver(eventReceiver);
+
+		song = SONG_DEFAULT;
+		uri = intent.getData();
+		String playlistUri = intent.getStringExtra(EXTRA_PLAYLIST);
+		if (playlistUri != null)
+			setPlaylist(Uri.parse(playlistUri), false);
+		else if (ASAPInfo.isOurFile(uri.toString()))
+			setPlaylist(Util.getParent(uri), false);
+		else {
+			// shuffle
+			setPlaylist(uri, true);
+			uri = playlist.get(0);
+		}
+		setAction(ACTION_LOAD);
+	}
+
+	@Override
+	public void onDestroy()
+	{
+		super.onDestroy();
+		stop();
+
+		ComponentName eventReceiver = new ComponentName(getPackageName(), MediaButtonEventReceiver.class.getName());
+		getAudioManager().unregisterMediaButtonEventReceiver(eventReceiver);
+
+		unregisterReceiver(headsetReceiver);
+	}
+
+
+	// Player.java interface ----------------------------------------------------------------------------------
+
+	class LocalBinder extends Binder
+	{
+		PlayerService getService()
+		{
+			return PlayerService.this;
+		}
+	}
+
+	private final IBinder binder = new LocalBinder();
+
+	@Override
+	public IBinder onBind(Intent intent)
+	{
+		return binder;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/proguard.cfg kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/proguard.cfg
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/proguard.cfg	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/proguard.cfg	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,85 @@
+# Based on examples/android.pro from ProGuard 4.6.
+
+-dontpreverify
+-repackageclasses ''
+-allowaccessmodification
+
+# don't change package because of the resources
+-keep class net.sf.asap.ASAP6502
+
+# Switch off some optimizations that trip older versions of the Dalvik VM.
+-optimizations !code/simplification/arithmetic
+
+# RemoteViews might need annotations.
+-keepattributes *Annotation*
+
+# Preserve all fundamental application classes.
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+
+# Preserve all View implementations, their special context constructors, and
+# their setters.
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+    public void set*(...);
+}
+
+# Preserve all classes that have special context constructors, and the
+# constructors themselves.
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+# Preserve all classes that have special context constructors, and the
+# constructors themselves.
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+# Preserve the special fields of all Parcelable implementations.
+-keepclassmembers class * implements android.os.Parcelable {
+    static android.os.Parcelable$Creator CREATOR;
+}
+
+# Preserve static fields of inner classes of R classes that might be accessed
+# through introspection.
+-keepclassmembers class **.R$* {
+  public static <fields>;
+}
+
+# Preserve the required interface from the License Verification Library
+# (but don't nag the developer if the library is not used at all).
+-keep public interface com.android.vending.licensing.ILicensingService
+
+-dontnote com.android.vending.licensing.ILicensingService
+
+# Preserve all native method names and the names of their classes.
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# Preserve the special static methods that are required in all enumeration
+# classes.
+-keepclassmembers class * extends java.lang.Enum {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+# Explicitly preserve all serialization members. The Serializable interface
+# is only a marker interface, so it wouldn't save them.
+# You can comment this out if your application doesn't use serialization.
+# If your code contains serializable classes that have to be backward 
+# compatible, please refer to the manual.
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/drawable/ic_menu_browse.png and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/drawable/ic_menu_browse.png differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/drawable/icon.png and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/drawable/icon.png differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/layout/fileinfo_list_item.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/layout/fileinfo_list_item.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/layout/fileinfo_list_item.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/layout/fileinfo_list_item.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:padding="4sp">
+	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<TextView android:id="@+id/title"
+			android:layout_width="0px" android:layout_weight="1" android:layout_height="wrap_content"
+			android:textSize="18sp" android:textStyle="bold" />
+		<TextView android:id="@+id/songs"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:textSize="16sp" />
+	</LinearLayout>
+	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<TextView android:id="@+id/author"
+			android:layout_width="0px" android:layout_weight="1" android:layout_height="wrap_content"
+			android:textSize="16sp" />
+		<TextView android:id="@+id/date"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:textSize="16sp" />
+	</LinearLayout>
+</LinearLayout>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/layout/filename_list_item.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/layout/filename_list_item.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/layout/filename_list_item.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/layout/filename_list_item.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="wrap_content"
+	android:textSize="20sp" android:padding="6sp" />
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/layout/playing.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/layout/playing.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/layout/playing.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/layout/playing.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_gravity="center"
+	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<TextView android:id="@+id/name" android:textSize="28sp" android:gravity="center_horizontal"
+		android:layout_width="fill_parent" android:layout_height="wrap_content" />
+	<TextView android:id="@+id/author" android:textSize="24sp" android:gravity="center_horizontal"
+		android:layout_width="fill_parent" android:layout_height="wrap_content" />
+	<TextView android:id="@+id/date" android:textSize="24sp" android:gravity="center_horizontal"
+		android:layout_width="fill_parent" android:layout_height="wrap_content" />
+	<TextView android:id="@+id/song" android:textSize="20sp" android:gravity="center_horizontal"
+		android:layout_width="fill_parent" android:layout_height="wrap_content" />
+	<Button android:id="@+id/stop_button" android:text="@string/stop_button"
+		android:textSize="28sp" android:layout_gravity="center_horizontal"
+		android:layout_width="wrap_content" android:layout_height="wrap_content" />
+</LinearLayout>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/menu/archive_selector.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/menu/archive_selector.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/menu/archive_selector.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/menu/archive_selector.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/menu_search" android:title="@string/menu_search" android:icon="@android:drawable/ic_menu_search" android:showAsAction="collapseActionView|ifRoom" android:actionViewClass="android.widget.SearchView" />
+	<item android:id="@+id/menu_browse" android:title="@string/menu_browse" android:icon="@drawable/ic_menu_browse" android:showAsAction="ifRoom" />
+</menu>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/menu/file_selector.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/menu/file_selector.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/menu/file_selector.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/menu/file_selector.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/menu_search" android:title="@string/menu_search" android:icon="@android:drawable/ic_menu_search" android:showAsAction="ifRoom" />
+	<item android:id="@+id/menu_toggle_details" android:title="@string/menu_toggle_details" android:icon="@android:drawable/ic_menu_info_details" android:showAsAction="ifRoom" />
+</menu>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/values/strings.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/values/strings.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/values/strings.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name">ASAP</string>
+	<string name="app_description">ASAP is a player of Atari 8-bit music. It emulates the POKEY sound chip and the 6502 processor. ASAP supports the following file formats: SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.</string>
+	<string name="play_in_asap">Play in ASAP</string>
+	<string name="selector_title">ASAP - %1$s</string>
+	<string name="access_denied">Access denied</string>
+	<string name="shuffle_all">(shuffle all)</string>
+	<string name="songs_format">%1$d songs</string>
+	<string name="author_suggestion_songs">%1$d songs</string>
+	<string name="playing_title">ASAP - Playing</string>
+	<string name="error_reading_file">Error reading file</string>
+	<string name="invalid_file">Invalid file</string>
+	<string name="stop_button">Stop</string>
+	<string name="song_format">Song %1$d of %2$d</string>
+	<string name="menu_search">Search</string>
+	<string name="menu_toggle_details">Toggle details</string>
+	<string name="menu_browse">Browse</string>
+	<string name="player_service">Player Service</string>
+    <string name="notification_channel">Now Playing</string>
+</resources>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/values/themes.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/values/themes.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/values/themes.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/values/themes.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="Theme">
+		<item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>
+		<item name="android:colorBackgroundCacheHint">@null</item>
+		<item name="android:windowShowWallpaper">true</item>
+		<item name="android:textColor">@android:color/white</item>
+		<item name="android:autoCompleteTextViewStyle">@style/MyAutoCompleteTextView</item>
+	</style>
+	<style name="MyAutoCompleteTextView" parent="android:Widget.AutoCompleteTextView">
+		<item name="android:popupBackground">#202020</item>
+	</style>
+</resources>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/xml/searchable.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/xml/searchable.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/res/xml/searchable.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/res/xml/searchable.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+	android:label="@string/app_name"
+	android:searchSuggestAuthority="net.sf.asap.ArchiveSuggestionsProvider"
+	android:searchSuggestIntentAction="android.intent.action.VIEW"
+	android:includeInGlobalSearch="true" />
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/Util.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/Util.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/Util.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/Util.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,128 @@
+/*
+ * Util.java - ASAP for Android
+ *
+ * Copyright (C) 2010-2020  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import android.content.Context;
+import android.net.Uri;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.LineNumberReader;
+
+class Util
+{
+	static boolean endsWithIgnoreCase(String s, String suffix)
+	{
+		int length = s.length();
+		int suffixLength = suffix.length();
+		return length >= suffixLength && s.regionMatches(true, length - suffixLength, suffix, 0, suffixLength);
+	}
+
+	static final Uri asmaRoot = Uri.fromParts("asma", "", null);
+
+	static boolean isAsma(Uri uri)
+	{
+		return "asma".equals(uri.getScheme());
+	}
+
+	static String getParent(String path)
+	{
+		// nice hack - if there is no slash we return an empty string
+		return path.substring(0, path.lastIndexOf('/') + 1);
+	}
+
+	static Uri getParent(Uri uri)
+	{
+		if (isAsma(uri))
+			return asmaRoot;
+		String path = uri.getFragment();
+		if (path != null)
+			return uri.buildUpon().fragment(getParent(path)).build();
+		return Uri.fromFile(new File(getParent(uri.getPath())));
+	}
+
+	static String stripM3u(String path)
+	{
+		return endsWithIgnoreCase(path, ".m3u") ? getParent(path) : path;
+	}
+
+	static Uri buildUri(Uri baseUri, String relativePath)
+	{
+		if (isAsma(baseUri))
+			return Uri.fromParts("asma", relativePath, null);
+		String path = baseUri.getPath();
+		if (endsWithIgnoreCase(path, ".zip") || endsWithIgnoreCase(path, ".atr")) {
+			String innerPath = baseUri.getFragment();
+			if (innerPath == null)
+				innerPath = relativePath;
+			else
+				innerPath = stripM3u(innerPath) + relativePath;
+			return baseUri.buildUpon().fragment(innerPath).build();
+		}
+		return Uri.fromFile(new File(stripM3u(path), relativePath));
+	}
+
+	/**
+	 * Reads bytes from the stream into the byte array
+	 * until end of stream or array is full.
+	 * @param is source stream
+	 * @param b output array
+	 * @return number of bytes read
+	 */
+	static int readAndClose(InputStream is, byte[] b) throws IOException
+	{
+		int got = 0;
+		int len = b.length;
+		try {
+			while (got < len) {
+				int i = is.read(b, got, len - got);
+				if (i <= 0)
+					break;
+				got += i;
+			}
+		}
+		finally {
+			is.close();
+		}
+		return got;
+	}
+
+	static LineNumberReader openIndex(Context context) throws IOException
+	{
+		return new LineNumberReader(new InputStreamReader(context.getAssets().open("index.txt")));
+	}
+
+	static boolean matches(String value, String query)
+	{
+		int pos = -1;
+		do {
+			if (value.regionMatches(true, ++pos, query, 0, query.length())
+			 || (pos + 1 < value.length() && value.charAt(pos) == '(' && value.regionMatches(true, ++pos, query, 0, query.length())))
+				return true;
+			pos = value.indexOf(' ', pos);
+		} while (pos >= 0);
+		return false;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/ZipInputStream.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/ZipInputStream.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/android/ZipInputStream.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/android/ZipInputStream.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ * ZipInputStream.java - ASAP for Android
+ *
+ * Copyright (C) 2013  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.zip.ZipFile;
+
+class ZipInputStream extends FilterInputStream
+{
+	private final ZipFile zip;
+
+	private ZipInputStream(ZipFile zip, String filename) throws IOException
+	{
+		super(zip.getInputStream(zip.getEntry(filename)));
+		this.zip = zip;
+	}
+
+	ZipInputStream(String zipFilename, String filename) throws IOException
+	{
+		this(new ZipFile(zipFilename), filename);
+	}
+
+	@Override
+	public void close() throws IOException
+	{
+		super.close();
+		zip.close();
+	}
+
+	InputStream openInputStream(String filename) throws IOException
+	{
+		return zip.getInputStream(zip.getEntry(filename));
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/ASAP2WAV.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/ASAP2WAV.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/ASAP2WAV.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/ASAP2WAV.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,197 @@
+/*
+ * ASAP2WAV.java - converter of ASAP-supported formats to WAV files
+ *
+ * Copyright (C) 2007-2011  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import net.sf.asap.ASAP;
+import net.sf.asap.ASAPInfo;
+import net.sf.asap.ASAPSampleFormat;
+
+public class ASAP2WAV
+{
+	private static String outputFilename = null;
+	private static boolean outputHeader = true;
+	private static int song = -1;
+	private static int format = ASAPSampleFormat.S16_L_E;
+	private static int duration = -1;
+	private static int muteMask = 0;
+
+	private static void printHelp()
+	{
+		System.out.print(
+			"Usage: java -jar asap2wav.jar [OPTIONS] INPUTFILE...\n" +
+			"Each INPUTFILE must be in a supported format:\n" +
+			"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
+			"Options:\n" +
+			"-o FILE     --output=FILE      Set output file name\n" +
+			"-o -        --output=-         Write to standard output\n" +
+			"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
+			"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
+			"-b          --byte-samples     Output 8-bit samples\n" +
+			"-w          --word-samples     Output 16-bit samples (default)\n" +
+			"            --raw              Output raw audio (no WAV header)\n" +
+			"-m CHANNELS --mute=CHANNELS    Mute POKEY chanels (1-8)\n" +
+			"-h          --help             Display this information\n" +
+			"-v          --version          Display version information\n"
+		);
+	}
+
+	private static void setSong(String s)
+	{
+		song = Integer.parseInt(s);
+	}
+
+	private static void setTime(String s) throws Exception
+	{
+		duration = ASAPInfo.parseDuration(s);
+	}
+
+	private static void setMuteMask(String s)
+	{
+		int mask = 0;
+		for (int i = 0; i < s.length(); i++) {
+			int c = s.charAt(i);
+			if (c >= '1' && c <= '8')
+				mask |= 1 << (c - '1');
+		}
+		muteMask = mask;
+	}
+
+	/**
+	 * Reads bytes from the stream into the byte array
+	 * until end of stream or array is full.
+	 * @param is source stream
+	 * @param b output array
+	 * @return number of bytes read
+	 */
+	private static int readAndClose(InputStream is, byte[] b) throws IOException
+	{
+		int got = 0;
+		int len = b.length;
+		try {
+			while (got < len) {
+				int i = is.read(b, got, len - got);
+				if (i <= 0)
+					break;
+				got += i;
+			}
+		}
+		finally {
+			is.close();
+		}
+		return got;
+	}
+
+	private static void processFile(String inputFilename) throws Exception
+	{
+		InputStream is = new FileInputStream(inputFilename);
+		byte[] module = new byte[ASAPInfo.MAX_MODULE_LENGTH];
+		int moduleLen = readAndClose(is, module);
+		ASAP asap = new ASAP();
+		asap.load(inputFilename, module, moduleLen);
+		ASAPInfo info = asap.getInfo();
+		if (song < 0)
+			song = info.getDefaultSong();
+		if (duration < 0) {
+			duration = info.getDuration(song);
+			if (duration < 0)
+				duration = 180 * 1000;
+		}
+		asap.playSong(song, duration);
+		asap.mutePokeyChannels(muteMask);
+		if (outputFilename == null) {
+			int i = inputFilename.lastIndexOf('.');
+			outputFilename = inputFilename.substring(0, i + 1) + (outputHeader ? "wav" : "raw");
+		}
+		OutputStream os;
+		if (outputFilename.equals("-"))
+			os = System.out;
+		else
+			os = new FileOutputStream(outputFilename);
+		byte[] buffer = new byte[8192];
+		int nBytes;
+		if (outputHeader) {
+			nBytes = asap.getWavHeader(buffer, format, false);
+			os.write(buffer, 0, nBytes);
+		}
+		do {
+			nBytes = asap.generate(buffer, buffer.length, format);
+			os.write(buffer, 0, nBytes);
+		} while (nBytes == buffer.length);
+		os.close();
+		outputFilename = null;
+		song = -1;
+		duration = -1;
+	}
+
+	public static void main(String[] args) throws Exception
+	{
+		boolean noInputFiles = true;
+		for (int i = 0; i < args.length; i++) {
+			String arg = args[i];
+			if (arg.charAt(0) != '-') {
+				processFile(arg);
+				noInputFiles = false;
+			}
+			else if (arg.equals("-o"))
+				outputFilename = args[++i];
+			else if (arg.startsWith("--output="))
+				outputFilename = arg.substring(9);
+			else if (arg.equals("-s"))
+				setSong(args[++i]);
+			else if (arg.startsWith("--song="))
+				setSong(arg.substring(7));
+			else if (arg.equals("-t"))
+				setTime(args[++i]);
+			else if (arg.startsWith("--time="))
+				setTime(arg.substring(7));
+			else if (arg.equals("-b") || arg.equals("--byte-samples"))
+				format = ASAPSampleFormat.U8;
+			else if (arg.equals("-w") || arg.equals("--word-samples"))
+				format = ASAPSampleFormat.S16_L_E;
+			else if (arg.equals("--raw"))
+				outputHeader = false;
+			else if (arg.equals("-m"))
+				setMuteMask(args[++i]);
+			else if (arg.startsWith("--mute="))
+				setMuteMask(arg.substring(7));
+			else if (arg.equals("-h") || arg.equals("--help")) {
+				printHelp();
+				noInputFiles = false;
+			}
+			else if (arg.equals("-v") || arg.equals("--version")) {
+				System.out.println("ASAP2WAV (Java) " + ASAPInfo.VERSION);
+				noInputFiles = false;
+			}
+			else
+				throw new IllegalArgumentException("unknown option: " + arg);
+		}
+		if (noInputFiles) {
+			printHelp();
+			System.exit(1);
+		}
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/asap2wav.MF kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/asap2wav.MF
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/asap2wav.MF	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/asap2wav.MF	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: ASAP2WAV
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/ASAPMusicRoutine.java kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/ASAPMusicRoutine.java
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/ASAPMusicRoutine.java	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/ASAPMusicRoutine.java	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+ * ASAPMusicRoutine.java - music embeddable in an Atari program
+ *
+ * Copyright (C) 2011-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.sf.asap;
+
+/**
+ * Music embeddable in an Atari program.
+ * Use this class to transform music into a routine
+ * that can be called from your 6502 assembly language program.
+ * Link your program with the binary returned by {@link #getBinaryContent()}.
+ * Call the music routine as specified by {@link #getInitAddress()},
+ * {@link #isFulltime()}, {@link #getPlayerAddress()} and {@link #getPlayerRate()}.
+ */
+public class ASAPMusicRoutine
+{
+	private final byte[] binary = new byte[ASAPInfo.MAX_MODULE_LENGTH];
+	private final int binaryLen;
+	private final int initAddress;
+	private final boolean fulltime;
+	private final int playerAddress;
+	private final int playerRate;
+
+	/**
+	 * Transforms music data into a form that can be embedded in an Atari 8-bit program.
+	 * @param filename Name of the source music file. The extension is used to identify the format. No I/O is performed.
+	 * @param module Contents of the source music file. Only <code>moduleLen</code> leading bytes are meaningful.
+	 * @param moduleLen Length of the source music file.
+	 * @throws Exception if the source is invalid, not supported by ASAP or cannot be converted to ASAPMusicRoutine.
+	 */
+	public ASAPMusicRoutine(String filename, byte[] module, int moduleLen) throws Exception
+	{
+		ASAPInfo info = new ASAPInfo();
+		info.load(filename, module, moduleLen);
+		ASAPWriter writer = new ASAPWriter();
+		writer.setOutput(binary, 0, binary.length);
+		int[] initAndPlayer = new int[2];
+		writer.writeExecutable(initAndPlayer, info, module, moduleLen);
+		binaryLen = writer.outputOffset;
+		initAddress = initAndPlayer[0];
+		// TODO: SAP_S
+		fulltime = info.type == ASAPModuleType.SAP_D;
+		playerAddress = initAndPlayer[1];
+		playerRate = info.getPlayerRateScanlines();
+	}
+
+	/**
+	 * Returns music data.
+	 * The data is in the format of Atari 8-bit executables:
+	 * two <code>0xff</code> bytes followed by multiple blocks loaded
+	 * at different addresses.
+	 * It is not a complete program, there is no init or run address.
+	 * Currently the loading addresses can be as low as <code>0x200</code>
+	 * which normally conflicts with the Atari operating system.
+	 * @see #getBinaryLength()
+	 */
+	public byte[] getBinaryContent() { return binary; }
+
+	/**
+	 * Returns length of music data.
+	 * @see #getBinaryContent()
+	 */
+	public int getBinaryLength() { return binaryLen; }
+
+	/**
+	 * Returns address of the initialization routine.
+	 * The initialization routine is 6502 code which should be called once
+	 * before the playback. There can be more than one song available -
+	 * load the zero-based song number into the accumulator.
+	 * For correct playback, you should reset the audio part of POKEY.
+	 * Example stereo-ready music initialization code:
+	 * <pre>
+	 *     lda #3
+	 *     sta $d21f
+	 *     sta $d20f
+	 *     ldx #8
+	 *     lda #0
+	 * initPokey_1 sta $d210,x
+	 *     sta $d200,x
+	 *     dex
+	 *     bpl initPokey_1
+	 *     lda #0 ; first song
+	 *     jsr initMusic ; use the address returned by {@link #getInitAddress()}
+	 * </pre>
+	 */
+	public int getInitAddress() { return initAddress; }
+
+	/**
+	 * Returns <code>true</code> if the initialization routine doesn't return
+	 * and actually performs the playback.
+	 * This usually means that the music contains digitalized sounds
+	 * and requires full 6502 processing power.
+	 * It is likely that you also need to disable screen DMA
+	 * and operating system interrupts for correct playback.
+	 */
+	public boolean isFulltime() { return fulltime; }
+
+	/**
+	 * Returns address of the player routine.
+	 * The player routine should be called at a constant rate
+	 * with a <code>JSR</code>.
+	 */
+	public int getPlayerAddress() { return playerAddress; }
+
+	/**
+	 * Returns the rate at which the player routine should be called.
+	 * The value is expressed as an interval in scanlines (one scanline equals 114 cycles).
+	 * Typical value is 312, which means that on a PAL Atari you should
+	 * call the player routine once per frame (usually on a vertical blank interrupt).
+	 */
+	public int getPlayerRate() { return playerRate; }
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/java.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/java.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/java/java.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/java/java.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,46 @@
+JAVAC = $(DO)javac
+JAR = $(DO)jar
+JAVADOC = $(DO)javadoc
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "java.mk")
+endif
+
+JAVA_OBX = $(ASM6502_PLAYERS:%=java/obx/net/sf/asap/%.obx)
+JAVA_XEX = $(addprefix java/xex/net/sf/asap/,xexb.obx xexd.obx xexinfo.obx)
+JAR_COMMON = -C java/classes net $(ASM6502_PLAYERS:%=-C java/obx net/sf/asap/%.obx)
+
+java/asap2wav.jar: $(srcdir)java/asap2wav.MF java/classes/ASAP2WAV.class $(JAVA_OBX)
+	$(JAR) cfm $@ $< -C java/classes ASAP2WAV.class $(JAR_COMMON)
+CLEAN += java/asap2wav.jar
+
+java/classes/ASAP2WAV.class: $(srcdir)java/ASAP2WAV.java java/classes/net/sf/asap/ASAP.class
+	$(JAVAC) -d $(@D) -classpath java/classes $<
+
+java/asap.jar: java/classes/net/sf/asap/ASAP.class $(JAVA_OBX) $(JAVA_XEX)
+	$(JAR) cf $@ $(JAR_COMMON) $(JAVA_XEX:java/xex/%=-C java/xex %)
+CLEAN += java/asap.jar
+
+java/obx/net/sf/asap/%.obx: 6502/%.obx
+	$(COPY)
+CLEAN += $(JAVA_OBX)
+
+java/xex/net/sf/asap/%.obx: 6502/%.obx
+	$(COPY)
+CLEANDIR += java/xex
+
+java/classes/net/sf/asap/ASAP.class: $(srcdir)java/ASAPMusicRoutine.java java/src/net/sf/asap/ASAP.java
+	$(JAVAC) -d java/classes $(srcdir)java/ASAPMusicRoutine.java java/src/net/sf/asap/*.java
+CLEANDIR += java/classes
+
+java/src/net/sf/asap/ASAP.java: $(call src,asap.ci asap6502.ci asapinfo.ci asapwriter.ci cpu6502.ci flashpack.ci pokey.ci aatr.ci) $(ASM6502_OBX)
+	$(CITO) -n net.sf.asap
+CLEANDIR += java/src
+
+java/doc: java/src/net/sf/asap/ASAP.java $(srcdir)java/ASAPMusicRoutine.java
+	$(JAVADOC) -d $@ java/src/net/sf/asap/*.java $(srcdir)java/ASAPMusicRoutine.java
+CLEANDIR += java/doc
+
+include $(srcdir)java/android/android.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/asap2wav1.js kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/asap2wav1.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/asap2wav1.js	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/asap2wav1.js	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,380 @@
+/*
+ * asap2wav1.js - converter of ASAP-supported formats to WAV files
+ *
+ * Copyright (C) 2009-2011 Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+var usage;
+
+/*@cc_on
+@if (@_jscript_version >= 7)
+	// JScript .NET
+
+	import System;
+	import System.IO;
+
+	var arguments = new Array(Environment.GetCommandLineArgs());
+	usage = arguments.shift() + " [OPTIONS] INPUTFILE...";
+
+	function quit(code)
+	{
+		Environment.Exit(code);
+	}
+
+	function readBinaryFile(filename)
+	{
+		return File.ReadAllBytes(filename);
+	}
+
+	class BinaryFileOutput
+	{
+		var stream;
+
+		function BinaryFileOutput(filename)
+		{
+			this.stream = File.Create(filename);
+		}
+
+		function write(bytes, len)
+		{
+			this.stream.Write(bytes, 0, len);
+		}
+
+		function close()
+		{
+			this.stream.Close();
+		}
+	}
+@else @*/
+if (typeof(WScript) == "object") {
+	// WScript
+
+	var arguments = new Array();
+	for (var i = 0; i < WScript.Arguments.length; i++)
+		arguments[i] = WScript.Arguments(i);
+	usage = "cscript asap2wav.js [OPTIONS] INPUTFILE...";
+
+	var print = function(s)
+	{
+		WScript.Echo(s);
+	}
+
+	var quit = function(code)
+	{
+		WScript.Quit(code);
+	}
+
+	var BinaryFile_cp437ToUnicode = [
+		199, 252, 233, 226, 228, 224, 229, 231, 234, 235, 232, 239, 238, 236, 196, 197,
+		201, 230, 198, 244, 246, 242, 251, 249, 255, 214, 220, 162, 163, 165, 8359, 402,
+		225, 237, 243, 250, 241, 209, 170, 186, 191, 8976, 172, 189, 188, 161, 171, 187,
+		9617, 9618, 9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564, 9563, 9488,
+		9492, 9524, 9516, 9500, 9472, 9532, 9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552, 9580, 9575,
+		9576, 9572, 9573, 9561, 9560, 9554, 9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612, 9616, 9600,
+		945, 223, 915, 960, 931, 963, 181, 964, 934, 920, 937, 948, 8734, 966, 949, 8745,
+		8801, 177, 8805, 8804, 8992, 8993, 247, 8776, 176, 8729, 183, 8730, 8319, 178, 9632, 160
+	];
+
+	var BinaryFile_unicodeToCp437 = new Array(9633);
+	for (var c = 0; c < 128; c++) {
+		BinaryFile_unicodeToCp437[c] = c;
+		BinaryFile_unicodeToCp437[BinaryFile_cp437ToUnicode[c]] = 128 + c;
+	}
+
+	var createStream = function()
+	{
+		var stream = WScript.CreateObject("ADODB.Stream");
+		stream.Type = 2;
+		stream.CharSet = '437';
+		stream.Open();
+		return stream;
+	}
+
+	var readBinaryFile = function(filename)
+	{
+		var stream = createStream();
+		stream.LoadFromFile(filename);
+		var unicode = stream.ReadText();
+		stream.Close();
+		var bytes = new Array(unicode.length);
+		for (var i = 0; i < unicode.length; i++) {
+			var c = unicode.charCodeAt(i);
+			bytes[i] = BinaryFile_unicodeToCp437[c];
+		}
+		return bytes;
+	}
+
+	var BinaryFileOutput = function(filename)
+	{
+		this.filename = filename;
+		this.stream = createStream();
+
+		this.write = function(bytes, len)
+		{
+			for (var i = 0; i < len; i++) {
+				var c = bytes[i];
+				if (c >= 128)
+					c = BinaryFile_cp437ToUnicode[c - 128];
+				this.stream.WriteText(String.fromCharCode(c));
+			}
+		}
+
+		this.close = function()
+		{
+			this.stream.SaveToFile(filename, 2);
+			this.stream.Close();
+		}
+	}
+}
+else if (typeof(java) == "object") {
+	// Rhino
+
+	usage = "java -jar js.jar -opt -1 asap2wav.js [OPTIONS] INPUTFILE...";
+
+	var readBinaryFile = function(filename)
+	{
+		var stream = new java.io.FileInputStream(filename);
+		var bytes = new Array();
+		for (;;) {
+			var c = stream.read();
+			if (c < 0)
+				break;
+			bytes.push(c);
+		}
+		return bytes;
+	}
+
+	var BinaryFileOutput = function(filename)
+	{
+		this.stream = new java.io.BufferedOutputStream(new java.io.FileOutputStream(filename));
+
+		this.write = function(bytes, len)
+		{
+			for (var i = 0; i < len; i++)
+				this.stream.write(bytes[i]);
+		}
+
+		this.close = function()
+		{
+			this.stream.close();
+		}
+	}
+}
+else {
+	// DMDScript, JaegerMonkey or d8
+
+	if (typeof(readline) == "undefined") {
+		var readline = readln;
+		var write = print;
+		var args = getenv("ARGS");
+		arguments = args == null ? [] : args.split(" ");
+		usage = "\nset ARGS=[OPTIONS] INPUTFILE\nbase64 INPUTFILE | ds asap2wav.js | base64 -d > OUTFILE";
+	}
+	else if (typeof(write) == "undefined") {
+		var write = putstr;
+		usage = "base64 INPUTFILE | js asap2wav.js [OPTIONS] INPUTFILE | base64 -d > OUTFILE";
+	}
+	else
+		usage = "base64 INPUTFILE | d8 asap2wav.js -- [OPTIONS] INPUTFILE | base64 -d > OUTFILE";
+
+	var base64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+	var readBinaryFile = function(filename)
+	{
+		var bytes = new Array();
+		var prev;
+		var gotBits = 0;
+		for (;;) {
+			var line = readline();
+			if (line == null || line.length == 0)
+				break;
+			for (var i = 0; i < line.length; i++) {
+				var v = base64chars.indexOf(line.charAt(i));
+				if (v >= 0) {
+					gotBits = (gotBits + 6) & 6;
+					if (gotBits != 6)
+						bytes.push((prev << 6 | v) >> gotBits & 0xff);
+					prev = v;
+				}
+			}
+		}
+		return bytes;
+	}
+
+	var BinaryFileOutput = function(filename)
+	{
+		this.prev = 0;
+		this.gotBits = 0;
+
+		this.write = function(bytes, len)
+		{
+			for (var i = 0; i < len; i++) {
+				this.gotBits += 2;
+				var v = this.prev << 8 | bytes[i];
+				write(base64chars.charAt(v >> this.gotBits & 63));
+				if (this.gotBits == 6) {
+					write(base64chars.charAt(v & 63));
+					this.gotBits = 0;
+				}
+				this.prev = bytes[i];
+			}
+		}
+
+		this.close = function()
+		{
+			if (this.gotBits == 2) {
+				write(base64chars.charAt((this.prev & 3) << 4));
+				write("==");
+			}
+			else if (this.gotBits == 4) {
+				write(base64chars.charAt((this.prev & 15) << 2));
+				write("=");
+			}
+		}
+	}
+}
+/*@end @*/
+
+var outputFilename = null;
+var outputHeader = true;
+var song = -1;
+var format = ASAPSampleFormat.S16_L_E;
+var duration = -1;
+var muteMask = 0;
+
+function printHelp()
+{
+	print(
+		"Usage: " + usage + "\n" +
+		"Each INPUTFILE must be in a supported format:\n" +
+		"SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC.\n" +
+		"Options:\n" +
+		"-o FILE     --output=FILE      Set output file name\n" +
+		"-s SONG     --song=SONG        Select subsong number (zero-based)\n" +
+		"-t TIME     --time=TIME        Set output length (MM:SS format)\n" +
+		"-b          --byte-samples     Output 8-bit samples\n" +
+		"-w          --word-samples     Output 16-bit samples (default)\n" +
+		"            --raw              Output raw audio (no WAV header)\n" +
+		"-m CHANNELS --mute=CHANNELS    Mute POKEY channels (1-8)\n" +
+		"-h          --help             Display this information\n" +
+		"-v          --version          Display version information"
+	);
+}
+
+function setSong(s)
+{
+	song = parseInt(s, 10);
+}
+
+function setTime(s)
+{
+	duration = ASAPInfo.parseDuration(s);
+}
+
+function setMuteMask(s)
+{
+	muteMask = 0;
+	for (var i = 0; i < s.length; i++) {
+		var ch = s.charCodeAt(i) - 49;
+		if (ch >= 0 && ch < 8)
+			muteMask |= 1 << ch;
+	}
+}
+
+function processFile(inputFilename)
+{
+	var module = readBinaryFile(inputFilename);
+	var asap = new ASAP();
+	asap.load(inputFilename, module, module.length);
+	var info = asap.getInfo();
+	if (song < 0)
+		song = info.getDefaultSong();
+	if (duration < 0) {
+		duration = info.getDuration(song);
+		if (duration < 0)
+			duration = 180 * 1000;
+	}
+	asap.playSong(song, duration);
+	asap.mutePokeyChannels(muteMask);
+	if (outputFilename == null) {
+		var i = inputFilename.lastIndexOf(".");
+		outputFilename = inputFilename.substring(0, i + 1) + (outputHeader ? "wav" : "raw");
+	}
+	var of = new BinaryFileOutput(outputFilename);
+	var buffer = new Array(8192);
+	var nBytes;
+	if (outputHeader) {
+		nBytes = asap.getWavHeader(buffer, format, false);
+		of.write(buffer, nBytes);
+	}
+	do {
+		nBytes = asap.generate(buffer, 8192, format);
+		of.write(buffer, nBytes);
+	} while (nBytes == 8192);
+	of.close();
+	outputFilename = null;
+	song = -1;
+	duration = -1;
+}
+
+var noInputFiles = true;
+for (var i = 0; i < arguments.length; i++) {
+	var arg = arguments[i];
+	if (arg.charAt(0) != "-") {
+		processFile(arg);
+		noInputFiles = false;
+	}
+	else if (arg == "-o")
+		outputFilename = arguments[++i];
+	else if (arg.substring(0, 9) == "--output=")
+		outputFilename = arg.substring(9, arg.length);
+	else if (arg == "-s")
+		setSong(arguments[++i]);
+	else if (arg.substring(0, 7) == "--song=")
+		setSong(arg.substring(7, arg.length));
+	else if (arg == "-t")
+		setTime(arguments[++i]);
+	else if (arg.substring(0, 7) ==  "--time=")
+		setTime(arg.substring(7, arg.length));
+	else if (arg == "-b" || arg == "--byte-samples")
+		format = ASAPSampleFormat.U8;
+	else if (arg == "-w" || arg == "--word-samples")
+		format = ASAPSampleFormat.S16_L_E;
+	else if (arg == "--raw")
+		outputHeader = false;
+	else if (arg == "-m")
+		setMuteMask(arguments[++i]);
+	else if (arg.substring(0, 7) == "--mute=")
+		setMuteMask(arg.substring(7, arg.length));
+	else if (arg == "-h" || arg == "--help") {
+		printHelp();
+		noInputFiles = false;
+	}
+	else if (arg == "-v" || arg == "--version") {
+		print("ASAP2WAV (JavaScript) " + ASAPInfo.VERSION);
+		noInputFiles = false;
+	}
+	else
+		throw "unknown option: " + arg;
+}
+if (noInputFiles) {
+	printHelp();
+	quit(1);
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/asapweb.js kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/asapweb.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/asapweb.js	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/asapweb.js	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,120 @@
+/*
+ * asapweb.js - pure JavaScript ASAP for web browsers
+ *
+ * Copyright (C) 2009-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+var asap = {
+	stop : function()
+	{
+		if (this.processor) {
+			this.processor.disconnect();
+			delete this.processor;
+		}
+	},
+
+	playContent : function(filename, content, song)
+	{
+		const asap = new ASAP();
+		asap.load(filename, content, content.length);
+		const info = asap.getInfo();
+		if (song === undefined)
+			song = info.getDefaultSong();
+		asap.playSong(song, -1);
+
+		this.stop();
+		const length = 4096;
+		const channels = asap.getInfo().getChannels();
+		const buffer = new Uint8Array(new ArrayBuffer(length * channels));
+
+		const AudioContext = window.AudioContext || window.webkitAudioContext;
+		if (typeof(this.context) == "object")
+			this.context.close();
+		this.context = new AudioContext({ sampleRate : ASAP.SAMPLE_RATE });
+		if (typeof(this.onUpdate) == "function")
+			this.context.onstatechange = this.onUpdate;
+		this.processor = this.context.createScriptProcessor(length, 0, channels);
+		this.processor.onaudioprocess = e => {
+			asap.generate(buffer, length * channels, ASAPSampleFormat.U8);
+			for (let c = 0; c < channels; c++) {
+				const output = e.outputBuffer.getChannelData(c);
+				for (let i = 0; i < length; i++)
+					output[i] = (buffer[i * channels + c] - 128) / 128;
+			}
+			if (typeof(this.onUpdate) == "function")
+				this.onUpdate();
+		};
+		this.processor.connect(this.context.destination);
+		this.asap = asap;
+		if (typeof(this.onUpdate) == "function")
+			this.onUpdate();
+	},
+
+	togglePause : function()
+	{
+		if (this.context) {
+			switch (this.context.state) {
+			case "running":
+				this.context.suspend();
+				return true;
+			case "suspended":
+				this.context.resume();
+				return false;
+			default:
+				break;
+			}
+		}
+		return null;
+	},
+
+	isPaused : function()
+	{
+		if (this.context) {
+			switch (this.context.state) {
+			case "running":
+				return false;
+			case "suspended":
+				return true;
+			default:
+				break;
+			}
+		}
+		return null;
+	},
+
+	playUrl : function(url, song)
+	{
+		const request = new XMLHttpRequest();
+		request.open("GET", url, true);
+		request.responseType = "arraybuffer";
+		request.onload = e => {
+			if (request.status == 200 || request.status == 0)
+				this.playContent(url, new Uint8Array(request.response), song);
+		};
+		request.send();
+	},
+
+	playFile : function(file)
+	{
+		const reader = new FileReader();
+		reader.onload = e => this.playContent(file.name, new Uint8Array(e.target.result));
+		reader.readAsArrayBuffer(file);
+	}
+};
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/javascript.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/javascript.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/javascript.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/javascript.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,22 @@
+JSC = $(DO)jsc -nologo -w:2 -out:$@ $<
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "javascript.mk")
+endif
+
+javascript: javascript/asap2wav.js
+.PHONY: javascript
+
+javascript/asap2wav.exe: javascript/asap2wav.js
+	$(JSC)
+CLEAN += javascript/asap2wav.exe
+
+javascript/asap2wav.js: javascript/asap.js $(srcdir)javascript/asap2wav1.js
+	$(DO)cat $^ > $@
+CLEAN += javascript/asap2wav.js
+
+javascript/asap.js: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
+	$(CITO)
+CLEAN += javascript/asap.js
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/USAGE kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/USAGE
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/javascript/USAGE	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/javascript/USAGE	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,14 @@
+How to use command-line JavaScript ASAP2WAV
+-------------------------------------------
+
+Enter the following command line to see the syntax:
+
+Windows Script Host: cscript asap2wav.js
+        Rhino Shell: java -jar js.jar -opt 1 asap2wav.js
+           V8 Shell: d8 asap2wav.js
+       JScript .NET: asap2wav
+       JaegerMonkey: js asap2wav.js
+          DMDScript: ds asap2wav.js
+
+Unless you specify the '-o/--output' option, the output filename will be
+constructed from the input filename with the extension changed to 'wav'.
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/Makefile kodi-audiodecoder-asap-3.0.1/lib/asap-code/Makefile
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/Makefile	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,139 @@
+prefix := /usr/local
+srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
+bindir = $(prefix)/bin
+libdir = $(prefix)/lib$(shell test -d $(prefix)/lib64 -a `uname -i` = x86_64 && echo 64)
+CC = gcc
+CFLAGS = -O2 -Wall
+CPPFLAGS =
+LDFLAGS = -s
+AR = ar
+ARFLAGS = rc
+DO_CC = $(DO)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(filter %.c,$^) $(LDFLAGS)
+DO_AR = $(DO)$(AR) $(ARFLAGS) $@ $^
+CITO = $(DO)cito -o $@ $(patsubst %,-I %,$(sort $(dir $(filter-out %.ci,$^)))) $(filter %.ci,$^)
+INSTALL = install
+INSTALL_PROGRAM = mkdir -p $(DESTDIR)$(2) && $(INSTALL) $(1) $(DESTDIR)$(2)/$(or $(3),$(1))
+INSTALL_DATA = mkdir -p $(DESTDIR)$(2) && $(INSTALL) -m 644 $(1) $(DESTDIR)$(2)/$(1)
+SDL_CFLAGS = `sdl-config --cflags`
+SDL_LIBS = `sdl-config --libs`
+SEVENZIP = 7z a -mx=9 -bd -bso0
+MAKEZIP = $(DO)$(RM) $@ && $(SEVENZIP) -tzip $@ $(^:%=./%) # "./" makes 7z don't store paths in the archive
+COPY = $(DO)cp $< $@
+XASM = $(DO)xasm -q -o $@ $<
+OSX_CC = $(DO)gcc -O2 -Wall -o $@ -undefined dynamic_lookup -mmacosx-version-min=10.6 $(INCLUDEOPTS) $(filter %.c,$^)
+
+# no user-configurable paths below this line
+
+MAKEFLAGS = -r
+ifdef V
+DO = mkdir -p $(@D) && 
+else
+DO = @echo $@ && mkdir -p $(@D) && 
+endif
+src = $(addprefix $(srcdir),$(1:.[ch]=.c) $(patsubst %.[ch],%.h,$(filter %.[ch],$(1))))
+INCLUDEOPTS = $(patsubst %/,-I%,$(sort $(dir $(filter %.h,$^))))
+CLEAN :=
+CLEANDIR :=
+
+all: asapconv libasap.a
+.PHONY: all
+
+install: install-asapconv install-lib
+.PHONY: install
+
+include $(srcdir)6502/6502.mk
+include $(srcdir)www/www.mk
+include $(srcdir)release/release.mk
+include $(srcdir)test/test.mk
+
+# asapconv
+
+asapconv: $(call src,asapconv.c asap.[ch])
+	$(DO_CC)
+CLEAN += asapconv
+
+install-asapconv: asapconv
+	$(call INSTALL_PROGRAM,asapconv,$(bindir))
+.PHONY: install-asapconv
+
+uninstall-asapconv:
+	$(RM) $(DESTDIR)$(bindir)/asapconv
+.PHONY: uninstall-asapconv
+
+# lib
+
+lib: libasap.a
+.PHONY: lib
+
+libasap.a: asap.o
+	$(DO_AR)
+CLEAN += libasap.a
+
+asap.o: $(call src,asap.[ch])
+	$(DO_CC) -c
+CLEAN += asap.o
+
+install-lib: libasap.a $(srcdir)asap.h
+	$(call INSTALL_DATA,$(srcdir)asap.h,$(prefix)/include)
+	$(call INSTALL_DATA,libasap.a,$(libdir))
+.PHONY: install-lib
+
+uninstall-lib:
+	$(RM) $(DESTDIR)$(prefix)/include/asap.h $(DESTDIR)$(libdir)/libasap.a
+.PHONY: uninstall-lib
+
+# SDL
+
+asap-sdl: $(call src,asap-sdl.c asap.[ch])
+	$(DO_CC) $(SDL_CFLAGS) $(SDL_LIBS)
+CLEAN += asap-sdl
+
+install-sdl: asap-sdl
+	$(call INSTALL_PROGRAM,asap-sdl,$(bindir))
+.PHONY: install-sdl
+
+uninstall-sdl:
+	$(RM) $(DESTDIR)$(bindir)/asap-sdl
+.PHONY: uninstall-sdl
+
+# asapscan
+
+asapscan: $(srcdir)asapscan.c asap-asapscan.h
+	$(DO_CC)
+CLEAN += asapscan asapscan.exe
+
+asap-asapscan.h: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX) | asap-asapscan.c
+
+asap-asapscan.c: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX)
+	$(CITO) -D ASAPSCAN
+CLEAN += asap-asapscan.c asap-asapscan.h
+
+# asap.[ch]
+
+$(srcdir)asap.h: $(call src,asap.ci asap6502.ci asapinfo.ci asapwriter.ci cpu6502.ci flashpack.ci pokey.ci) $(ASM6502_OBX) | $(srcdir)asap.c
+
+$(srcdir)asap.c: $(call src,asap.ci asap6502.ci asapinfo.ci asapwriter.ci cpu6502.ci flashpack.ci pokey.ci) $(ASM6502_OBX)
+	$(CITO) -D C
+
+# aatr.[ch]
+
+$(srcdir)aatr.h: $(srcdir)aatr.ci | $(srcdir)aatr.c
+
+$(srcdir)aatr.c: $(srcdir)aatr.ci
+	$(CITO)
+
+clean:
+	$(RM) $(CLEAN)
+	$(RM) -r $(CLEANDIR)
+.PHONY: clean
+
+.DELETE_ON_ERROR:
+
+include $(srcdir)moc/moc.mk
+include $(srcdir)vlc/vlc.mk
+include $(srcdir)xmms/xmms.mk
+
+include $(srcdir)csharp/csharp.mk
+include $(srcdir)java/java.mk
+include $(srcdir)javascript/javascript.mk
+include $(srcdir)win32/win32.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/MANIFEST kodi-audiodecoder-asap-3.0.1/lib/asap-code/MANIFEST
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/MANIFEST	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/MANIFEST	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,193 @@
+6502/6502.mk
+6502/cm3.obx
+6502/cmc.asx
+6502/cmc.obx
+6502/cmr.obx
+6502/cms.asx
+6502/cms.obx
+6502/dlt.as8
+6502/dlt.obx
+6502/fc.as8
+6502/fc.obx
+6502/fp3depk.asx
+6502/mpt.asx
+6502/mpt.obx
+6502/os.asx
+6502/rmt.asx
+6502/rmt4.obx
+6502/rmt8.obx
+6502/tm2.asx
+6502/tm2.obx
+6502/tmc.asx
+6502/tmc.obx
+6502/xexb.asx
+6502/xexb.obx
+6502/xexd.asx
+6502/xexd.obx
+6502/xexinfo.asx
+6502/xexinfo.obx
+COPYING
+INSTALL
+MANIFEST
+Makefile
+PORTS.xml
+PORTS.xsl
+README
+aatr-stdio.c
+aatr-stdio.h
+aatr.ci
+asap-sdl.c
+asap.c
+asap.ci
+asap.h
+asap.spec
+asap6502.ci
+asapconv.c
+asapinfo.ci
+asapscan.c
+asapwriter.ci
+astil.c
+astil.h
+chksap.pl
+cpu6502.ci
+csharp/asap2wav.cs
+csharp/asapplay.cs
+csharp/csharp.mk
+debian/asap-dev.install
+debian/asap-vlc.install
+debian/asap.install
+debian/changelog
+debian/compat
+debian/control
+debian/copyright
+debian/rules
+flashpack.ci
+java/ASAP2WAV.java
+java/ASAPMusicRoutine.java
+java/android/AATRFileInputStream.java
+java/android/AndroidManifest.xml
+java/android/ArchiveSelector.java
+java/android/ArchiveSuggestionsProvider.java
+java/android/BaseSelector.java
+java/android/FileContainer.java
+java/android/FileInfo.java
+java/android/FileSelector.java
+java/android/Indexer.java
+java/android/JavaAATR.java
+java/android/MediaButtonEventReceiver.java
+java/android/Player.java
+java/android/PlayerService.java
+java/android/Util.java
+java/android/ZipInputStream.java
+java/android/android.mk
+java/android/proguard.cfg
+java/android/res/drawable/ic_menu_browse.png
+java/android/res/drawable/icon.png
+java/android/res/layout/fileinfo_list_item.xml
+java/android/res/layout/filename_list_item.xml
+java/android/res/layout/playing.xml
+java/android/res/menu/archive_selector.xml
+java/android/res/menu/file_selector.xml
+java/android/res/values/strings.xml
+java/android/res/values/themes.xml
+java/android/res/xml/searchable.xml
+java/asap2wav.MF
+java/java.mk
+javascript/USAGE
+javascript/asap2wav1.js
+javascript/asapweb.js
+javascript/javascript.mk
+moc/libasap_decoder.c
+moc/moc.mk
+pokey.ci
+release/release.mk
+sap2ntsc.c
+sap2txt.c
+test/RESULTS.xml
+test/RESULTS.xsl
+test/antic_nmien.asx
+test/antic_nmires.asx
+test/antic_nmist.asx
+test/antic_vblki.asx
+test/antic_vcount.asx
+test/antic_wsync.asx
+test/benchmark/Drunk_Chessboard.sap
+test/benchmark/International_Karate.sap
+test/benchmark/Lasermania.sap
+test/benchmark/Lightness.sap
+test/benchmark/Montezumas_Revenge.sap
+test/benchmark/Overload.sap
+test/benchmark/Tempest_2000_Blue_Level.sap
+test/benchmark/benchmark.mk
+test/benchmark/benchmark.pl
+test/benchmark/gme_benchmark.c
+test/benchmark/sap_benchmark.cpp
+test/cpu_ane.asx
+test/cpu_anx.asx
+test/cpu_decimal.asx
+test/cpu_las.asx
+test/cpu_shx.asx
+test/crashsap.cs
+test/disasm/disasm.mk
+test/formats.asx
+test/gtia_consol.asx
+test/loadsap.cs
+test/pokey_irqst.asx
+test/pokey_pot.asx
+test/pokey_potst.asx
+test/pokey_pure.asx
+test/pokey_random.asx
+test/pokey_timerirq.asx
+test/sapd_player_iflag.asx
+test/test.mk
+test/timevsnative.c
+test/ultrasap.cs
+vlc/libasap_plugin.c
+vlc/vlc.mk
+win32/bass/bass-addon.h
+win32/bass/bass.h
+win32/bass/bass.lib
+win32/bass/bass_asap.c
+win32/diff-sap.js
+win32/foobar2000/foo_asap.cpp
+win32/gui.rc
+win32/info_dlg.c
+win32/info_dlg.h
+win32/rmt/apokeysnd_dll.c
+win32/settings_dlg.c
+win32/settings_dlg.h
+win32/setup/asap-banner.jpg
+win32/setup/asap-dialog.jpg
+win32/setup/asap.wxs
+win32/setup/license.rtf
+win32/setup/wix_mutex.pl
+win32/shellex/ASAPShellEx.cpp
+win32/shellex/ASAPShellEx.propdesc
+win32/wasap/play.ico
+win32/wasap/stop.ico
+win32/wasap/wasap.c
+win32/wasap/wasap.h
+win32/wasap/wasap.ico
+win32/win32.mk
+win32/winamp/in2.h
+win32/winamp/in_asap.c
+win32/winamp/ipc_pe.h
+win32/winamp/out.h
+win32/winamp/wa_ipc.h
+win32/xmplay/xmp-asap.c
+win32/xmplay/xmpfunc.h
+win32/xmplay/xmpin.h
+www/android.xml
+www/contact.xml
+www/index.xml
+www/linux.xml
+www/macos.xml
+www/news.xml
+www/sap-format.xml
+www/web.xml
+www/windows.xml
+www/www.mk
+www/www.xsl
+xmms/libasap-xmms.c
+xmms/libasap-xmms.map
+xmms/xmms.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/moc/libasap_decoder.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/moc/libasap_decoder.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/moc/libasap_decoder.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/moc/libasap_decoder.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,189 @@
+/*
+ * libasap_decoder.c - ASAP plugin for MOC (Music On Console)
+ *
+ * Copyright (C) 2007-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdbool.h>
+
+#include "config.h"
+#include "common.h"
+#include "decoder.h"
+#include "files.h"
+
+#include "asap.h"
+
+#define BITS_PER_SAMPLE      16
+#define DEFAULT_SONG_LENGTH  -1
+
+typedef struct {
+	ASAP *asap;
+	int duration;
+	struct decoder_error error;
+} ASAP_Decoder;
+
+static bool asap_load(ASAP_Decoder *d, const char *filename)
+{
+	d->asap = NULL;
+	decoder_error_init(&d->error);
+	struct io_stream *s = io_open(filename, 0);
+	if (s == NULL) {
+		decoder_error(&d->error, ERROR_FATAL, 0, "Can't open %s", filename);
+		return false;
+	}
+	ssize_t module_len = io_file_size(s);
+	unsigned char *module = (unsigned char *) xmalloc(module_len);
+	module_len = io_read(s, module, module_len);
+	io_close(s);
+
+	d->asap = ASAP_New();
+	if (d->asap == NULL) {
+		decoder_error(&d->error, ERROR_FATAL, 0, "Out of memory");
+		return false;
+	}
+
+	bool ok = ASAP_Load(d->asap, filename, module, module_len);
+	free(module);
+	if (!ok) {
+		decoder_error(&d->error, ERROR_FATAL, 0, "Unsupported file format");
+		return false;
+	}
+	const ASAPInfo *info = ASAP_GetInfo(d->asap);
+	int song = ASAPInfo_GetDefaultSong(info);
+	int duration = ASAPInfo_GetDuration(info, song);
+	if (duration < 0)
+		duration = DEFAULT_SONG_LENGTH * 1000;
+	d->duration = duration;
+	return true;
+}
+
+static void asap_close(void *data)
+{
+	ASAP_Decoder *d = (ASAP_Decoder *) data;
+	ASAP_Delete(d->asap);
+	free(d);
+}
+
+static void *asap_open(const char *uri)
+{
+	ASAP_Decoder *d = (ASAP_Decoder *) xmalloc(sizeof(ASAP_Decoder));
+	if (!asap_load(d, uri) || !ASAP_PlaySong(d->asap, ASAPInfo_GetDefaultSong(ASAP_GetInfo(d->asap)), d->duration)) {
+		asap_close(d);
+		return NULL;
+	}
+	return d;
+}
+
+static int asap_decode(void *data, char *buf, int buf_len, struct sound_params *sound_params)
+{
+	ASAP_Decoder *d = (ASAP_Decoder *) data;
+	sound_params->channels = ASAPInfo_GetChannels(ASAP_GetInfo(d->asap));
+	sound_params->rate = ASAP_SAMPLE_RATE;
+	sound_params->fmt = BITS_PER_SAMPLE == 8 ? SFMT_U8 : (SFMT_S16 | SFMT_LE);
+	return ASAP_Generate(d->asap, (unsigned char *) buf, buf_len, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
+}
+
+static int asap_seek(void *data, int sec)
+{
+	ASAP_Decoder *d = (ASAP_Decoder *) data;
+	ASAP_Seek(d->asap, sec * 1000);
+	return sec;
+}
+
+static void asap_info(const char *file, struct file_tags *tags, const int tags_sel)
+{
+	ASAP_Decoder d;
+	if (asap_load(&d, file)) {
+		if ((tags_sel & TAGS_COMMENTS) != 0) {
+			const ASAPInfo *info = ASAP_GetInfo(d.asap);
+			tags->title = xstrdup(ASAPInfo_GetTitleOrFilename(info));
+			tags->artist = xstrdup(ASAPInfo_GetAuthor(info));
+			tags->filled |= TAGS_COMMENTS;
+		}
+		if ((tags_sel & TAGS_TIME) != 0) {
+			tags->time = d.duration / 1000;
+			tags->filled |= TAGS_TIME;
+		}
+	}
+	ASAP_Delete(d.asap);
+}
+
+static int asap_get_bitrate(void *data)
+{
+	return -1;
+}
+
+static int asap_get_duration(void *data)
+{
+	const ASAP_Decoder *d = (const ASAP_Decoder *) data;
+	return d->duration / 1000;
+}
+
+static void asap_get_error(void *data, struct decoder_error *error)
+{
+	ASAP_Decoder *d = (ASAP_Decoder *) data;
+	decoder_error_copy(error, &d->error);
+}
+
+static int asap_our_format_ext(const char *ext)
+{
+	return ASAPInfo_IsOurExt(ext);
+}
+
+static void asap_get_name(const char *file, char buf[4])
+{
+	const char *ext = ext_pos(file);
+	int i = 0;
+	while (ext[i] != '\0' && i < 3) {
+		int c = ext[i];
+		if (c >= 'a' && c <= 'z')
+			c += 'A' - 'a';
+		buf[i++] = c;
+	}
+	buf[i] = '\0';
+}
+
+struct decoder *plugin_init()
+{
+	static struct decoder asap_decoder = {
+		DECODER_API_VERSION,
+		NULL,
+		NULL,
+		asap_open,
+		NULL,
+		NULL,
+		asap_close,
+		asap_decode,
+		asap_seek,
+		asap_info,
+		asap_get_bitrate,
+		asap_get_duration,
+		asap_get_error,
+		asap_our_format_ext,
+		NULL,
+		asap_get_name,
+		NULL,
+		NULL
+#if DECODER_API_VERSION >= 7
+		, NULL
+#endif
+	};
+	return &asap_decoder;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/moc/moc.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/moc/moc.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/moc/moc.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/moc/moc.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,23 @@
+MOC_INCLUDE = ../moc-2.5.0
+MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "moc.mk")
+endif
+
+asap-moc: libasap_decoder.so
+.PHONY: asap-moc
+
+libasap_decoder.so: $(call src,moc/libasap_decoder.c asap.[ch])
+	$(DO_CC) -I$(MOC_INCLUDE)
+CLEAN += libasap_decoder.so
+
+install-moc: libasap_decoder.so
+	$(call INSTALL_PROGRAM,libasap_decoder.so,$(MOC_PLUGIN_DIR))
+.PHONY: install-moc
+
+uninstall-moc:
+	$(RM) $(DESTDIR)$(MOC_PLUGIN_DIR)/libasap_decoder.so
+.PHONY: uninstall-moc
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/pokey.ci kodi-audiodecoder-asap-3.0.1/lib/asap-code/pokey.ci
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/pokey.ci	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/pokey.ci	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,702 @@
+// pokey.ci - POKEY chip emulator
+//
+// Copyright (C) 2010-2019  Piotr Fusik
+//
+// This file is part of ASAP (Another Slight Atari Player),
+// see http://asap.sourceforge.net
+//
+// ASAP is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published
+// by the Free Software Foundation; either version 2 of the License,
+// or (at your option) any later version.
+//
+// ASAP is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ASAP; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/// Format of output samples.
+public enum ASAPSampleFormat
+{
+	/// Unsigned 8-bit.
+	U8,
+	/// Signed 16-bit little-endian.
+	S16LE,
+	/// Signed 16-bit big-endian.
+	S16BE
+}
+
+class PokeyChannel
+{
+	internal int Audf;
+	internal int Audc;
+	internal int PeriodCycles;
+	internal int TickCycle;
+	internal int TimerCycle;
+
+	// Is channel muted?
+	const int MuteFrequency = 1;
+	const int MuteInit = 2;
+	const int MuteUser = 4;
+	const int MuteSerialInput = 8;
+	internal int Mute;
+
+	int Out;
+	internal int Delta;
+
+	internal void Initialize!()
+	{
+		Audf = 0;
+		Audc = 0;
+		PeriodCycles = 28;
+		TickCycle = Pokey.NeverCycle;
+		TimerCycle = Pokey.NeverCycle;
+		Mute = MuteFrequency;
+		Out = 0;
+		Delta = 0;
+	}
+
+	internal void Slope!(Pokey! pokey, PokeyPair pokeys, int cycle)
+	{
+		Delta = -Delta;
+		pokey.AddDelta(pokeys, cycle, Delta);
+	}
+
+	internal void DoTick!(Pokey! pokey, PokeyPair pokeys, int cycle, int ch)
+	{
+		TickCycle += PeriodCycles;
+		int audc = Audc;
+		if ((audc & 0xb0) == 0xa0)
+			Out ^= 1;
+		else if ((audc & 0x10) != 0 || pokey.Init)
+			return;
+		else {
+			int poly = cycle + pokey.PolyIndex - ch;
+			if (audc < 0x80 && (0x65bd44e0 & 1 << (poly % 31)) == 0) // 0000011100100010101111011010011
+				return;
+			if ((audc & 0x20) != 0)
+				Out ^= 1;
+			else {
+				int newOut;
+				if ((audc & 0x40) != 0)
+					newOut = 0x5370 >> (poly % 15); // 000011101100101
+				else if (pokey.Audctl < 0x80) {
+					poly %= 131071;
+					newOut = pokeys.Poly17Lookup[poly >> 3] >> (poly & 7);
+				}
+				else
+					newOut = pokeys.Poly9Lookup[poly % 511];
+				newOut &= 1;
+				if (Out == newOut)
+					return;
+				Out = newOut;
+			}
+		}
+		Slope(pokey, pokeys, cycle);
+	}
+
+	internal void DoStimer!(int cycle)
+	{
+		if (TickCycle != Pokey.NeverCycle)
+			TickCycle = cycle + PeriodCycles;
+	}
+
+	internal void SetMute!(bool enable, int mask, int cycle)
+	{
+		if (enable) {
+			Mute |= mask;
+			TickCycle = Pokey.NeverCycle;
+		}
+		else {
+			Mute &= ~mask;
+			if (Mute == 0 && TickCycle == Pokey.NeverCycle)
+				TickCycle = cycle;
+		}
+	}
+
+	internal void MuteUltrasound!(int cycle)
+	{
+		const int UltrasoundCycles = 112;
+		SetMute(PeriodCycles <= UltrasoundCycles && (Audc & 0xb0) == 0xa0, MuteFrequency, cycle);
+	}
+
+	internal void SetAudc!(Pokey! pokey, PokeyPair pokeys, int data, int cycle)
+	{
+		if (Audc == data)
+			return;
+		pokey.GenerateUntilCycle(pokeys, cycle);
+		Audc = data;
+		const int DeltaShiftPOKEY = 20;
+		if ((data & 0x10) != 0) {
+			data = (data & 0xf) << DeltaShiftPOKEY;
+			if ((Mute & MuteUser) == 0)
+				pokey.AddDelta(pokeys, cycle, Delta > 0 ? data - Delta : data);
+			Delta = data;
+		}
+		else {
+			data = (data & 0xf) << DeltaShiftPOKEY;
+			MuteUltrasound(cycle);
+			if (Delta > 0) {
+				if ((Mute & MuteUser) == 0)
+					pokey.AddDelta(pokeys, cycle, data - Delta);
+				Delta = data;
+			}
+			else
+				Delta = -data;
+		}
+	}
+
+	internal void EndFrame!(int cycle)
+	{
+		if (TimerCycle != Pokey.NeverCycle)
+			TimerCycle -= cycle;
+	}
+}
+
+class Pokey
+{
+	internal PokeyChannel()[4] Channels;
+	internal int Audctl;
+	int Skctl;
+	internal int Irqst;
+	internal bool Init;
+	int DivCycles;
+	int ReloadCycles1;
+	int ReloadCycles3;
+	internal int PolyIndex;
+	const int NeverCycle = 0x800000;
+
+	// Sample rates from 32000 to 50000 should be fine,
+	// but weren't tested - please report your experience.
+	// For lower rates, you'll need to add a low-pass filter.
+	// The DC filter in PokeyPair.Generate should also be adjusted
+	// whenever the sample rate considerably differs from 44100.
+	const int SampleRate = 44100;
+	// Enough for one PAL frame == 312 * 114 cycles + some margin,
+	// as we emulate whole 6502 instructions and interpolate samples.
+	int[SampleRate * 312 * 114 / 1773447 + 4] DeltaBuffer;
+
+	int IirAcc;
+
+	internal void StartFrame!()
+	{
+		DeltaBuffer.Fill(0);
+	}
+
+	internal void Initialize!()
+	{
+		for (int i = 0; i < 4; i++)
+			Channels[i].Initialize();
+		Audctl = 0;
+		Skctl = 3;
+		Irqst = 0xff;
+		Init = false;
+		DivCycles = 28;
+		ReloadCycles1 = 28;
+		ReloadCycles3 = 28;
+		PolyIndex = 15 * 31 * 131071;
+		IirAcc = 0;
+		StartFrame();
+	}
+
+	internal void AddDelta!(PokeyPair pokeys, int cycle, int delta)
+	{
+		int i = cycle * pokeys.SampleFactor + pokeys.SampleOffset;
+		// too large value reduces the resolution of delta (if bigger than DeltaShiftCOVOX, DeltaShiftPOKEY)
+		// too small value reduces the resolution of interpolation
+		const int interpolationShift = 16;
+		int delta2 = (delta >> interpolationShift) * (i >> (PokeyPair.SampleFactorShift - interpolationShift) & ((1 << interpolationShift) - 1));
+		i >>= PokeyPair.SampleFactorShift;
+		DeltaBuffer[i] += delta - delta2;
+		DeltaBuffer[i + 1] += delta2;
+	}
+
+	/// Fills `DeltaBuffer` up to `cycleLimit` basing on current Audf/Audc/Audctl values.
+	internal void GenerateUntilCycle!(PokeyPair pokeys, int cycleLimit)
+	{
+		for (;;) {
+			int cycle = cycleLimit;
+			for (int i = 0; i < 4; i++) {
+				int tickCycle = Channels[i].TickCycle;
+				if (cycle > tickCycle)
+					cycle = tickCycle;
+			}
+			if (cycle == cycleLimit)
+				break;
+
+			if (cycle == Channels[2].TickCycle) {
+				if ((Audctl & 4) != 0 && Channels[0].Delta > 0 && Channels[0].Mute == 0)
+					Channels[0].Slope(this, pokeys, cycle);
+				Channels[2].DoTick(this, pokeys, cycle, 2);
+			}
+			if (cycle == Channels[3].TickCycle) {
+				if ((Audctl & 8) != 0)
+					Channels[2].TickCycle = cycle + ReloadCycles3;
+				if ((Audctl & 2) != 0 && Channels[1].Delta > 0 && Channels[1].Mute == 0)
+					Channels[1].Slope(this, pokeys, cycle);
+				Channels[3].DoTick(this, pokeys, cycle, 3);
+			}
+			if (cycle == Channels[0].TickCycle) {
+				if ((Skctl & 0x88) == 8) // two-tone, sending 1 (i.e. timer1)
+					Channels[1].TickCycle = cycle + Channels[1].PeriodCycles;
+				Channels[0].DoTick(this, pokeys, cycle, 0);
+			}
+			if (cycle == Channels[1].TickCycle) {
+				if ((Audctl & 0x10) != 0)
+					Channels[0].TickCycle = cycle + ReloadCycles1;
+				else if ((Skctl & 8) != 0) // two-tone
+					Channels[0].TickCycle = cycle + Channels[0].PeriodCycles;
+				Channels[1].DoTick(this, pokeys, cycle, 1);
+			}
+		}
+	}
+
+	internal void EndFrame!(PokeyPair pokeys, int cycle)
+	{
+		GenerateUntilCycle(pokeys, cycle);
+		PolyIndex += cycle;
+		int m = (Audctl & 0x80) != 0 ? 15 * 31 * 511 : 15 * 31 * 131071;
+		if (PolyIndex >= 2 * m)
+			PolyIndex -= m;
+		for (int i = 0; i < 4; i++) {
+			int tickCycle = Channels[i].TickCycle;
+			if (tickCycle != NeverCycle)
+				Channels[i].TickCycle = tickCycle - cycle;
+		}
+	}
+
+	internal bool IsSilent()
+	{
+		for (int i = 0; i < 4; i++)
+			if ((Channels[i].Audc & 0xf) != 0)
+				return false;
+		return true;
+	}
+
+	internal void Mute!(int mask)
+	{
+		for (int i = 0; i < 4; i++)
+			Channels[i].SetMute((mask & (1 << i)) != 0, PokeyChannel.MuteUser, 0);
+	}
+
+	void InitMute!(int cycle)
+	{
+		bool init = Init;
+		int audctl = Audctl;
+		Channels[0].SetMute(init && (audctl & 0x40) == 0, PokeyChannel.MuteInit, cycle);
+		Channels[1].SetMute(init && (audctl & 0x50) != 0x50, PokeyChannel.MuteInit, cycle);
+		Channels[2].SetMute(init && (audctl & 0x20) == 0, PokeyChannel.MuteInit, cycle);
+		Channels[3].SetMute(init && (audctl & 0x28) != 0x28, PokeyChannel.MuteInit, cycle);
+	}
+
+	internal int Poke!(PokeyPair pokeys, int addr, int data, int cycle)
+	{
+		int nextEventCycle = NeverCycle;
+		switch (addr & 0xf) {
+		case 0x00:
+			if (data == Channels[0].Audf)
+				break;
+			GenerateUntilCycle(pokeys, cycle);
+			Channels[0].Audf = data;
+			switch (Audctl & 0x50) {
+			case 0x00:
+				Channels[0].PeriodCycles = DivCycles * (data + 1);
+				break;
+			case 0x10:
+				Channels[1].PeriodCycles = DivCycles * (data + (Channels[1].Audf << 8) + 1);
+				ReloadCycles1 = DivCycles * (data + 1);
+				Channels[1].MuteUltrasound(cycle);
+				break;
+			case 0x40:
+				Channels[0].PeriodCycles = data + 4;
+				break;
+			case 0x50:
+				Channels[1].PeriodCycles = data + (Channels[1].Audf << 8) + 7;
+				ReloadCycles1 = data + 4;
+				Channels[1].MuteUltrasound(cycle);
+				break;
+			}
+			Channels[0].MuteUltrasound(cycle);
+			break;
+		case 0x01:
+			Channels[0].SetAudc(this, pokeys, data, cycle);
+			break;
+		case 0x02:
+			if (data == Channels[1].Audf)
+				break;
+			GenerateUntilCycle(pokeys, cycle);
+			Channels[1].Audf = data;
+			switch (Audctl & 0x50) {
+			case 0x00:
+			case 0x40:
+				Channels[1].PeriodCycles = DivCycles * (data + 1);
+				break;
+			case 0x10:
+				Channels[1].PeriodCycles = DivCycles * (Channels[0].Audf + (data << 8) + 1);
+				break;
+			case 0x50:
+				Channels[1].PeriodCycles = Channels[0].Audf + (data << 8) + 7;
+				break;
+			}
+			Channels[1].MuteUltrasound(cycle);
+			break;
+		case 0x03:
+			Channels[1].SetAudc(this, pokeys, data, cycle);
+			break;
+		case 0x04:
+			if (data == Channels[2].Audf)
+				break;
+			GenerateUntilCycle(pokeys, cycle);
+			Channels[2].Audf = data;
+			switch (Audctl & 0x28) {
+			case 0x00:
+				Channels[2].PeriodCycles = DivCycles * (data + 1);
+				break;
+			case 0x08:
+				Channels[3].PeriodCycles = DivCycles * (data + (Channels[3].Audf << 8) + 1);
+				ReloadCycles3 = DivCycles * (data + 1);
+				Channels[3].MuteUltrasound(cycle);
+				break;
+			case 0x20:
+				Channels[2].PeriodCycles = data + 4;
+				break;
+			case 0x28:
+				Channels[3].PeriodCycles = data + (Channels[3].Audf << 8) + 7;
+				ReloadCycles3 = data + 4;
+				Channels[3].MuteUltrasound(cycle);
+				break;
+			}
+			Channels[2].MuteUltrasound(cycle);
+			break;
+		case 0x05:
+			Channels[2].SetAudc(this, pokeys, data, cycle);
+			break;
+		case 0x06:
+			if (data == Channels[3].Audf)
+				break;
+			GenerateUntilCycle(pokeys, cycle);
+			Channels[3].Audf = data;
+			switch (Audctl & 0x28) {
+			case 0x00:
+			case 0x20:
+				Channels[3].PeriodCycles = DivCycles * (data + 1);
+				break;
+			case 0x08:
+				Channels[3].PeriodCycles = DivCycles * (Channels[2].Audf + (data << 8) + 1);
+				break;
+			case 0x28:
+				Channels[3].PeriodCycles = Channels[2].Audf + (data << 8) + 7;
+				break;
+			}
+			Channels[3].MuteUltrasound(cycle);
+			break;
+		case 0x07:
+			Channels[3].SetAudc(this, pokeys, data, cycle);
+			break;
+		case 0x08:
+			if (data == Audctl)
+				break;
+			GenerateUntilCycle(pokeys, cycle);
+			Audctl = data;
+			DivCycles = (data & 1) != 0 ? 114 : 28;
+			// TODO: TickCycles
+			switch (data & 0x50) {
+			case 0x00:
+				Channels[0].PeriodCycles = DivCycles * (Channels[0].Audf + 1);
+				Channels[1].PeriodCycles = DivCycles * (Channels[1].Audf + 1);
+				break;
+			case 0x10:
+				Channels[0].PeriodCycles = DivCycles << 8;
+				Channels[1].PeriodCycles = DivCycles * (Channels[0].Audf + (Channels[1].Audf << 8) + 1);
+				ReloadCycles1 = DivCycles * (Channels[0].Audf + 1);
+				break;
+			case 0x40:
+				Channels[0].PeriodCycles = Channels[0].Audf + 4;
+				Channels[1].PeriodCycles = DivCycles * (Channels[1].Audf + 1);
+				break;
+			case 0x50:
+				Channels[0].PeriodCycles = 256;
+				Channels[1].PeriodCycles = Channels[0].Audf + (Channels[1].Audf << 8) + 7;
+				ReloadCycles1 = Channels[0].Audf + 4;
+				break;
+			}
+			Channels[0].MuteUltrasound(cycle);
+			Channels[1].MuteUltrasound(cycle);
+			switch (data & 0x28) {
+			case 0x00:
+				Channels[2].PeriodCycles = DivCycles * (Channels[2].Audf + 1);
+				Channels[3].PeriodCycles = DivCycles * (Channels[3].Audf + 1);
+				break;
+			case 0x08:
+				Channels[2].PeriodCycles = DivCycles << 8;
+				Channels[3].PeriodCycles = DivCycles * (Channels[2].Audf + (Channels[3].Audf << 8) + 1);
+				ReloadCycles3 = DivCycles * (Channels[2].Audf + 1);
+				break;
+			case 0x20:
+				Channels[2].PeriodCycles = Channels[2].Audf + 4;
+				Channels[3].PeriodCycles = DivCycles * (Channels[3].Audf + 1);
+				break;
+			case 0x28:
+				Channels[2].PeriodCycles = 256;
+				Channels[3].PeriodCycles = Channels[2].Audf + (Channels[3].Audf << 8) + 7;
+				ReloadCycles3 = Channels[2].Audf + 4;
+				break;
+			}
+			Channels[2].MuteUltrasound(cycle);
+			Channels[3].MuteUltrasound(cycle);
+			InitMute(cycle);
+			break;
+		case 0x09:
+			// TODO: ReloadCycles, Out
+			for (int i = 0; i < 4; i++)
+				Channels[i].DoStimer(cycle);
+			break;
+		case 0x0e:
+			Irqst |= data ^ 0xff;
+			for (int i = 3; ; i >>= 1) {
+				if ((data & Irqst & i + 1) != 0) {
+					if (Channels[i].TimerCycle == NeverCycle) {
+						int t = Channels[i].TickCycle;
+						while (t < cycle)
+							t += Channels[i].PeriodCycles;
+						Channels[i].TimerCycle = t;
+						if (nextEventCycle > t)
+							nextEventCycle = t;
+					}
+				}
+				else
+					Channels[i].TimerCycle = NeverCycle;
+				if (i == 0)
+					break;
+			}
+			break;
+		case 0x0f:
+			if (data == Skctl)
+				break;
+			GenerateUntilCycle(pokeys, cycle);
+			Skctl = data;
+			bool init = (data & 3) == 0;
+			if (Init && !init)
+				PolyIndex = ((Audctl & 0x80) != 0 ? 15 * 31 * 511 - 1 : 15 * 31 * 131071 - 1) - cycle;
+			Init = init;
+			InitMute(cycle);
+			Channels[2].SetMute((data & 0x10) != 0, PokeyChannel.MuteSerialInput, cycle);
+			Channels[3].SetMute((data & 0x10) != 0, PokeyChannel.MuteSerialInput, cycle);
+			break;
+		default:
+			break;
+		}
+		return nextEventCycle;
+	}
+
+	internal int CheckIrq!(int cycle, int nextEventCycle)
+	{
+		for (int i = 3; ; i >>= 1) {
+			int timerCycle = Channels[i].TimerCycle;
+			if (cycle >= timerCycle) {
+				Irqst &= ~(i + 1);
+				Channels[i].TimerCycle = NeverCycle;
+			}
+			else if (nextEventCycle > timerCycle)
+				nextEventCycle = timerCycle;
+			if (i == 0)
+				break;
+		}
+		return nextEventCycle;
+	}
+
+	internal int StoreSample!(byte[]! buffer, int bufferOffset, int i, ASAPSampleFormat format)
+	{
+		IirAcc += DeltaBuffer[i] - (IirAcc * 3 >> 10);
+		int sample = IirAcc >> 11;
+		if (sample < -32767)
+			sample = -32767;
+		else if (sample > 32767)
+			sample = 32767;
+		switch (format) {
+		case ASAPSampleFormat.U8:
+			buffer[bufferOffset++] = (sample >> 8) + 128;
+			break;
+		case ASAPSampleFormat.S16LE:
+			buffer[bufferOffset++] = sample & 0xff;
+			buffer[bufferOffset++] = sample >> 8 & 0xff;
+			break;
+		case ASAPSampleFormat.S16BE:
+			buffer[bufferOffset++] = sample >> 8 & 0xff;
+			buffer[bufferOffset++] = sample & 0xff;
+			break;
+		}
+		return bufferOffset;
+	}
+
+	internal void AccumulateTrailing!(int i)
+	{
+		IirAcc += DeltaBuffer[i] + DeltaBuffer[i + 1];
+	}
+}
+
+#if APOKEYSND
+public
+#endif
+class PokeyPair
+{
+	internal byte[511] Poly9Lookup;
+	internal byte[16385] Poly17Lookup;
+	int ExtraPokeyMask;
+	internal Pokey() BasePokey;
+	internal Pokey() ExtraPokey;
+
+	// DeltaBuffer.Length << SampleFactorShift shouldn't overflow int.
+	// SampleFactorShift could be 21, but that wouldn't improve
+	// accuracy because SampleFactor would be even.
+	const int SampleFactorShift = 20;
+	internal int SampleFactor;
+	internal int SampleOffset;
+
+	internal int ReadySamplesStart;
+	internal int ReadySamplesEnd;
+
+#if APOKEYSND
+	public
+#endif
+	PokeyPair()
+	{
+		int reg = 0x1ff;
+		for (int i = 0; i < 511; i++) {
+			reg = (((reg >> 5 ^ reg) & 1) << 8) + (reg >> 1);
+			Poly9Lookup[i] = reg & 0xff;
+		}
+		reg = 0x1ffff;
+		for (int i = 0; i < 16385; i++) {
+			reg = (((reg >> 5 ^ reg) & 0xff) << 9) + (reg >> 8);
+			Poly17Lookup[i] = reg >> 1 & 0xff;
+		}
+	}
+
+	// What we really need here is:
+	// return ((Pokey.SampleRate << SampleFactorShift) + (clock >> 1)) / clock;
+	// unfortunately cito provides only 32-bit arithmetic for the moment,
+	// so I shift by 5 to avoid overflow.
+	static int GetSampleFactor(int clock)
+		=> ((Pokey.SampleRate << SampleFactorShift - 5) + (clock >> 6)) / (clock >> 5);
+
+#if APOKEYSND
+	public
+#else
+	internal
+#endif
+	void Initialize!(bool ntsc, bool stereo)
+	{
+		ExtraPokeyMask = stereo ? 0x10 : 0;
+		BasePokey.Initialize();
+		ExtraPokey.Initialize();
+		SampleFactor = ntsc ? GetSampleFactor(1789772) : GetSampleFactor(1773447);
+		SampleOffset = 0;
+		ReadySamplesStart = 0;
+		ReadySamplesEnd = 0;
+	}
+
+#if APOKEYSND
+	public
+#else
+	internal
+#endif
+	int Poke!(int addr, int data, int cycle)
+	{
+		Pokey! pokey = (addr & ExtraPokeyMask) != 0 ? ExtraPokey : BasePokey;
+		return pokey.Poke(this, addr, data, cycle);
+	}
+
+#if APOKEYSND
+	public
+#else
+	internal
+#endif
+	int Peek(int addr, int cycle)
+	{
+		Pokey pokey = (addr & ExtraPokeyMask) != 0 ? ExtraPokey : BasePokey;
+		switch (addr & 0xf) {
+		case 0x0a:
+			if (pokey.Init)
+				return 0xff;
+			int i = cycle + pokey.PolyIndex;
+			if ((pokey.Audctl & 0x80) != 0)
+				return Poly9Lookup[i % 511];
+			i %= 131071;
+			int j = i >> 3;
+			i &= 7;
+			return ((Poly17Lookup[j] >> i) + (Poly17Lookup[j + 1] << (8 - i))) & 0xff;
+		case 0x0e:
+			return pokey.Irqst;
+		default:
+			return 0xff;
+		}
+	}
+
+#if APOKEYSND
+	public
+#else
+	internal
+#endif
+	void StartFrame!()
+	{
+		BasePokey.StartFrame();
+		if (ExtraPokeyMask != 0)
+			ExtraPokey.StartFrame();
+	}
+
+#if APOKEYSND
+	public
+#else
+	internal
+#endif
+	int EndFrame!(int cycle)
+	{
+		BasePokey.EndFrame(this, cycle);
+		if (ExtraPokeyMask != 0)
+			ExtraPokey.EndFrame(this, cycle);
+		SampleOffset += cycle * SampleFactor;
+		ReadySamplesStart = 0;
+		ReadySamplesEnd = SampleOffset >> SampleFactorShift;
+		SampleOffset &= (1 << SampleFactorShift) - 1;
+		return ReadySamplesEnd;
+	}
+
+	/// Fills buffer with samples from `DeltaBuffer`.
+#if APOKEYSND
+	public
+#else
+	internal
+#endif
+	int Generate!(byte[]! buffer, int bufferOffset, int blocks, ASAPSampleFormat format)
+	{
+		int i = ReadySamplesStart;
+		int samplesEnd = ReadySamplesEnd;
+		if (blocks < samplesEnd - i)
+			samplesEnd = i + blocks;
+		else
+			blocks = samplesEnd - i;
+		for (; i < samplesEnd; i++) {
+			bufferOffset = BasePokey.StoreSample(buffer, bufferOffset, i, format);
+			if (ExtraPokeyMask != 0)
+				bufferOffset = ExtraPokey.StoreSample(buffer, bufferOffset, i, format);
+		}
+		if (i == ReadySamplesEnd) {
+			BasePokey.AccumulateTrailing(i);
+			ExtraPokey.AccumulateTrailing(i);
+		}
+		ReadySamplesStart = i;
+#if APOKEYSND
+		return bufferOffset;
+#else
+		return blocks;
+#endif
+	}
+
+	internal bool IsSilent()
+		=> BasePokey.IsSilent() && ExtraPokey.IsSilent();
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/PORTS.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/PORTS.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/PORTS.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/PORTS.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,586 @@
+<?xml-stylesheet type="text/xsl" href="PORTS.xsl" ?>
+<ports>
+	<port name="WASAP">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>GUI</interface>
+		<since>0.1.0</since>
+		<status>stable</status>
+		<output>16-bit, sound or WAV file</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>yes</edit-info>
+		<convert-sap>yes</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>yes</stil>
+		<lang>C</lang>
+	</port>
+	<port name="Winamp plugin">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>player plugin</interface>
+		<since>0.1.0</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>yes</edit-info>
+		<convert-sap>yes</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>yes</stil>
+		<comment class="good">Plays from ATR disk images</comment>
+		<lang>C</lang>
+		<a href="http://www.winamp.com/">Winamp</a>
+	</port>
+	<port name="XMMS plugin">
+		<bin>Linux</bin>
+		<platform>Linux</platform>
+		<interface>player plugin</interface>
+		<since>0.2.0</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>no</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://www.xmms.org/">XMMS</a>
+	</port>
+	<port name="foobar2000 plugin">
+		<bin>Windows, foo_asap</bin>
+		<platform>Windows</platform>
+		<interface>player plugin</interface>
+		<since>0.2.0</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>yes</edit-info>
+		<convert-sap>yes</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>yes</stil>
+		<comment class="good">Plays all foobar2000-supported formats from ATR disk images</comment>
+		<lang>C, C++</lang>
+		<a href="http://www.foobar2000.org/">foobar2000</a>
+	</port>
+	<port name="MOC plugin">
+		<bin></bin>
+		<platform>Linux</platform>
+		<interface>player plugin</interface>
+		<since>1.0.1</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>no</subsongs>
+		<file-info>AUTHOR, NAME</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://moc.daper.net/">MOC</a>
+	</port>
+	<port name="POKEY DLL for RMT">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>composer plugin</interface>
+		<since>1.2.1</since>
+		<status>stable</status>
+		<output>8 or 16-bit sound</output>
+		<subsongs>N/A</subsongs>
+		<file-info>N/A</file-info>
+		<edit-info>N/A</edit-info>
+		<convert-sap>N/A</convert-sap>
+		<config-time>N/A</config-time>
+		<mute-pokey>N/A</mute-pokey>
+		<stil>N/A</stil>
+		<lang>C</lang>
+		<a href="http://raster.infos.cz/atari/rmt/rmt.htm">Raster Music Tracker</a>
+	</port>
+	<port name="Browser JavaScript player">
+		<bin>Web</bin>
+		<platform>web browsers</platform>
+		<interface>via JavaScript</interface>
+		<since>2.0.0</since>
+		<status>stable</status>
+		<output>floating-point sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>JavaScript</lang>
+		<a href="http://asap.sourceforge.net/web.html">online demo</a>
+	</port>
+	<port name="asapconv">
+		<bin>Windows, Linux</bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>2.1.0</since>
+		<status>stable</status>
+		<output>8 or 16-bit, WAV, raw or MP3, file or stdout</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>yes, multi-file</edit-info>
+		<convert-sap>yes, multi-file</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+	</port>
+	<port name="XMPlay plugin">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>player plugin</interface>
+		<since>2.1.0</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>yes</edit-info>
+		<convert-sap>yes</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>yes</stil>
+		<comment class="good">Displays RMT instrument names</comment>
+		<lang>C</lang>
+		<a href="http://www.un4seen.com/xmplay.html">XMPlay</a>
+	</port>
+	<port name="BASS add-on">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>library add-on</interface>
+		<since>2.1.1</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>no</subsongs>
+		<file-info>AUTHOR, NAME, DATE (year)</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://www.un4seen.com/bass.html">BASS</a>
+	</port>
+	<port name="Windows Explorer extension">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>Windows Explorer</interface>
+		<since>2.1.1</since>
+		<status>stable</status>
+		<output>N/A</output>
+		<subsongs>N/A</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>only on Windows Vista and newer: AUTHOR, NAME, DATE (year), multi-file</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>N/A</config-time>
+		<mute-pokey>N/A</mute-pokey>
+		<stil>no</stil>
+		<lang>C, C++</lang>
+	</port>
+	<port name="AndroidASAP">
+		<bin>Android</bin>
+		<platform>Android</platform>
+		<interface>GUI</interface>
+		<since>2.1.2</since>
+		<status>in develop&#173;ment</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<comment class="good">Plays from ZIP archives, M3U playlists and ATR disk images</comment>
+		<lang>Java</lang>
+	</port>
+	<port name="VLC plugin">
+		<bin>Windows, macOS, Linux</bin>
+		<platform>Windows, macOS, Linux</platform>
+		<interface>player plugin</interface>
+		<since>3.1.2</since>
+		<status>stable</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<comment class="bad">SAP, FC, RMT formats only</comment>
+		<lang>C</lang>
+		<a href="http://www.videolan.org/vlc/">VLC</a>
+	</port>
+	<port name="GSPlayer">
+		<bin></bin>
+		<platform>Windows CE, Windows</platform>
+		<interface>player plugin</interface>
+		<since>0.3.0</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>no</subsongs>
+		<file-info>AUTHOR, NAME</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://hp.vector.co.jp/authors/VA032810/">GSPlayer</a>
+	</port>
+	<port name="Java applet">
+		<bin></bin>
+		<platform>web browser</platform>
+		<interface>via HTML or JavaScript</interface>
+		<since>1.0.0</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>Java</lang>
+	</port>
+	<port name="Java midlet">
+		<bin></bin>
+		<platform>mobile devices</platform>
+		<interface>GUI</interface>
+		<since>1.0.0</since>
+		<status>discontinued</status>
+		<output>8-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>Java</lang>
+	</port>
+	<port name="Windows Media Player plugin">
+		<bin></bin>
+		<platform>Windows, Windows CE</platform>
+		<interface>player plugin</interface>
+		<since>1.2.0</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>experi&#173;mental</subsongs>
+		<file-info>AUTHOR, NAME (experi&#173;mental)</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<comment class="partial">No subsongs or file infor&#173;mation in the standard Windows Media Player</comment>
+		<lang>C, C++</lang>
+		<a href="http://www.microsoft.com/windows/windowsmedia/player/">Windows Media Player</a>
+	</port>
+	<port name="Apollo plugin">
+		<bin>Windows</bin>
+		<platform>Windows</platform>
+		<interface>player plugin</interface>
+		<since>1.2.0</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>no</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>yes</edit-info>
+		<convert-sap>yes</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>yes</stil>
+		<lang>C, C++</lang>
+		<a href="http://koti.welho.com/hylinen/apollo/">Apollo</a>
+	</port>
+	<port name="XBMC plugin">
+		<bin></bin>
+		<platform>Windows, Linux</platform>
+		<interface>player plugin</interface>
+		<since>1.2.1</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://xbmc.org/">XBMC</a>
+	</port>
+	<port name="Flash player">
+		<bin></bin>
+		<platform>Flash Player</platform>
+		<interface>via HTML or JavaScript</interface>
+		<since>2.0.0</since>
+		<status>discontinued</status>
+		<output>32-bit floating-point sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>Action&#173;Script 3</lang>
+	</port>
+	<port name="SilverASAP">
+		<bin></bin>
+		<platform>Silverlight</platform>
+		<interface>via HTML or JavaScript</interface>
+		<since>2.1.2</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C#</lang>
+	</port>
+	<port name="Audacious plugin">
+		<bin></bin>
+		<platform>Linux, Windows</platform>
+		<interface>player plugin</interface>
+		<since>2.1.2</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>AUTHOR, NAME, DATE (year)</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://audacious-media-player.org/">Audacious</a>
+	</port>
+	<port name="WASAP (Windows CE)">
+		<bin></bin>
+		<platform>Windows CE</platform>
+		<interface>GUI</interface>
+		<since>2.1.2</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+	</port>
+	<port name="AIRASAP">
+		<bin></bin>
+		<platform>Adobe AIR</platform>
+		<interface>GUI</interface>
+		<since>3.0.0</since>
+		<status>discontinued</status>
+		<output>32-bit floating-point sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>JavaScript</lang>
+	</port>
+	<port name="ASAP2WAV (D)">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>3.0.0</since>
+		<status>discontinued</status>
+		<output>8 or 16-bit, WAV or raw file</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>D</lang>
+	</port>
+	<port name="asapplay (D)">
+		<bin></bin>
+		<platform>Windows, Linux</platform>
+		<interface>command line</interface>
+		<since>3.0.0</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>AUTHOR, NAME, TIME</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>D</lang>
+	</port>
+	<port name="GStreamer plugin">
+		<bin></bin>
+		<platform>Linux, Windows</platform>
+		<interface>library plugin</interface>
+		<since>3.0.1</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<comment class="bad">SAP format only</comment>
+		<lang>C</lang>
+		<a href="http://gstreamer.freedesktop.org/">GStreamer</a>
+	</port>
+	<port name="MetroASAP">
+		<bin></bin>
+		<platform>Windows 8</platform>
+		<interface>Metro</interface>
+		<since>3.1.3</since>
+		<status>discontinued</status>
+		<output>16-bit sound</output>
+		<subsongs>no</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C#</lang>
+	</port>
+	<port name="ASAP2WAV (Perl)">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>3.1.4</since>
+		<status>discontinued</status>
+		<output>8 or 16-bit, WAV or raw file</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>Perl</lang>
+	</port>
+	<port name="ASAP2WAV (Java)">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>1.0.0</since>
+		<status>sample</status>
+		<output>8 or 16-bit, WAV or raw, file or stdout</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>Java</lang>
+	</port>
+	<port name="ASAP2WAV (C#)">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>1.2.0</since>
+		<status>sample</status>
+		<output>8 or 16-bit, WAV or raw file</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>C#</lang>
+	</port>
+	<port name="ASAP2WAV (JavaScript)">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>2.0.0</since>
+		<status>sample</status>
+		<output>8 or 16-bit, WAV or raw file</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>JavaScript</lang>
+	</port>
+	<port name="asapplay (C#)">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>2.1.1</since>
+		<status>sample</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C#</lang>
+	</port>
+	<port name="asap-sdl">
+		<bin></bin>
+		<platform>desktop operating systems</platform>
+		<interface>command line</interface>
+		<since>2.1.2</since>
+		<status>sample</status>
+		<output>16-bit sound</output>
+		<subsongs>yes</subsongs>
+		<file-info>yes</file-info>
+		<edit-info>no</edit-info>
+		<convert-sap>no</convert-sap>
+		<config-time>no</config-time>
+		<mute-pokey>no</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+		<a href="http://www.libsdl.org/">SDL</a>
+	</port>
+	<port name="asapconv (Android)">
+		<bin></bin>
+		<platform>Android</platform>
+		<interface>command line</interface>
+		<since>3.1.5</since>
+		<status>sample</status>
+		<output>8 or 16-bit, WAV or raw, file or stdout</output>
+		<subsongs>yes</subsongs>
+		<file-info>no</file-info>
+		<edit-info>yes, multi-file</edit-info>
+		<convert-sap>yes, multi-file</convert-sap>
+		<config-time>yes</config-time>
+		<mute-pokey>yes</mute-pokey>
+		<stil>no</stil>
+		<lang>C</lang>
+	</port>
+</ports>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/PORTS.xsl kodi-audiodecoder-asap-3.0.1/lib/asap-code/PORTS.xsl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/PORTS.xsl	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/PORTS.xsl	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,102 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="html" />
+
+	<xsl:template match="/ports">
+		<html>
+			<head>
+				<title>ASAP ports list</title>
+				<style>
+					table { border-collapse: collapse; }
+					th, td { border: solid black 1px; }
+					th, .name { background-color: #ccf; }
+					.good { background-color: #cfc; }
+					.bad { background-color: #fcc; }
+					.partial { background-color: #ffc; }
+					.good, .bad, .partial { text-align: center; }
+				</style>
+			</head>
+			<body>
+				<table>
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Binary release</th>
+							<th>Platform</th>
+							<th>User interface</th>
+							<th>First appeared in&#160;ASAP</th>
+							<th>Develop&#173;ment status<sup><a href="#status_note">[1]</a></sup></th>
+							<th>Output</th>
+							<th>Supports sub&#173;songs?</th>
+							<th>Shows file infor&#173;mation?</th>
+							<th>Edits file infor&#173;mation?</th>
+							<th>Converts to and from SAP?</th>
+							<th>Configu&#173;rable play&#173;back time?</th>
+							<th>Mute POKEY chan&#173;nels?</th>
+							<th>Shows STIL?</th>
+							<th>Comment</th>
+							<th>Program&#173;ming lan&#173;guage</th>
+							<th>Related website</th>
+						</tr>
+					</thead>
+					<tbody>
+						<xsl:apply-templates />
+					</tbody>
+				</table>
+				<ol>
+					<li id="status_note">Development status:
+						<ul>
+							<li><span class="good">stable</span> - complete</li>
+							<li><span class="partial">in development</span> - working, but incomplete or buggy</li>
+							<li><span class="bad">discontinued</span> - present in previous releases, no longer supported</li>
+							<li><span class="bad">sample</span> - sample code for developers, not recommended for end-users</li>
+						</ul>
+					</li>
+				</ol>
+			</body>
+		</html>
+	</xsl:template>
+
+	<xsl:template match="port">
+		<tr>
+			<td class="name"><xsl:value-of select="@name" /></td>
+			<td><xsl:value-of select="bin" /></td>
+			<td><xsl:value-of select="platform" /></td>
+			<td><xsl:value-of select="interface" /></td>
+			<td><xsl:value-of select="since" /></td>
+			<td>
+				<xsl:attribute name="class">
+					<xsl:choose>
+						<xsl:when test="status = 'stable'">good</xsl:when>
+						<xsl:when test="status = 'discontinued' or status = 'sample'">bad</xsl:when>
+						<xsl:otherwise>partial</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				<xsl:value-of select="status" />
+			</td>
+			<td><xsl:value-of select="output" /></td>
+			<td><xsl:apply-templates select="subsongs" /></td>
+			<td><xsl:apply-templates select="file-info" /></td>
+			<td><xsl:apply-templates select="edit-info" /></td>
+			<td><xsl:apply-templates select="convert-sap" /></td>
+			<td><xsl:apply-templates select="config-time" /></td>
+			<td><xsl:apply-templates select="mute-pokey" /></td>
+			<td><xsl:apply-templates select="stil" /></td>
+			<td><xsl:apply-templates select="comment" /></td>
+			<td><xsl:value-of select="lang" /></td>
+			<td><xsl:copy-of select="a" /></td>
+		</tr>
+	</xsl:template>
+
+	<xsl:template match="subsongs|file-info|edit-info|convert-sap|config-time|mute-pokey|stil|comment">
+		<xsl:attribute name="class">
+			<xsl:choose>
+				<xsl:when test="@class"><xsl:value-of select="@class" /></xsl:when>
+				<xsl:when test="starts-with(., 'yes')">good</xsl:when>
+				<xsl:when test=". = 'no'">bad</xsl:when>
+				<xsl:otherwise>partial</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+		<xsl:value-of select="." />
+	</xsl:template>
+</xsl:stylesheet>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/README kodi-audiodecoder-asap-3.0.1/lib/asap-code/README
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/README	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/README	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,18 @@
+ASAP - Another Slight Atari Player
+==================================
+
+ASAP is a player of Atari 8-bit chiptunes for modern computers and mobile
+devices.  It emulates the POKEY sound chip and the 6502 processor.
+
+ASAP supports the following file formats: SAP, CMC, CM3, CMR, CMS, DMC, DLT,
+FC, MPT, MPD, RMT, TMC/TM8, TM2, STIL and is available on Android, Windows,
+macOS, Linux and modern web browsers.
+
+ASAP is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published
+by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+See the INSTALL file for build instructions.
+
+For more information, visit the website: http://asap.sourceforge.net/
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/release/release.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/release/release.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/release/release.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/release/release.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,99 @@
+GIT = git
+TAR = /usr/bin/tar
+UNIX2DOS = $(DO)unix2dos <$< >$@
+GREP = @grep -H
+
+# no user-configurable paths below this line
+
+VERSION = 5.0.1
+
+ifndef DO
+$(error Use "Makefile" instead of "release.mk")
+endif
+
+dist: \
+	release/asap-$(VERSION)-android.apk \
+	release/asap-$(VERSION)-web.zip \
+	release/asap-$(VERSION)-win32.msi \
+	release/asap-$(VERSION)-win32.zip \
+	release/asap-$(VERSION)-win64.msi \
+	release/foo_asap-$(VERSION).fb2k-component \
+	srcdist
+.PHONY: dist
+
+srcdist: $(srcdir)MANIFEST $(srcdir)asap.c $(srcdir)asap.h $(ASM6502_OBX)
+	$(RM) release/asap-$(VERSION).tar.gz && $(TAR) -c --numeric-owner --owner=0 --group=0 --mode=644 -T MANIFEST --transform=s,,asap-$(VERSION)/, | $(SEVENZIP) -tgzip -si release/asap-$(VERSION).tar.gz
+.PHONY: srcdist
+
+$(srcdir)MANIFEST:
+	$(DO)if test -e $(srcdir).git; then \
+		($(GIT) ls-files | grep -vF .gitignore \
+			&& echo MANIFEST && echo asap.c && echo asap.h \
+			&& for obx in $(ASM6502_OBX); do echo $$obx; done) | /usr/bin/sort -u >$@; \
+	fi
+.PHONY: $(srcdir)MANIFEST
+
+release/asap-$(VERSION)-web.zip: release/COPYING.txt \
+	javascript/asap.js $(srcdir)javascript/asapweb.js
+	$(MAKEZIP)
+
+release/asap-$(VERSION)-win32.zip: release/COPYING.txt \
+	$(addprefix win32/,asapconv.exe asapscan.exe wasap.exe in_asap.dll foo_asap.dll apokeysnd.dll xmp-asap.dll bass_asap.dll ASAPShellEx.dll libasap_plugin.dll)
+	$(MAKEZIP)
+
+release/foo_asap-$(VERSION).fb2k-component: win32/foo_asap.dll
+	$(MAKEZIP)
+
+release/asap-$(VERSION)-macos.dmg: release/osx/libasap_plugin.dylib release/osx/plugins release/osx/asapconv release/osx/bin
+	$(DO)hdiutil create -volname asap-$(VERSION)-macos -srcfolder release/osx -format UDBZ -fs HFS+ -imagekey bzip2-level=3 -ov $@
+
+release/osx/libasap_plugin.dylib: libasap_plugin.dylib
+	$(DO)strip -o $@ -x $< && chmod 644 $@
+CLEANDIR += release/osx
+
+release/osx/plugins:
+	$(DO)ln -s /Applications/VLC.app/Contents/MacOS/plugins $@
+
+release/osx/asapconv: $(call src,asapconv.c asap.[ch])
+	$(OSX_CC)
+
+release/osx/bin: 
+	$(DO)ln -s /usr/local/bin $@
+
+deb:
+	debuild -b -us -uc
+.PHONY: deb
+
+deb64:
+	scp release/asap-$(VERSION).tar.gz vm:.
+	ssh vm 'rm -rf asap-$(VERSION) && tar xf asap-$(VERSION).tar.gz && make -C asap-$(VERSION) deb'
+	scp vm:asap{,-dev,-vlc}_$(VERSION)-1_amd64.deb release/
+.PHONY: deb64
+
+rpm64:
+	scp release/asap-$(VERSION).tar.gz vm:.
+	ssh vm 'rpmbuild -tb asap-$(VERSION).tar.gz'
+	scp vm:rpmbuild/RPMS/x86_64/asap{,-devel,-vlc,-xmms}-$(VERSION)-1.x86_64.rpm release/
+.PHONY: rpm64
+
+rpm32:
+	scp release/asap-$(VERSION).tar.gz vm:.
+	ssh vm 'rpmbuild -tb asap-$(VERSION).tar.gz'
+	scp vm:rpmbuild/RPMS/i686/asap{,-devel,-vlc,-xmms}-$(VERSION)-1.i686.rpm release/
+.PHONY: rpm32
+
+release/COPYING.txt: $(srcdir)COPYING
+	$(UNIX2DOS)
+CLEAN += release/COPYING.txt
+
+version:
+	@echo ./release/release.mk: VERSION=$(VERSION)
+	$(GREP) -m 1 version= $(srcdir)www/news.xml
+	$(GREP) "<since>" $(srcdir)PORTS.xml | /usr/bin/sort -ru | head -1
+	$(GREP) Version: $(srcdir)asap.spec
+	$(GREP) -m 1 ^asap $(srcdir)debian/changelog
+	$(GREP) "int Version" $(srcdir)asapinfo.ci
+	$(GREP) "VERSION =" $(srcdir)chksap.pl
+	$(GREP) android:versionName $(srcdir)java/android/AndroidManifest.xml
+	$(GREP) ", v" $(srcdir)win32/rmt/apokeysnd_dll.c
+.PHONY: version
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/sap2ntsc.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/sap2ntsc.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/sap2ntsc.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/sap2ntsc.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,153 @@
+/*
+ * sap2ntsc.c - convert PAL SAP files to NTSC
+ *
+ * Copyright (C) 2012-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* public API doesn't allow us to set NTSC or FASTPLAY */
+#include "asap.c"
+
+static void fatal_error(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	fprintf(stderr, "sap2ntsc: ");
+	vfprintf(stderr, format, args);
+	fputc('\n', stderr);
+	va_end(args);
+	exit(1);
+}
+
+static void process_file(const char *filename)
+{
+	/* check filename */
+	const char *ext = strrchr(filename, '.');
+	if (ext == NULL || strcasecmp(ext, ".sap") != 0)
+		fatal_error("%s: filename must be *.sap", filename);
+
+	/* read file */
+	FILE *fp = fopen(filename, "rb");
+	if (fp == NULL)
+		fatal_error("cannot open %s", filename);
+	static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len = fread(module, 1, sizeof(module), fp);
+	fclose(fp);
+
+	/* parse file */
+	ASAPInfo *info = ASAPInfo_New();
+	if (info == NULL)
+		fatal_error("out of memory");
+	if (!ASAPInfo_Load(info, filename, module, module_len))
+		fatal_error("%s: unsupported file", filename);
+
+	/* check if conversion possible */
+	if (ASAPInfo_IsNtsc(info))
+		fatal_error("%s: is already NTSC", filename);
+	if (ASAPInfo_GetPlayerRateScanlines(info) != 312)
+		fatal_error("%s: uses FASTPLAY", filename);
+
+	/* do the conversion */
+	ASAPWriter *writer = ASAPWriter_New();
+	if (writer == NULL)
+		fatal_error("out of memory");
+	info->ntsc = true;
+	info->fastplay = 262;
+	for (int i = 0; i < ASAPInfo_GetSongs(info); i++) {
+		int duration = ASAPInfo_GetDuration(info, i);
+		if (duration > 0)
+			ASAPInfo_SetDuration(info, i, (int) (duration * (1773447 / 1789772.5 * 262 / 312)));
+	}
+	static unsigned char output[ASAPInfo_MAX_MODULE_LENGTH];
+	ASAPWriter_SetOutput(writer, output, 0, sizeof(output));
+	int output_len = ASAPWriter_Write(writer, filename, info, module, module_len, true);
+	ASAPWriter_Delete(writer);
+	if (output_len < 0)
+		fatal_error("%s: conversion error", filename);
+
+	/* write file */
+	fp = fopen(filename, "wb");
+	if (fp == NULL)
+		fatal_error("cannot write %s", filename);
+	if (fwrite(output, output_len, 1, fp) != 1) {
+		fclose(fp);
+		remove(filename); /* "unlink" is less portable */
+		fatal_error("%s: write error", filename);
+	}
+	fclose(fp);
+
+	/* print summary */
+	printf("%s: ", filename);
+	int warnings = 0;
+
+	/* issue a warning for samples - they may break on NTSC */
+	/* TYPE S has FASTPLAY!=312, so it has been rejected earlier */
+	if (ASAPInfo_GetTypeLetter(info) == 'D') {
+		printf("WARNING: TYPE D");
+		warnings++;
+	}
+	
+	/* issue a warning if the 6502 code possibly reads the PAL/NTSC flag of GTIA
+	   (LDA/LDX/LDY $D014, e.g. Ghostbusters.sap).
+	   This is just a guess - false positives are possible and other code may be used for NTSC detection. */
+	for (int i = 0; i < module_len - 2; i++) {
+		if (module[i] >= 0xac && module[i] <= 0xae && module[i + 1] == 0x14 && module[i + 2] == 0xd0) {
+			if (warnings++ > 0)
+				printf(", ");
+			printf("WARNING: possible PAL/NTSC detection code");
+			break;
+		}
+	}
+
+	ASAPInfo_Delete(info);
+	if (warnings == 0)
+		printf("ok");
+	printf("\n");
+}
+
+int main(int argc, char **argv)
+{
+	bool usage = true;
+	for (int i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (strcmp(arg, "--help") == 0) {
+			usage = true;
+			break;
+		}
+		if (strcmp(arg, "--version") == 0) {
+			printf("sap2ntsc " ASAPInfo_VERSION "\n");
+			return 0;
+		}
+		process_file(arg);
+		usage = false;
+	}
+	if (usage) {
+		printf(
+			"Usage: sap2ntsc FILE.sap...\n"
+			"Replaces FILE.sap with an NTSC version\n"
+		);
+	}
+	return 0;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/sap2txt.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/sap2txt.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/sap2txt.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/sap2txt.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,189 @@
+/*
+ * sap2txt.c - write plain text summary of a SAP file
+ *
+ * Copyright (C) 2012-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+#include <fcntl.h>
+#ifdef _MSC_VER
+#include <io.h>
+#endif
+#endif
+#include <zlib.h>
+
+static void usage(void)
+{
+	fprintf(stderr,
+		"Usage:\n"
+		"sap2txt INPUT.sap             - dump to stdout\n"
+		"sap2txt INPUT.txt OUTPUT.sap  - replace header in SAP\n");
+}
+
+static int get_word(FILE *fp)
+{
+	int lo = getc(fp);
+	if (lo == EOF)
+		return -1;
+	int hi = getc(fp);
+	if (hi == EOF)
+		return -2;
+	return lo | (hi << 8);
+}
+
+static int sap2txt(const char *sap_file)
+{
+	FILE *fp = fopen(sap_file, "rb");
+	if (fp == NULL) {
+		fprintf(stderr, "sap2txt: cannot open %s\n", sap_file);
+		return 1;
+	}
+#ifdef _WIN32
+	_setmode(_fileno(stdout), _O_BINARY);
+#endif
+
+	/* copy header */
+	for (;;) {
+		int c = getc(fp);
+		if (c == EOF)
+			return 0;
+		else if (c == 0xff)
+			break;
+		putchar(c);
+	}
+	if (getc(fp) != 0xff)
+		return 0;
+
+	for (;;) {
+		bool ffff = false;
+		int start_address = get_word(fp);
+
+		switch (start_address) {
+		case -1:
+			/* ok */
+			return 0;
+		case -2:
+			printf("Unexpected end of file in a binary header\n");
+			return 0;
+		case 0xffff:
+			ffff = true;
+			start_address = get_word(fp);
+			break;
+		default:
+			break;
+		}
+		int end_address = get_word(fp);
+		if (end_address < 0) {
+			printf("Unexpected end of file in a binary header\n");
+			return 0;
+		}
+		if (end_address < start_address) {
+			printf("Invalid binary header\n");
+			return 0;
+		}
+		int len = end_address - start_address + 1;
+		Byte buffer[65536];
+		if (fread(buffer, 1, len, fp) != len) {
+			printf("Unexpected end of file in a binary block\n");
+			return 0;
+		}
+		uLong crc = crc32(0, Z_NULL, 0);
+		crc = crc32(crc, buffer, len);
+		if (ffff)
+			printf("FFFF ");
+		printf("LOAD %04X-%04X CRC32=%08lX\r\n", start_address, end_address, crc);
+	}
+}
+
+static size_t slurp(const char *input_file, Byte *buffer, size_t len)
+{
+	FILE *fp = fopen(input_file, "rb");
+	if (fp == NULL) {
+		fprintf(stderr, "sap2txt: cannot open %s\n", input_file);
+		return 0;
+	}
+	size_t result = fread(buffer, 1, len, fp);
+	fclose(fp);
+	if (result == len) {
+		fprintf(stderr, "sap2txt: %s: file too long\n", input_file);
+		return 0;
+	}
+	return result;
+}
+
+static int txt2sap(const char *txt_file, const char *sap_file)
+{
+	Byte txt_buf[65536];
+	size_t txt_len = slurp(txt_file, txt_buf, sizeof(txt_buf));
+	if (txt_len == 0)
+		return 1;
+	Byte sap_buf[65536];
+	size_t sap_len = slurp(sap_file, sap_buf, sizeof(sap_buf));
+	if (sap_len == 0)
+		return 1;
+
+	const void *bin_ptr = memchr(sap_buf, 0xff, sap_len);
+	if (bin_ptr == NULL) {
+		fprintf(stderr, "sap2txt: missing binary part in %s\n", sap_file);
+		return 1;
+	}
+
+	size_t i;
+	for (i = 0; i < txt_len; ) {
+		if (memcmp(txt_buf + i, "LOAD ", 5) == 0)
+			break;
+		if (txt_buf[i] == 0xff && txt_buf[i + 1] == 0xff)
+			break;
+		while (i < txt_len && txt_buf[i++] != 0x0a) { }
+	}
+
+	if (i == (const Byte *) bin_ptr - sap_buf && memcmp(txt_buf, sap_buf, i) == 0)
+		return 0; /* same */
+
+	FILE *fp = fopen(sap_file, "wb");
+	if (fp == NULL) {
+		fprintf(stderr, "sap2txt: cannot write %s\n", sap_file);
+		return 1;
+	}
+	fwrite(txt_buf, 1, i, fp);
+	fwrite(bin_ptr, 1, sap_len - ((const Byte *) bin_ptr - sap_buf), fp);
+	fclose(fp);
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	switch (argc) {
+	case 2:
+		if (strcmp(argv[1], "--help") == 0) {
+			usage();
+			return 0;
+		}
+		return sap2txt(argv[1]);
+	case 3:
+		return txt2sap(argv[1], argv[2]);
+	default:
+		usage();
+		return 1;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_nmien.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_nmien.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_nmien.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_nmien.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,108 @@
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	$3000
+main
+	lda	<title
+	ldx	>title
+	jsr	print
+
+	mva	#0	^4e
+	lda	#100
+	cmp:rne	^4b
+	mwa	#nmi	$fffa
+
+	ldy	#$40
+	lda	#123
+	cmp:req	^4b
+	cmp:rne	^4b
+	sta	^4a
+	lda	20
+	sta	^4a
+:2	cmp	(0,x)
+	cmp	0
+	sty	^4e
+:2	sta	^4a
+	cmp	20
+	jne	error
+
+	mva	#0	^4e
+	lda	#123
+	cmp:rne	^4b
+	sta	^4a
+	lda	20
+	sta	^4a
+:2	cmp	(0,x)
+	nop
+	sty	^4e
+:2	sta	^4a
+	cmp	20
+	beq	error
+
+	ldy	#0
+	lda	#123
+	cmp:rne	^4b
+	sta	^4a
+	lda	20
+	sta	^4a
+	cmp	(0,x)
+	cmp	0,x
+	cmp	0,x
+	sty	^4e
+:2	sta	^4a
+	cmp	20
+	beq	error
+
+	mva	#$40	^4e
+	lda	#123
+	cmp:rne	^4b
+	sta	^4a
+	lda	20
+	sta	^4a
+	cmp	(0,x)
+	cmp	0,x
+	cmp	0
+	sty	^4e
+:2	sta	^4a
+	cmp	20
+	bne	error
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+nmi
+	inc	20
+	rti
+
+title	dta	c'ANTIC: NMIEN...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	run	main
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_nmires.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_nmires.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_nmires.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_nmires.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,90 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "ANTIC NMIRES Test"',13,10
+	dta	c'DATE "11/12/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+	lda:rne ^4b
+	sta	^4f
+	lda	#123
+	cmp:rne	^4b
+	sta:sta	^4a
+	cmp	(0,x)
+	cmp	(0,x)
+	nop
+	sta	^4f
+	lda	^4f
+	cmp	#$5f
+	bne	error
+
+	lda	#123
+	cmp:rne	^4b
+	sta:sta	^4a
+	cmp	(0,x)
+	cmp	(0,x)
+	cmp	0
+	sta	^4f
+	lda	^4f
+	cmp	#$1f
+	bne	error
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'ANTIC: NMIRES...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_nmist.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_nmist.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_nmist.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_nmist.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,111 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "ANTIC NMIST Test"',13,10
+	dta	c'DATE "07/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+	ldx	#0
+test_loop
+	lda:rne ^4b
+	sta	^4f,x
+	lda	#123
+	cmp:rne	^4b
+	sta:sta	^4a
+	cmp	(0,x)
+	cmp	0,x
+	cmp	0,x
+	lda	^4f,x
+	cmp	#$5f
+	bne	error
+
+	lda:rne	^4b
+	lda	^4f,x
+	cmp	#$5f
+	bne	error
+
+	lda	#64
+	cmp:rne	^4b
+	lda	^4f,x
+	cmp	#$5f
+	bne	error
+
+	sta	^4f,x
+	lda	^4f,x
+	cmp	#$1f
+	bne	error
+
+	lda	#123
+	cmp:rne	^4b
+	sta:sta	^4a
+	cmp	(0,x)
+	cmp	0,x
+	cmp	0
+	lda	^4f,x
+	cmp	#$1f
+	bne	error
+
+	txa
+	add	#$10
+	tax
+	bcc	test_loop
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'ANTIC: NMIST...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_vblki.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_vblki.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_vblki.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_vblki.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,69 @@
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	$3000
+main
+	lda	<title
+	ldx	>title
+	jsr	print
+
+	lda	#100
+	cmp:rne	^4b
+	mwa	#nmi	$fffa
+	mva	#$40	^4e
+
+	ldx	#0
+	lda	#123
+	cmp:rne	^4b
+	lda	20
+:3	sta	^4a
+	cmp	20,x
+	bne	error
+
+	lda	#123
+	cmp:rne	^4b
+	lda	20
+:3	sta	^4a
+	nop
+	cmp	20
+	beq	error
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	mvx	#11	$342
+	mwx	#0	$348
+	rts	;FIXME jmp	$e456
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+nmi
+	inc	20
+	rti
+
+title	dta	c'ANTIC: VBLKI...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	run	main
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_vcount.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_vcount.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_vcount.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_vcount.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,95 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "ANTIC VCOUNT Test"',13,10
+	dta	c'DATE "10/12/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+:NTSC	dta	c'NTSC',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+	lda:rne ^4b
+	ldy	#155
+	lda	^14
+	lsr	@
+	seq:ldy	#130
+	cpy:rne	^4b
+	sta:sta	^4a
+	cmp	0
+	cpy	^4b
+	bne	error
+	cpy:rne	^4b
+	sta:sta	^4a
+	nop
+	iny
+	cpy	^4b
+	bne	error
+	dey
+	cpy:rne	^4b
+	sta:sta	^4a
+	nop
+	cmp	0
+	lda	^4b
+	bne	error
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'ANTIC: VCOUNT'
+	ift	SAP
+:NTSC	dta	c' NTSC'
+:!NTSC	dta	c' PAL'
+	eif
+	dta	c'...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_wsync.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_wsync.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/antic_wsync.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/antic_wsync.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,177 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "ANTIC WSYNC Test"',13,10
+	dta	c'DATE "19/05/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+div5	equ	$80
+mod5	equ	$81
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+:!SAP	inc	^40
+
+	ldx	#1
+	stx	div5
+	dex
+	stx	0
+	stx	^28
+	ldy	#0
+test_loop
+	stx	mod5
+	mva	cmps,x	cmpd
+	sta	cmpd2
+	sta	cmpd3
+	sta	cmpd4
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+	ldx	div5
+	dex:rne
+cmpd	cmp	#0
+	sta	^4a
+	lda	^2a
+	cmp	sta_wsync,y
+	jne	error
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+	ldx	div5
+	dex:rne
+cmpd2	cmp	#0
+	sta	^4a,x
+	lda	^2a
+	cmp	sta_wsync+1,y
+	bne	error
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+	ldx	div5
+	dex:rne
+cmpd3	cmp	#0
+	inc	^4a
+	lda	^2a
+	cmp	inc_wsync,y
+	bne	error
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+	ldx	div5
+	dex:rne
+cmpd4	cmp	#0
+	inc	^4a,x
+	lda	^2a
+	cmp	inc_wsync+1,y
+	bne	error
+
+	ldx	mod5
+	inx
+	cpx	#5
+	bcc	same5
+	inc	div5
+	ldx	#0
+same5	iny
+	jne	test_loop
+
+	lsr:cli	^4e
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lsr:cli	^4e
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'ANTIC: WSYNC...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
+
+sta_wsync
+	dta	$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21
+	dta	$10,$21,$21,$10,$21,$21,$10,$21,$21,$10,$21,$21,$10,$21,$21,$10
+	dta	$21,$21,$10,$21,$21,$10,$21,$21,$10,$21,$21,$21,$21,$21,$21,$21
+	dta	$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21
+	dta	$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21,$21
+	dta	$21,$21,$21,$21,$21,$21,$21,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
+	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
+	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B
+	dta	$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B,$F6,$F6,$7B,$F6
+	dta	$F6,$7B,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
+	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
+	dta	$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6,$F6
+	dta	$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9
+	dta	$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9,$D9
+	dta	$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9
+	dta	$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$6C,$D9,$D9,$D9,$D9,$D9
+	dta	$D9
+inc_wsync
+	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
+	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
+	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
+	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
+	dta	$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10,$10
+	dta	$10,$10,$10,$10,$10,$F6,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
+	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
+	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
+	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
+	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
+	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B
+	dta	$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$7B,$D9,$6C
+	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
+	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
+	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
+	dta	$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C,$6C
+	dta	$6C
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/benchmark.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/benchmark.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/benchmark.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/benchmark.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,28 @@
+GME_PATH = ../game-music-emu
+SAP_PATH = ../sapLib
+
+benchmark: test/benchmark/BENCHMARK.csv
+.PHONY: benchmark
+
+test/benchmark/BENCHMARK.csv: $(srcdir)test/benchmark/benchmark.pl win32/msvc/asapconv.exe win32/asapconv.exe win32/x64/asapconv.exe java/asap2wav.jar csharp/asap2wav.exe test/benchmark/gme_benchmark.exe test/benchmark/sap_benchmark.exe
+	perl $< > $@
+
+test/benchmark/gme_benchmark.exe: $(call src,test/benchmark/gme_benchmark.c asap.[ch]) $(GME_PATH)/gme/*.cpp $(GME_PATH)/gme/*.h
+	$(WIN32_CXX)
+CLEAN += test/benchmark/gme_benchmark.exe
+
+test/benchmark/sap_benchmark.exe: $(call src,test/benchmark/sap_benchmark.cpp asap.[ch]) $(SAP_PATH)/pokey0.cpp $(SAP_PATH)/pokey1.cpp $(SAP_PATH)/sapCpu.cpp $(SAP_PATH)/sapEngine.cpp $(SAP_PATH)/sapLib.h $(SAP_PATH)/sapPokey.cpp
+	$(WIN32_CXX)
+CLEAN += test/benchmark/sap_benchmark.exe
+
+profile: gmon.out
+	gprof -bpQ test/benchmark/asapconv-profile.exe
+
+gmon.out: test/benchmark/asapconv-profile.exe
+	$(DO)./test/benchmark/asapconv-profile.exe -b -o .wav test/benchmark/Drunk_Chessboard.sap
+CLEAN += gmon.out
+
+test/benchmark/asapconv-profile.exe: $(call src,asapconv.c asap.[ch])
+	$(DO)mingw32-gcc -O2 -Wall -o $@ -pg $(filter-out %.h,$^)
+	# avoid -s
+CLEAN += test/benchmark/asapconv-profile.exe
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/benchmark.pl kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/benchmark.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/benchmark.pl	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/benchmark.pl	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,32 @@
+use Time::HiRes qw(time);
+use strict;
+
+print q{File                          ,MSVC ,MinGW,MGx64,Java ,C#   ,GME   ,SAP
+};
+my @progs = (
+	'win32/msvc/asapconv.exe -o .wav',
+	'win32/asapconv.exe -o .wav',
+	'win32/x64/asapconv.exe -o .wav',
+	'java -jar java/asap2wav.jar',
+	'csharp/asap2wav.exe',
+	'test/benchmark/gme_benchmark.exe',
+	'test/benchmark/sap_benchmark.exe'
+);
+for my $file (glob 'test/benchmark/*.sap') {
+	printf '%30s', $file =~ m{([^/]+)$};
+	prog: for my $prog (@progs) {
+		my @cmd = (split(/ /, $prog), $file);
+		my $time = time;
+		my $COUNT = 5;
+		print STDERR "@cmd\n";
+		for my $i (1 .. $COUNT) {
+			unless (system(@cmd) == 0) {
+				print ',ERROR';
+				next prog;
+			}
+		}
+		$time = (time() - $time) / $COUNT;
+		printf ',%5.2f', $time;
+	}
+	print "\n";
+}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/Drunk_Chessboard.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/Drunk_Chessboard.sap differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/gme_benchmark.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/gme_benchmark.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/gme_benchmark.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/gme_benchmark.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ * gme_benchmark.c - Game_Music_Emu benchmark
+ *
+ * Copyright (C) 2013-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "asap.h"
+#include "gme.h"
+
+#define BUF_SIZE 4096
+
+static int get_stereo_samples_count(const char *filename)
+{
+	/* GME doesn't understand TIME so ask ASAP */
+	FILE *fp = fopen(filename, "rb");
+	if (fp == NULL) {
+		fprintf(stderr, "Cannot open %s\n", filename);
+		exit(1);
+	}
+	unsigned char content[ASAPInfo_MAX_MODULE_LENGTH];
+	int content_len = fread(content, 1, sizeof(content), fp);
+	fclose(fp);
+	
+	ASAPInfo *info = ASAPInfo_New();
+	if (!ASAPInfo_Load(info, filename, content, content_len)) {
+		fprintf(stderr, "ASAP doesn't understand %s\n", filename);
+		exit(1);
+	}
+	int duration = ASAPInfo_GetDuration(info, 0);
+	return duration * (44100 / 100) / 10 /* milliseconds to samples */
+		* 2; /* always stereo for gme */
+}
+
+int main(int argc, char **argv)
+{
+	if (argc != 2) {
+		fprintf(stderr, "Usage: gme_benchmark SAPFILE\n");
+		return 1;
+	}
+	Music_Emu *gme;
+	gme_err_t err = gme_open_file(argv[1], &gme, 44100);
+	if (err != NULL) {
+		fprintf(stderr, "%s\n", err);
+		return 1;
+	}
+	err = gme_start_track(gme, 0);
+	if (err != NULL) {
+		fprintf(stderr, "%s\n", err);
+		return 1;
+	}
+	int samples = get_stereo_samples_count(argv[1]);
+	while (samples > 0) {
+		short buf[BUF_SIZE];
+		int len = samples >= BUF_SIZE ? BUF_SIZE : samples;
+		gme_play(gme, len, buf);
+		samples -= len;
+	}
+	return 0;
+}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/International_Karate.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/International_Karate.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/Lasermania.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/Lasermania.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/Lightness.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/Lightness.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/Montezumas_Revenge.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/Montezumas_Revenge.sap differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/Overload.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/Overload.sap differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/sap_benchmark.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/sap_benchmark.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/sap_benchmark.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/sap_benchmark.cpp	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * sap_benchmark.cpp - SAP Library benchmark
+ *
+ * Copyright (C) 2013-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "asap.h"
+#include "sapLib.h"
+
+#define BUF_SIZE 4096
+
+static int get_samples_count(const char *filename)
+{
+	/* SAP Library doesn't understand TIME so ask ASAP */
+	FILE *fp = fopen(filename, "rb");
+	if (fp == NULL) {
+		fprintf(stderr, "Cannot open %s\n", filename);
+		exit(1);
+	}
+	unsigned char content[ASAPInfo_MAX_MODULE_LENGTH];
+	int content_len = fread(content, 1, sizeof(content), fp);
+	fclose(fp);
+	
+	ASAPInfo *info = ASAPInfo_New();
+	if (!ASAPInfo_Load(info, filename, content, content_len)) {
+		fprintf(stderr, "ASAP doesn't understand %s\n", filename);
+		exit(1);
+	}
+	/* milliseconds to samples */
+	return ASAPInfo_GetDuration(info, 0) * (44100 / 100) / 10;
+}
+
+int main(int argc, char **argv)
+{
+	if (argc != 2) {
+		fprintf(stderr, "Usage: sap_benchmark SAPFILE\n");
+		return 1;
+	}
+	sapMUSICstrc *sap = sapLoadMusicFile(argv[1]);
+	if (sap == NULL) {
+		fprintf(stderr, "SAP doesn't understand %s\n", argv[1]);
+		return 1;
+	}
+	sapPlaySong(0);
+	int samples = get_samples_count(argv[1]);
+	while (samples > 0) {
+		short buf[BUF_SIZE * 2];
+		int len = samples >= BUF_SIZE ? BUF_SIZE : samples;
+		/* for stereo, sapRenderBuffer fills len*2 samples */
+		sapRenderBuffer(buf, len);
+		samples -= len;
+	}
+	return 0;
+}
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/benchmark/Tempest_2000_Blue_Level.sap and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/benchmark/Tempest_2000_Blue_Level.sap differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_ane.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_ane.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_ane.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_ane.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,129 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "6502 Undocumented ANE Test"',13,10
+	dta	c'DATE "27/11/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+a	equ	$80
+x	equ	$81
+data	equ	$82
+datae	equ	$83
+andax	equ	$84
+expa	equ	$85
+expnz	equ	$86
+pos	equ	$89
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+	ldx	#0
+loop
+	stx	pos
+	mva	input,x	a
+	mva	input+1,x	x
+	mva	input+2,x	data
+
+	mva	data	ane+1
+	ora	#$ef
+	sta	datae
+	lda	x
+	tax
+	and	a
+	sta	andax
+	and	datae
+	sta	expa
+	lda	andax
+	and	data
+	php:pla
+	sta	expnz
+
+	lda	a
+	ldx	x
+ane	dta	$8b,0
+	php
+	cmp	expa
+	bne	error
+	cpx	x
+	bne	error
+	pla
+	eor	expnz
+	and	#$82
+	bne	error
+	ldx	pos
+	inx
+	bne	loop
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+; just some random data
+input
+	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
+	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
+	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
+	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
+	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
+	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
+	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
+	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
+	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
+	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
+	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
+	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
+	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
+	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
+	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
+	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
+
+title	dta	c'CPU: ANE...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_anx.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_anx.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_anx.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_anx.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,111 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "6502 Undocumented ANX Test"',13,10
+	dta	c'DATE "27/11/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+expa	equ	$80
+expnz	equ	$81
+pos	equ	$89
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+	ldx	#0
+loop
+	stx	pos
+	mva	input,x	anx+1
+	and	input+1,x
+	sta	expa
+	php:pla
+	sta	expnz
+	lda	input+1,x
+	ldx	$d20a
+anx	dta	$ab,0
+	php
+	cmp	expa
+	bne	error
+	cpx	expa
+	bne	error
+	pla
+	eor	expnz
+	and	#$82
+	bne	error
+	ldx	pos
+	inx
+	bne	loop
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+; just some random data
+input
+	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
+	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
+	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
+	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
+	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
+	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
+	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
+	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
+	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
+	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
+	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
+	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
+	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
+	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
+	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
+	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
+
+title	dta	c'CPU: ANX...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_decimal.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_decimal.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_decimal.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_decimal.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,234 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "6502 Decimal Mode Test"',13,10
+	dta	c'DATE "27/11/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 01:30',13,10
+	opt	h+
+	eif
+
+; CRC-32 based on my implementation in cc65 / zlib
+
+D_FLAG	equ	8
+C_FLAG	equ	1
+CRC_POLY3	equ	$ed
+CRC_POLY2	equ	$b8
+CRC_POLY1	equ	$83
+CRC_POLY0	equ	$20
+
+OK3	equ	$3d
+OK2	equ	$d8
+OK1	equ	$4d
+OK0	equ	$2a
+
+crc	equ	$80	; 4 bytes
+zpdata	equ	$84
+zpflags	equ	$85
+scrptr	equ	$86	; 2 bytes
+printptr	equ	$88	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+	jsr	init_crc
+	lda	#0
+	jsr	test_adc_sbc
+	lda	#C_FLAG
+	jsr	test_adc_sbc
+	lda	#D_FLAG
+	jsr	test_adc_sbc
+	lda	#D_FLAG|C_FLAG
+	jsr	test_adc_sbc
+
+	lda	crc+3
+	cmp	#OK3
+	bne	error
+	lda	crc+2
+	cmp	#OK2
+	bne	error
+	lda	crc+1
+	cmp	#OK1
+	bne	error
+	lda	crc
+	cmp	#OK0
+	bne	error
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	lda	crc+3
+	jsr	put_hex_byte
+	lda	crc+2
+	jsr	put_hex_byte
+	lda	crc+1
+	jsr	put_hex_byte
+	lda	crc
+	jsr	put_hex_byte
+	lda	#$9b
+	jsr	put_char
+	mwa	#$cfa0	$d200
+	jmp	*
+
+test_adc_sbc
+	sta	zpflags
+	mva	#0	zpdata
+	ldy	#0
+test_adc_sbc_byte
+	mva	zpdata	arr+1
+:!SAP	sta	$2c8
+
+	lda:pha	zpflags
+	tya
+	plp
+	adc	zpdata
+	php
+	jsr	do_crc
+	pla
+	jsr	do_crc
+
+	lda:pha	zpflags
+	tya
+	plp
+	sbc	zpdata
+	php
+	jsr	do_crc
+	pla
+	jsr	do_crc
+
+	lda:pha	zpflags
+	tya
+	plp
+arr	dta	$6b,0
+	php
+	jsr	do_crc
+	pla
+	jsr	do_crc
+
+	iny
+	bne	test_adc_sbc_byte
+	inc	zpdata
+	bne	test_adc_sbc_byte
+	rts
+
+init_crc
+	ldx	#0
+init_crc_entry
+	lda	#0
+	sta	crc+1
+	sta	crc+2
+	sta	crc+3
+	ldy	#8
+	txa
+init_crc_bit
+	sta	crc
+	lsr	@
+	bcc	init_crc_noxor
+	lda	crc+3
+	lsr	@
+	eor	#CRC_POLY3
+	sta	crc+3
+	lda	crc+2
+	ror	@
+	eor	#CRC_POLY2
+	sta	crc+2
+	lda	crc+1
+	ror	@
+	eor	#CRC_POLY1
+	sta	crc+1
+	lda	crc
+	ror	@
+	eor	#CRC_POLY0
+	bcs	init_crc_nextbit ; branch always
+init_crc_noxor
+	rol	@
+	lsr	crc+3
+	ror	crc+2
+	ror	crc+1
+	ror	@
+init_crc_nextbit
+	dey
+	bne	init_crc_bit
+	sta	crc_table_0,x
+	mva	crc+1	crc_table_1,x
+	mva	crc+2	crc_table_2,x
+	mva	crc+3	crc_table_3,x
+	inx
+	bne	init_crc_entry
+	mwa	#0	crc
+	sta	crc+2
+	sta	crc+3
+	rts
+
+; crc = (crc >> 8) ^ crc_table[(crc & 0xff) ^ input];
+do_crc
+	eor	crc
+	tax
+	lda	crc_table_0,x
+	eor	crc+1
+	sta	crc
+	lda	crc_table_1,x
+	eor	crc+2
+	sta	crc+1
+	lda	crc_table_2,x
+	sta	crc+3
+	sta	crc+2
+	mva	crc_table_3,x	crc+3
+	rts
+
+put_hex_byte
+	pha
+:4	lsr	@
+	jsr	put_hex_nibble
+	pla
+	and	#$f
+put_hex_nibble
+	cmp	#10
+	sed
+	adc	#'0'
+	cld
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'CPU: Decimal mode...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+crc_table_0	org	*+256
+crc_table_1	org	*+256
+crc_table_2	org	*+256
+crc_table_3	org	*+256
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_las.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_las.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_las.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_las.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,160 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "6502 Undocumented LAS Test"',13,10
+	dta	c'DATE "27/11/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+s	equ	$80
+y	equ	$81
+addr	equ	$82	; 2 bytes
+data	equ	$84
+exp	equ	$86
+expnz	equ	$87
+pos	equ	$89
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+area	equ	$2e00
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+	mva	>area	addr+1
+	ldx	#0
+loop
+	stx	pos
+	mva	input,x	s
+	mva	input+1,x	y
+	mva	input+2,x	addr
+	sta	las+1
+	mva	input+3,x	data
+
+	lda	s
+	and	data
+	sta	exp
+	php:pla
+	sta	expnz
+
+	ldy	y
+	mva	data	(addr),y
+	ldx	s
+	txs
+las	dta	$bb,a(area)
+	php
+	cmp	exp
+	bne	error
+	cpx	exp
+	bne	error
+	pla
+	eor	expnz
+	and	#$80	; TODO: #$82, but Z is unstable
+	bne	error
+	tsx
+	cpx	exp
+	bne	error
+
+	ldx	pos
+	inx
+	bne	loop
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	lda	addr
+	jsr	put_hex_byte
+	lda	addr+1
+	jsr	put_hex_byte
+	lda	<sequ
+	ldx	>sequ
+	jsr	print
+	lda	s
+	jsr	put_hex_byte
+	lda	<yequ
+	ldx	>yequ
+	jsr	print
+	lda	y
+	jsr	put_hex_byte
+	lda	#$9b
+	jsr	put_char
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_hex_byte
+	pha
+:4	lsr	@
+	jsr	put_hex_nibble
+	pla
+	and	#$f
+put_hex_nibble
+	cmp	#10
+	sed
+	adc	#'0'
+	cld
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+; just some random data
+input
+	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
+	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
+	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
+	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
+	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
+	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
+	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
+	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
+	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
+	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
+	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
+	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
+	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
+	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
+	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
+	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
+
+title	dta	c'CPU: LAS...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,c'Code:BB',0
+sequ	dta	c' S=',0
+yequ	dta	c' Y=',0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_shx.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_shx.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/cpu_shx.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/cpu_shx.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,210 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "6502 Undocumented SHX/SHY Test"',13,10
+	dta	c'DATE "27/11/2010"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+addr	equ	$80	; 2 bytes
+index	equ	$82
+data	equ	$83
+dest	equ	$84	; 2 bytes
+expected	equ	$86
+opcode	equ	$87
+got	equ	$88
+pos	equ	$89
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	$d40e
+:!SAP	mva	#$fe	$d301
+	ldx	#0
+loop
+	stx	pos
+	mwa	input,x	addr
+	mva	input+2,x	index
+	mva	input+3,x	data
+	jsr	do_test
+	ldx	pos
+	inx
+	bne	loop
+
+:!SAP	mva	#$ff	$d301
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+do_test
+	lda	addr
+	add	index
+	sta	dest
+	php
+	lda	addr+1
+	add	#1
+	and	data
+	sta	expected
+	plp
+	scs:lda	addr+1
+	sta	dest+1
+	cmp	#0
+	bne	no_zp
+	lda	dest
+	and	#$f0
+	cmp	#$80
+	bne	run
+	beq	skip	!
+no_zp
+	and	#$f8
+	cmp	#$10
+	beq	skip
+	cmp	#$30
+	beq	skip
+	cmp	#$d0
+	beq	skip
+run
+	mwa	addr	shx+1
+	mwa	addr	shy+1
+	lda	expected
+	eor	#$ff
+	sta	(dest),0
+	ldx	data
+	ldy	index
+shx	dta	$9e,a(0)
+	ldx	#$9e
+	lda	(dest),0
+	cmp	expected
+	bne	error
+	eor	#$ff
+	sta	(dest),y
+	ldy	data
+	ldx	index
+shy	dta	$9c,a(0)
+	ldx	#$9c
+	lda	(dest),0
+	cmp	expected
+	bne	error
+skip
+	rts
+
+error
+:!SAP	mva	#$ff	$d301
+	stx	opcode
+	sta	got
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	lda	opcode
+	jsr	put_hex_byte
+	lda	addr
+	jsr	put_hex_byte
+	lda	addr+1
+	jsr	put_hex_byte
+	lda	<xequ
+	ldx	>xequ
+	jsr	print
+	lda	data
+	ldx	opcode
+	cpx	#$9e
+	seq:lda	index
+	jsr	put_hex_byte
+	lda	<yequ
+	ldx	>yequ
+	jsr	print
+	lda	index
+	ldx	opcode
+	cpx	#$9e
+	seq:lda	data
+	jsr	put_hex_byte
+	lda	<gott
+	ldx	>gott
+	jsr	print
+	lda	got
+	jsr	put_hex_byte
+	lda	<exp
+	ldx	>exp
+	jsr	print
+	lda	expected
+	jsr	put_hex_byte
+	lda	#$9b
+	jsr	put_char
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_hex_byte
+	pha
+:4	lsr	@
+	jsr	put_hex_nibble
+	pla
+	and	#$f
+put_hex_nibble
+	cmp	#10
+	sed
+	adc	#'0'
+	cld
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+; just some random data
+input
+	dta	$73,$c3,$26,$17,$3b,$9b,$82,$06,$6e,$f8,$c6,$74,$83,$6c,$d6,$7c
+	dta	$5b,$4f,$33,$72,$ef,$55,$69,$3f,$64,$f1,$02,$21,$ea,$51,$ad,$d8
+	dta	$55,$41,$bd,$cc,$c9,$b3,$a7,$30,$78,$41,$ab,$ac,$bc,$61,$49,$94
+	dta	$95,$a0,$b4,$37,$da,$aa,$e2,$50,$0f,$5f,$66,$12,$4d,$c4,$b7,$f4
+	dta	$1b,$1a,$18,$a2,$a2,$df,$b6,$36,$27,$f7,$33,$3a,$33,$e2,$49,$6e
+	dta	$4d,$25,$94,$f2,$b4,$c4,$50,$be,$f8,$0d,$10,$13,$e3,$82,$32,$cb
+	dta	$9a,$1a,$1e,$2a,$52,$bb,$14,$25,$90,$1d,$96,$b9,$54,$e8,$2d,$45
+	dta	$19,$5b,$9b,$86,$0e,$34,$3a,$2c,$77,$35,$9b,$91,$9d,$f8,$17,$a9
+	dta	$2a,$70,$7a,$9e,$6b,$ce,$6f,$35,$4e,$1d,$d2,$6c,$95,$53,$95,$77
+	dta	$17,$27,$5a,$83,$7e,$76,$74,$65,$6e,$74,$6a,$a5,$75,$79,$ac,$02
+	dta	$af,$b5,$a2,$e1,$89,$87,$be,$c3,$87,$cd,$ae,$41,$74,$ea,$69,$8e
+	dta	$ed,$d6,$2a,$1d,$a3,$eb,$17,$5a,$43,$d2,$a7,$0e,$6b,$43,$7b,$73
+	dta	$92,$ec,$d3,$7a,$50,$3b,$3e,$57,$e6,$65,$b9,$c9,$75,$5f,$d8,$3a
+	dta	$ca,$1e,$2c,$33,$26,$dd,$85,$28,$e9,$bd,$45,$34,$8a,$79,$59,$c1
+	dta	$c7,$7c,$10,$9d,$6b,$28,$75,$9e,$a0,$89,$4a,$40,$26,$49,$5b,$54
+	dta	$64,$1a,$48,$49,$b5,$7e,$68,$0f,$d6,$0e,$00,$27,$e2,$26,$62,$d7
+
+title	dta	c'CPU: SHX/SHY...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,c'Code:',0
+xequ	dta	c' X=',0
+yequ	dta	c' Y=',0
+gott	dta	c' got ',0
+exp	dta	c' exp ',0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/crashsap.cs kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/crashsap.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/crashsap.cs	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/crashsap.cs	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+ * crashsap.cs - buffer overflow regression test
+ *
+ * Copyright (C) 2012  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+using Sf.Asap;
+
+public class CrashSap
+{
+	public static void Main()
+	{
+		ASAP asap = new ASAP();
+		asap.Load("foo.sap", new byte[1] { (byte) 'S' }, 1);
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/disasm/disasm.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/disasm/disasm.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/disasm/disasm.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/disasm/disasm.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,22 @@
+disasm: $(addprefix test/disasm/,asap.s asap64.s asap.html asap.jasm)
+.PHONY: disasm
+
+test/disasm/asap.s: $(call src,asap.[ch])
+	$(WIN32_CC) -S
+CLEAN += test/disasm/asap.s
+
+test/disasm/asap64.s: $(call src,asap.[ch])
+	$(WIN64_CC) -S
+CLEAN += test/disasm/asap64.s
+
+test/disasm/asap.html: csharp/asap2wav.exe
+	-$(DO)"c:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Bin/ildasm.exe" /output=$@ /html /nobar /source $<
+CLEAN += test/disasm/asap.html
+
+test/disasm/asap.jasm: java/classes/net/sf/asap
+	$(DO)javap -c -private -classpath java/classes net.sf.asap.ASAP net.sf.asap.ASAPInfo net.sf.asap.Cpu6502 net.sf.asap.Pokey net.sf.asap.PokeyPair > $@
+CLEAN += test/disasm/asap.jasm
+
+test/disasm/asap.dexdump: java/android/classes/net/sf/asap/Player.class
+	$(DO)java -jar "c:/bin/android-sdk-windows/platforms/android-8//tools/lib/dx.jar" --dex --dump-to=$@ java/android/classes/
+CLEAN += test/disasm/asap.dexdump
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/formats.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/formats.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/formats.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/formats.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,95 @@
+cmc
+	dta	c' cmc data file '*,$8e,$95,$0d,$20
+	dta	3 ; tempo
+:64	dta	l(pattern)
+:64	dta	h(pattern)
+; pattern=$ffff => no pattern
+:26	dta	1,2,3,4,5,6	; 1-4 instrument params, 5-6: accent map
+:26	dta	1,2,3,4,5,6,7,8	; instrument envelope BADCFE...
+:$55	dta	1	; track 1
+:$55	dta	2	; track 2
+:$55	dta	3	; track 3
+	dta	0xff
+; offset=$300
+; patterns...
+
+mpt
+:32	dta	a(instr)
+; instr=0 => no instrument
+:64	dta	a(pattern)
+; pattern=0 => no pattern
+:4*64	dta	0 ; note2frequency
+:4	dta	l(track)
+:4	dta	h(track)
+	dta	$40	; pattern_len
+	dta	6	; tempo
+; track1
+; track2
+; track3
+; track4
+; instruments...
+; patterns...
+
+rmt
+	dta	c'RMT4' ; c'RMT8'
+	dta	$40 ; pattern_len
+	dta	6	; tempo
+	dta	1	; per frame
+	dta	1	; instrspeed
+	dta	a(instrtable,patltable,pathtable,song)
+:x	dta	a(instr) ; instrtable
+:x	dta	l(pattern) ; patltable
+:x	dta	h(pattern) ; pathtable
+; instruments
+; patterns
+; song
+:x	dta	b(1,2,3,4) ; 8 if RMT8
+	dta	$fe,pos,a(songpos) ; jmp in song
+
+tmc
+:30	dta	c'T'	; title
+	dta	2	; tempo
+	dta	4	; per frame
+:64	dta	l(instr)
+:64	dta	h(instr)
+; instr=0 => no instr
+:128	dta	l(pattern)
+:128	dta	h(pattern)
+:16*x	dta	0	; song
+:80*x	dta	0	; instruments
+; patterns
+
+tm2
+	dta 14,21,13+128,c'TMC SONG FILE 2.0'*,13+128,21,14
+	dta a($1580) ; total bytes in memory
+	dta	1,16,20,0,0 ; POKEY config?
+	dta	5	; tempo
+	dta	1	; per frame
+	dta	c' '
+:30	dta	c'T' ; title 1st line
+	dta	c' '
+	dta	c' '
+:30	dta	c'T' ; title 2nd line
+	dta	c' '
+	dta	c' '
+:30	dta	c'T' ; title 3rd line
+	dta	c' '
+:128	dta	l(instr)
+:256	dta	l(pattern)
+:256	dta	h(pattern)
+:128	dta	h(instr)
+; instr=0 => no instr
+; song data
+:x	dta	pattern7,transp7,...pattern0,transp0,patlen
+; patlen=0 = stop, patlen>=$80 = jump transp0
+; instruments&patterns
+
+fc ; no DOS header
+	dta	'F'-' ','C'-' '
+	dta	tempo
+:256	dta	track1
+:256	dta	track2
+:256	dta	track3
+:32	dta	env,audc,depth,effect	; instruments
+:64*x	dta	0	; patterns
+:32*x	dta	0	; envelopes
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/gtia_consol.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/gtia_consol.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/gtia_consol.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/gtia_consol.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,77 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "GTIA CONSOL Test"',13,10
+	dta	c'DATE "10/05/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+
+	ldx	#0
+test_loop
+	stx	$d01f
+	txa
+	eor:and	#$f
+	cmp	$d01f
+	bne	error
+	inx
+	bne	test_loop
+
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'GTIA: CONSOL...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/loadsap.cs kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/loadsap.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/loadsap.cs	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/loadsap.cs	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ * loadsap.cs - print files with ASAP loading errors
+ *
+ * Copyright (C) 2011  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+using System;
+using System.IO;
+
+using Sf.Asap;
+
+public class LoadSap
+{
+	static void Check(string path)
+	{
+		if (Directory.Exists(path)) {
+			foreach (string child in Directory.GetFileSystemEntries(path))
+				Check(child);
+		}
+		else if (ASAPInfo.IsOurFile(path)) {
+			byte[] module = File.ReadAllBytes(path);
+			try {
+				ASAP asap = new ASAP();
+				asap.Load(path, module, module.Length);
+				asap.PlaySong(asap.GetInfo().GetDefaultSong(), -1);
+			}
+			catch (Exception ex) {
+				Console.WriteLine("{0}: {1}", path, ex.Message);
+			}
+		}
+	}
+
+	public static int Main(string[] args)
+	{
+		if (args.Length == 0) {
+			Console.WriteLine("Usage: loadsap FILE_OR_DIR...");
+			return 1;
+		}
+		foreach (string path in args)
+			Check(path);
+		return 0;
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_irqst.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_irqst.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_irqst.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_irqst.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,91 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY IRQST Test"',13,10
+	dta	c'DATE "07/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+:!SAP	inc	^40
+
+	lda	#0
+	jsr	test1
+	lda	#1
+	jsr	test1
+
+:!SAP	lsr:cli	^4e
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+test1
+	mvx	#0	^2e
+	mvx	#$40	^28
+	mvx	#$ff	^20
+	stx	^29
+	stx	^4a
+	sta	^20
+	mvx	#1	^2e
+	stx	^29
+	cmp	0,x
+	eor	^2e
+	mvx	$10	^2e
+	lsr	@
+	bcs	error
+	rts
+
+error
+:!SAP	lsr:cli	^4e
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'POKEY: IRQST...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_pot.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_pot.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_pot.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_pot.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,162 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY POT Test"',13,10
+	dta	c'DATE "14/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+div5	equ	$80
+mod5	equ	$81
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+:!SAP	inc	^40
+
+; fast POT scan
+	ldx	#1
+	stx	div5
+	dex
+	stx	0
+	ldy	#0
+test_loop
+	stx	mod5
+	mva	cmps,x	cmpd
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#7	^2f
+	sta	^2b
+	ldx	div5
+	dex:rne
+cmpd	cmp	#0
+	lda	^20
+	cmp	expected,y
+	jne	error
+
+	ldx	mod5
+	inx
+	cpx	#5
+	bcc	same5
+	inc	div5
+	ldx	#0
+same5	iny
+	bne	test_loop
+
+; slow POT scan (114 divisor)
+	ldy	#2
+test2_loop
+	mva	cmps,y	cmpd2
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+:2	sta	^4a
+	sta	^2b
+	ldx	#13+21
+	dex:rne
+cmpd2	cmp	#0
+	lda	^20
+	cmp	expected114,y
+	bne	error
+	dey
+	bpl	test2_loop
+
+; slow POT scan, max value
+	ldy	#228
+test3_loop
+	sty	^4a
+	dey
+	bne	test3_loop
+	lda	^20
+	cmp	#228
+	bne	error
+
+; slow POT scan, 114 divisor stopped
+	mva	#0	^2f
+:2	sta	^4a
+	sta	^2b
+:5	sta	^4a
+	ldx	#3
+	lda	^20
+	stx	^2f
+	bne	error
+
+	lsr:cli	^4e
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lsr:cli	^4e
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'POKEY: POT...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
+
+expected
+	dta	$08,$0c,$0c,$0e,$00,$10,$10,$12,$10,$14,$14,$16,$10,$18,$1a,$18
+	dta	$1c,$1e,$00,$20,$22,$20,$24,$26,$20,$28,$2a,$28,$2c,$2e,$20,$30
+	dta	$32,$30,$34,$36,$30,$38,$3a,$38,$3c,$3c,$3e,$00,$40,$40,$42,$40
+	dta	$44,$44,$46,$40,$48,$48,$4a,$48,$4c,$4c,$4e,$40,$50,$50,$52,$50
+	dta	$54,$54,$56,$50,$58,$58,$5a,$58,$5c,$5c,$5e,$40,$60,$60,$62,$60
+	dta	$64,$64,$66,$60,$68,$68,$6a,$68,$6c,$6c,$6e,$60,$70,$70,$72,$70
+	dta	$74,$74,$76,$70,$78,$78,$7a,$78,$7c,$7c,$7e,$00,$80,$80,$82,$80
+	dta	$84,$84,$86,$80,$88,$88,$88,$8c,$8c,$80,$90,$90,$90,$94,$94,$90
+	dta	$98,$98,$98,$9c,$9c,$80,$a0,$a0,$a0,$a4,$a4,$a0,$a8,$a8,$a8,$ac
+	dta	$ac,$ae,$a0,$b0,$b0,$b2,$b0,$b4,$b4,$b6,$b0,$b8,$b8,$ba,$b8,$bc
+	dta	$bc,$be,$80,$c0,$c0,$c2,$c0,$c4,$c4,$c6,$c0,$c8,$c8,$ca,$c8,$cc
+	dta	$cc,$ce,$c0,$d0,$d0,$d2,$d0,$d4,$d4,$d6,$d0,$d8,$d8,$da,$d8,$dc
+	dta	$dc,$de,$c0,$e0,$e0,$e2,$e0,$e4,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
+	dta	$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
+	dta	$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
+	dta	$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5,$e5
+expected114
+	dta	1,0,2
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_potst.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_potst.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_potst.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_potst.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,145 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY POTST Test"',13,10
+	dta	c'DATE "14/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+div5	equ	$80
+mod5	equ	$81
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+:!SAP	inc	^40
+
+; fast POT scan
+	ldx	#1
+	stx	div5
+	dex
+	stx	0
+	ldy	#0
+test_loop
+	stx	mod5
+	mva	cmps,x	cmpd
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#7	^2f
+	sta	^2b
+	ldx	div5
+	dex:rne
+cmpd	cmp	#0
+	lda	^28
+	eor	#$ff
+	cpy	#200
+	adc	#0
+	jne	error
+
+	ldx	mod5
+	inx
+	cpx	#5
+	bcc	same5
+	inc	div5
+	ldx	#0
+same5	iny
+	bne	test_loop
+
+; slow POT scan (114 divisor)
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+:2	sta	^4a
+	sta	^2b
+	ldx	#227
+delay_loop	stx	^4a
+	dex:bne	delay_loop
+	ldx	#13
+	dex:rne
+	cmp	0,x
+	lda	^28
+	cmp	#$ff
+	bne	error
+
+	mva	#0	^2f
+:2	sta	^4a
+	mva	#3	^2f
+:2	sta	^4a
+	sta	^2b
+	ldx	#227
+delay2_loop	stx	^4a
+	dex:bne	delay2_loop
+	ldx	#14
+	dex:rne
+	lda	^28
+	bne	error
+
+; slow POT scan, 114 divisor stopped
+	mva	#0	^2f
+:2	sta	^4a
+	sta	^2b
+:5	sta	^4a
+	ldx	#3
+	lda	^28
+	stx	^2f
+	beq	error
+
+	lsr:cli	^4e
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lsr:cli	^4e
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'POKEY: POTST...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_pure.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_pure.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_pure.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_pure.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,39 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY Pure Sound Test"',13,10
+	dta	c'DATE "03/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:08',13,10
+	opt	h+
+	eif
+
+	org	f:$3000
+main
+:!SAP	sei:inc	^4e
+	mva	#3	^2f
+	mva	#0	^28
+
+	mva	#$af	^21
+test_start
+	lda	#255
+test_loop
+	sta	^20
+	ldx	<-15556
+	ldy	>-15556
+wait_loop
+	sta	^4a
+	inx
+	bne	wait_loop
+	iny
+	bne	wait_loop
+	tax
+	beq	test_start
+	lsr	@
+	jmp	test_loop
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_random.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_random.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_random.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_random.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,150 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY RANDOM Test"',13,10
+	dta	c'DATE "19/05/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+div5	equ	$80
+mod5	equ	$81
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+:!SAP	inc	^40
+
+	ldx	#1
+	stx	div5
+	dex
+	stx	0
+	ldy	#0
+test_loop
+	stx	mod5
+	mva	cmps,x	cmpd
+	sta	cmpd2
+
+	mva	#0	^28
+	sta	^2f
+:2	sta	^4a
+	mva	#3	^2f
+	ldx	div5
+	dex:rne
+cmpd	cmp	#0
+	lda	^2a
+	cmp	poly17,y
+	bne	error
+
+	mva	#$80	^28
+	sta	^2f
+:2	sta	^4a
+	mva	#3	^2f
+	ldx	div5
+	dex:rne
+cmpd2	cmp	#0
+	lda	^2a
+	cmp	poly9,y
+	bne	error
+
+	ldx	mod5
+	inx
+	cpx	#5
+	bcc	same5
+	inc	div5
+	ldx	#0
+same5	iny
+	bne	test_loop
+
+	lsr:cli	^4e
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	lsr:cli	^4e
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+title	dta	c'POKEY: RANDOM...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+cmps	dta	{cmp #},{cmp 0},{cmp 0,x},{cmp (0),y},{cmp (0,x)}
+
+poly17
+	dta	$00,$80,$C0,$E0,$F0,$F8,$7C,$3E,$1F,$0F,$07,$03,$01,$80,$C0,$E0
+	dta	$F0,$FC,$FE,$FF,$FF,$7F,$3F,$CF,$E7,$F3,$7C,$3E,$1F,$07,$83,$C1
+	dta	$30,$18,$8C,$E3,$F1,$F8,$FE,$FF,$FF,$3F,$1F,$0F,$07,$83,$C1,$E0
+	dta	$70,$38,$1C,$0E,$87,$C3,$E1,$F0,$F8,$FC,$FE,$FF,$7F,$3F,$9F,$CF
+	dta	$67,$B3,$D9,$EC,$F6,$7B,$3D,$1E,$8F,$C7,$63,$31,$98,$CC,$E6,$73
+	dta	$39,$1C,$8E,$C7,$63,$31,$18,$0C,$86,$43,$21,$10,$08,$84,$42,$21
+	dta	$10,$08,$04,$82,$41,$20,$10,$08,$04,$02,$01,$00,$00,$00,$80,$C0
+	dta	$60,$30,$18,$0C,$86,$43,$21,$10,$08,$04,$C1,$60,$30,$8C,$46,$23
+	dta	$08,$04,$82,$E0,$70,$38,$0E,$87,$43,$10,$88,$C4,$F1,$78,$3C,$CF
+	dta	$67,$33,$0C,$86,$43,$A1,$D0,$68,$B4,$5A,$2D,$96,$4B,$25,$92,$49
+	dta	$24,$92,$C9,$64,$32,$19,$8C,$46,$23,$91,$C8,$64,$B2,$D9,$EC,$F6
+	dta	$7B,$3D,$1E,$8F,$47,$A3,$D1,$E8,$F4,$FA,$7D,$3E,$1F,$8F,$C7,$63
+	dta	$B1,$D8,$EC,$F6,$7B,$BD,$DE,$EF,$F7,$7B,$3D,$1E,$8F,$C7,$63,$31
+	dta	$18,$0C,$06,$03,$01,$00,$80,$C0,$60,$30,$18,$0C,$06,$83,$C1,$60
+	dta	$30,$18,$8C,$63,$31,$18,$C6,$E3,$F1,$3C,$1E,$0F,$03,$01,$00,$00
+	dta	$80,$C0,$B0,$D8,$EC,$7B,$3D,$1E,$07,$83,$C1,$B0,$D8,$6C,$36,$1B
+poly9
+	dta	$EF,$77,$3B,$1D,$0E,$87,$43,$A1,$D0,$68,$34,$9A,$CD,$66,$B3,$D9
+	dta	$6C,$DB,$ED,$F6,$BD,$5E,$2F,$0B,$85,$C2,$70,$38,$9C,$67,$33,$19
+	dta	$86,$43,$21,$48,$24,$12,$44,$A2,$51,$D4,$EA,$75,$BA,$5D,$AE,$D7
+	dta	$EB,$F5,$7A,$3D,$9E,$4F,$27,$93,$49,$A4,$D2,$E9,$74,$3A,$9D,$CE
+	dta	$E7,$73,$39,$1C,$0E,$07,$03,$81,$C0,$E0,$70,$B8,$DC,$EE,$77,$BB
+	dta	$5D,$2E,$97,$CB,$E5,$F2,$79,$BC,$5E,$AF,$57,$2B,$95,$4A,$A5,$52
+	dta	$29,$14,$0A,$05,$02,$81,$40,$A0,$50,$A8,$54,$AA,$55,$AA,$D5,$EA
+	dta	$F5,$FA,$7D,$BE,$5F,$AF,$D7,$6B,$B5,$5A,$16,$0B,$05,$C1,$60,$B0
+	dta	$EC,$76,$BB,$6E,$B7,$DB,$B6,$5B,$AD,$6B,$35,$1A,$06,$83,$41,$D0
+	dta	$E8,$74,$DD,$EE,$F7,$FB,$7D,$3E,$1F,$8F,$C7,$E3,$F1,$78,$3C,$9E
+	dta	$CF,$67,$B3,$59,$2C,$96,$CB,$65,$B2,$59,$AC,$D6,$EB,$75,$3A,$1D
+	dta	$8E,$C7,$63,$B1,$58,$2C,$16,$8B,$45,$A2,$D1,$E8,$F4,$FA,$FD,$FE
+	dta	$7F,$BF,$5F,$2F,$97,$4B,$A5,$D2,$69,$34,$1A,$8D,$46,$A3,$51,$28
+	dta	$94,$CA,$65,$32,$19,$8C,$C6,$63,$31,$18,$0C,$06,$03,$01,$80,$C0
+	dta	$60,$30,$98,$66,$33,$99,$A6,$53,$A9,$6A,$35,$9A,$26,$93,$C9,$F2
+	dta	$F9,$FC,$BF,$DF,$6F,$5B,$2D,$96,$25,$92,$49,$92,$C9,$64,$B2,$D9
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_timerirq.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_timerirq.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/pokey_timerirq.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/pokey_timerirq.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,125 @@
+	ift	SAP
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY Timer IRQ Test"',13,10
+	dta	c'DATE "07/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'TIME 00:10',13,10
+	opt	h+
+	eif
+
+scrptr	equ	$8a	; 2 bytes
+printptr	equ	$8c	; 2 bytes
+
+	org	f:$3000
+main
+:SAP	mwa	#$1000	scrptr
+	lda	<title
+	ldx	>title
+	jsr	print
+
+:!SAP	sei:inc	^4e
+:!SAP	inc	^40
+:!SAP	mva	#$fe	^31
+
+	ldx	#8
+test_loop
+	mwa	#irq	$fffe
+	mva	#0	^2f
+	sta	^2e
+	cli
+	mva	#$40	^28
+	mva	#$ff	^20
+	sta	^29
+	stx	^20
+	sta	^4a
+	mva	#3	^2f
+	lsr	@
+	sta	^2e
+	sta	^4a
+	sta	^29
+	jmp	*
+
+irq
+	lda	^2a
+	cmp	expected,x
+	bne	error
+	dex
+	bpl	test_loop
+
+:!SAP	mva	$10	^2e
+:!SAP	mva	#$ff	^31
+:!SAP	lsr:cli	^4e
+	lda	<pass
+	ldx	>pass
+	jsr	print
+	mwa	#$af30	$d200
+	jmp	*
+
+error
+	pha
+	txa:pha
+	mva	#0	^28
+:!SAP	mva	$10	^2e
+:!SAP	mva	#$ff	^31
+:!SAP	lsr:cli	^4e
+	lda	<fail
+	ldx	>fail
+	jsr	print
+	pla
+	jsr	put_hex_byte
+	pla
+	jsr	put_hex_byte
+	lda	#$9b
+	jsr	put_char
+	mwa	#$cfa0	$d200
+	jmp	*
+
+put_hex_byte
+	pha
+:4	lsr	@
+	jsr	put_hex_nibble
+	pla
+	and	#$f
+put_hex_nibble
+	cmp	#10
+	sed
+	adc	#'0'
+	cld
+put_char
+	ift	SAP
+	sta	(scrptr),0
+	inw	scrptr
+	rts
+	els
+	mvx	#11	$342
+	mwx	#0	$348
+	jmp	$e456
+	eif
+
+print
+	sta	printptr
+	stx	printptr+1
+	jmp	print_2
+print_1
+	jsr	put_char
+	inw	printptr
+print_2
+	lda	(printptr),0
+	bne	print_1
+	rts
+
+expected
+:3	dta	$30
+:3	dta	$86
+:3	dta	$10
+
+title	dta	c'POKEY: Timer IRQ...',0
+pass	dta	c'Pass',$9b,0
+fail	dta	c'FAIL.',$9b,0
+
+	ift	!SAP
+	run	main
+	eif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/RESULTS.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/RESULTS.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/RESULTS.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/RESULTS.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,73 @@
+<?xml-stylesheet type="text/xsl" href="RESULTS.xsl" ?>
+<tests>
+	<test name="antic_nmires">
+		<fail on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<fail on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="antic_nmist">
+		<pass on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="antic_vcount">
+		<fail on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="antic_wsync">
+		<fail on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<fail on="ASAP 3.0.0" />
+	</test>
+	<test name="cpu_anx">
+		<pass on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<pass on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="cpu_decimal">
+		<pass on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<fail on="Altirra 1.9" />
+		<pass on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="cpu_las">
+		<pass on="Atari800 2.2.1" />
+		<crash on="Atari++ 1.60" />
+		<fail on="Altirra 1.9" />
+		<pass on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="cpu_shx">
+		<fail on="Atari800 2.2.1" />
+		<crash on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="gtia_consol">
+		<pass on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<pass on="ASAP 3.0.0" />
+	</test>
+	<test name="pokey_random">
+		<fail on="Atari800 2.2.1" />
+		<fail on="Atari++ 1.60" />
+		<pass on="Altirra 1.9" />
+		<fail on="ASAP 2.1.2" />
+		<fail on="ASAP 3.0.0" />
+	</test>
+</tests>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/RESULTS.xsl kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/RESULTS.xsl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/RESULTS.xsl	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/RESULTS.xsl	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="html" />
+
+	<xsl:template match="/tests">
+		<html>
+			<head>
+				<title>ASAP test results</title>
+				<style>
+					table { border-collapse: collapse; }
+					th, td { border: solid black 1px; }
+					th, .name { background-color: #ccf; }
+					.pass { background-color: #cfc; }
+					.fail { background-color: #fcc; }
+					.pass, .fail { text-align: center; }
+				</style>
+			</head>
+			<body>
+				<table>
+					<tr>
+						<th>Test</th>
+						<th>Atari800 2.2.1</th>
+						<th>Atari++ 1.60</th>
+						<th>Altirra 1.9</th>
+						<th>ASAP 2.1.2</th>
+						<th>ASAP 3.0.0</th>
+					</tr>
+					<xsl:apply-templates />
+				</table>
+			</body>
+		</html>
+	</xsl:template>
+
+	<xsl:template match="test">
+		<tr>
+			<td class="name"><xsl:value-of select="@name" /></td>
+			<xsl:apply-templates select="*[@on='Atari800 2.2.1']" />
+			<xsl:apply-templates select="*[@on='Atari++ 1.60']" />
+			<xsl:apply-templates select="*[@on='Altirra 1.9']" />
+			<xsl:apply-templates select="*[@on='ASAP 2.1.2']" />
+			<xsl:apply-templates select="*[@on='ASAP 3.0.0']" />
+		</tr>
+	</xsl:template>
+
+	<xsl:template match="pass">
+		<td class="pass">Pass</td>
+	</xsl:template>
+
+	<xsl:template match="fail|crash">
+		<td class="fail">FAIL</td>
+	</xsl:template>
+</xsl:stylesheet>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/sapd_player_iflag.asx kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/sapd_player_iflag.asx
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/sapd_player_iflag.asx	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/sapd_player_iflag.asx	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,28 @@
+	opt	h-
+	dta	c'SAP',13,10
+	dta	c'AUTHOR "Piotr Fusik (0xF)"',13,10
+	dta	c'NAME "POKEY Pure Sound Test"',13,10
+	dta	c'DATE "09/06/2011"',13,10
+	dta	c'TYPE D',13,10
+	dta	c'INIT 3000',13,10
+	dta	c'PLAYER 3004',13,10
+	dta	c'TIME 00:05',13,10
+	opt	h+
+
+	org	f:$3000
+main
+	cli
+	jmp	*
+player
+	php
+	pla
+	ldx	#$30
+	ldy	#$af
+	and	#4
+	beq	izero
+	ldx	#$a0
+	ldy	#$cf
+izero
+	stx	^20
+	sty	^21
+	rts
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/test.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/test.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/test.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/test.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,54 @@
+ACIDSAP = ../Acid800/out/Release/AcidSAP/standalone
+
+# no user-configurable paths below this line
+
+TESTS = antic_nmires antic_nmist antic_vcount_ntsc antic_vcount_pal antic_wsync cpu_anx cpu_decimal cpu_las cpu_shx gtia_consol pokey_irqst pokey_pot pokey_potst pokey_random pokey_timerirq
+TESTS_SAP = $(TESTS:%=test/%.sap)
+
+check: asapscan $(ACIDSAP) $(TESTS_SAP)
+	@export passed=0 total=0; \
+		for name in $(ACIDSAP)/*.sap; do \
+			echo -n \*\ ; ./asapscan -a "$$name"; \
+			passed=$$(($$passed+!$$?)); total=$$(($$total+1)); \
+		done; \
+		echo PASSED $$passed of $$total tests
+	@export passed=0 total=0; \
+		for name in $(TESTS_SAP); do \
+			echo -n \*\ ; ./asapscan -a "$$name"; \
+			passed=$$(($$passed+!$$?)); total=$$(($$total+1)); \
+		done; \
+		echo PASSED $$passed of $$total tests
+.PHONY: check
+
+test/%.sap: $(srcdir)test/%.asx
+	$(XASM) -d SAP=1
+
+test/%_ntsc.sap: $(srcdir)test/%.asx
+	$(XASM) -d SAP=1 -d NTSC=1
+
+test/%_pal.sap: $(srcdir)test/%.asx
+	$(XASM) -d SAP=1 -d NTSC=0
+
+test/%.xex: $(srcdir)test/%.asx
+	$(XASM) -d SAP=0
+
+CLEAN += test/*.sap test/*.xex
+
+test/timevsnative: $(call src,test/timevsnative.c asap.[ch])
+	$(DO_CC)
+CLEAN += test/timevsnative
+
+test/loadsap.exe: $(call src,test/loadsap.cs csharp/asap.cs)
+	$(CSC)
+CLEAN += test/loadsap.exe
+
+test/ultrasap.exe: $(call src,test/ultrasap.cs csharp/asap.cs)
+	$(CSC)
+CLEAN += test/ultrasap.exe
+
+test/crashsap.exe: $(call src,test/crashsap.cs csharp/asap.cs)
+	$(CSC)
+CLEAN += test/crashsap.exe
+
+include $(srcdir)test/benchmark/benchmark.mk
+include $(srcdir)test/disasm/disasm.mk
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/timevsnative.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/timevsnative.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/timevsnative.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/timevsnative.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,76 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "asap.h"
+
+static int print_times(ASAPInfo *info, const char *filename, const unsigned char *module, int module_len)
+{
+	int sum = 0;
+	int song;
+	if (!ASAPInfo_Load(info, filename, module, module_len)) {
+		putchar('\n');
+		fprintf(stderr, "%s: cannot load\n", filename);
+		exit(1);
+	}
+	for (song = 0; song < ASAPInfo_GetSongs(info); song++) {
+		int duration = ASAPInfo_GetDuration(info, song);
+		unsigned char s[ASAPWriter_MAX_DURATION_LENGTH + 1];
+		int len = ASAPWriter_DurationToString(s, duration);
+		sum += duration;
+		putchar(song == 0 ? '\t' : ',');
+		if (len == 0)
+			printf("???");
+		else {
+			s[len] = '\0';
+			printf("%s", (const char *) s);
+			if (ASAPInfo_GetLoop(info, song))
+				printf(" LOOP");
+		}
+	}
+	return sum;
+}
+
+int main(int argc, char *argv[])
+{
+	const char *sap_filename;
+	FILE *fp;
+	unsigned char sap[ASAPInfo_MAX_MODULE_LENGTH];
+	int sap_len;
+	ASAPInfo *sap_info = ASAPInfo_New();
+	int sap_sum;
+	const char *native_ext;
+	ASAPInfo *native_info = ASAPInfo_New();
+	if (argc != 2) {
+		printf("Usage: timevsnative FILE.sap\n");
+		return 1;
+	}
+	sap_filename = argv[1];
+	fp = fopen(sap_filename, "rb");
+	if (fp == NULL) {
+		fprintf(stderr, "%s: cannot open\n", sap_filename);
+		return 1;
+	}
+	sap_len = fread(sap, 1, sizeof(sap), fp);
+	fclose(fp);
+	printf("%s", sap_filename);
+	sap_sum = print_times(sap_info, sap_filename, sap, sap_len);
+	native_ext = ASAPInfo_GetOriginalModuleExt(sap_info, sap, sap_len);
+	if (native_ext != NULL) {
+		ASAPWriter *writer = ASAPWriter_New();
+		char native_filename[FILENAME_MAX];
+		unsigned char native[ASAPInfo_MAX_MODULE_LENGTH];
+		int native_len;
+		printf("\t%s", native_ext);
+		sprintf(native_filename, "%.*s.%s", (int) (strrchr(sap_filename, '.') - sap_filename), sap_filename, native_ext);
+		ASAPWriter_SetOutput(writer, native, 0, sizeof(native));
+		native_len = ASAPWriter_Write(writer, native_filename, sap_info, sap, sap_len, FALSE);
+		ASAPWriter_Delete(writer);
+		if (native_len >= 0) {
+			int native_sum = print_times(native_info, native_filename, native, native_len);
+			printf("\t%d", abs(native_sum - sap_sum) / 1000);
+		}
+	}
+	putchar('\n');
+	return 0;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/ultrasap.cs kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/ultrasap.cs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/test/ultrasap.cs	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/test/ultrasap.cs	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,874 @@
+/*
+ * ultrasap.cs - create statistics of high tones in SAP files
+ *
+ * Copyright (C) 2011  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+using System;
+using System.IO;
+
+using Sf.Asap;
+
+public class UltraSap
+{
+	static void Check(ASAP asap, int[] n, int periodCycles, int audc)
+	{
+		if (periodCycles > 112)
+			return;
+		if ((audc & 0xf) == 0)
+			return;
+		audc >>= 4;
+		if (audc != 10 && audc != 14)
+			return;
+		n[periodCycles / 10]++;
+	}
+
+	public static int Main(string[] args)
+	{
+		if (args.Length == 0) {
+			Console.WriteLine("Usage: ultrasap path/to/ASMA");
+			return 1;
+		}
+		string asma = args[0];
+		ASAP asap = new ASAP();
+		byte[] buffer = new byte[885];
+		foreach (string file in Files) {
+			byte[] module = File.ReadAllBytes(Path.Combine(asma, file));
+			asap.Load(file, module, module.Length);
+			ASAPInfo info = asap.GetInfo();
+			for (int song = 0; song < info.GetSongs(); song++) {
+				int duration = info.GetDuration(song);
+				asap.PlaySong(song, duration);
+				int[] n = new int[12];
+				while (asap.Generate(buffer, buffer.Length, ASAPSampleFormat.U8) == buffer.Length) {
+					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles1, asap.Pokeys.BasePokey.Audc1);
+					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles2, asap.Pokeys.BasePokey.Audc2);
+					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles3, asap.Pokeys.BasePokey.Audc3);
+					Check(asap, n, asap.Pokeys.BasePokey.PeriodCycles4, asap.Pokeys.BasePokey.Audc4);
+				}
+				foreach (int i in n) {
+					if (i > 0) {
+						Console.Write(info.GetSongs() == 1 ? file : file + "#" + (song + 1));
+						foreach (int j in n)
+							Console.Write("\t{0}", j);
+						Console.WriteLine();
+						break;
+					}
+				}
+			}
+		}
+		return 0;
+	}
+
+	// files with high frequencies as identified by chksap.pl -s --features
+	static readonly string[] Files = {
+		"Composers/Anal_lysator/Bhogoosh.sap",
+		"Composers/Anal_lysator/Seban_Ty_Prosiaq.sap",
+		"Composers/Armijo_Richard_J/Cipher_of_Moving_Compass.sap",
+		"Composers/Armijo_Richard_J/Congrabalation.sap",
+		"Composers/Armijo_Richard_J/Congrabalation_Mono.sap",
+		"Composers/Armijo_Richard_J/Pokey_Axel_Foley.sap",
+		"Composers/Armijo_Richard_J/Those_Were_the_Good_Old_Da.sap",
+		"Composers/Badkowski_Marek/Deafman.sap",
+		"Composers/Badkowski_Marek/Drunklob.sap",
+		"Composers/Badkowski_Marek/Full_Shock.sap",
+		"Composers/Badkowski_Marek/Mental_Age_End.sap",
+		"Composers/Badkowski_Marek/Nemesis.sap",
+		"Composers/Balkowski_Krzysztof/Intro_X.sap",
+		"Composers/Balkowski_Krzysztof/sEXTOn_Is_Come_in.sap",
+		"Composers/Banas_Pawel/Shadow.sap",
+		"Composers/Banaszkiewicz_Marcin/Arena_Bzdur_Intro.sap",
+		"Composers/Banaszkiewicz_Marcin/Arena_Bzdur_Menu.sap",
+		"Composers/Banaszkiewicz_Michal/Hugo_1.sap",
+		"Composers/Banaszkiewicz_Michal/Hugo_2.sap",
+		"Composers/Banaszkiewicz_Michal/Hugo_6.sap",
+		"Composers/Bernasek_Jiri/Easy_Demo.sap",
+		"Composers/Bienias_Adam/Bitter_Reality_Flexible_Sq.sap",
+		"Composers/Bienias_Adam/Bitter_Reality_Greetings_P.sap",
+		"Composers/Bienias_Adam/Dimension_X.sap",
+		"Composers/Bienias_Adam/Hitsquad.sap",
+		"Composers/Bienias_Adam/Impression.sap",
+		"Composers/Bienias_Adam/Just_Fancy.sap",
+		"Composers/Bienias_Adam/LFF_Intro.sap",
+		"Composers/Bienias_Adam/Little_3.sap",
+		"Composers/Bienias_Adam/Ojej.sap",
+		"Composers/Billyard_Adam/Henri.sap",
+		"Composers/Brooke_Jason/Feud.sap",
+		"Composers/Bruenninski_Uwe/Synthy.sap",
+		"Composers/Ce_Pumpkin/Animkomials_Meets_Main.sap",
+		"Composers/Ce_Pumpkin/Bauvaneck.sap",
+		"Composers/Ce_Pumpkin/FrayerSmarker_Absent_Absyn.sap",
+		"Composers/Ce_Pumpkin/MyIDE_Demo_Zwei.sap",
+		"Composers/Ce_Pumpkin/Priceless.sap",
+		"Composers/Ce_Pumpkin/R0l0_8.sap",
+		"Composers/Ce_Pumpkin/Revenge_of_Ce_Pumpkin.sap",
+		"Composers/Ce_Pumpkin/Rolo_3.sap",
+		"Composers/Ce_Pumpkin/Rolo_6.sap",
+		"Composers/Ce_Pumpkin/Rulez_2.sap",
+		"Composers/Ce_Pumpkin/Songanim.sap",
+		"Composers/Ce_Pumpkin/Too_Hard_3.sap",
+		"Composers/Ce_Pumpkin/Too_Hard_4_1.sap",
+		"Composers/Ce_Pumpkin/Too_Hard_4_2.sap",
+		"Composers/Ce_Pumpkin/Too_Hard_4_Pomyje.sap",
+		"Composers/Cierkonski_Michal/Ergo_Bibamus_Trackmo.sap",
+		"Composers/Cierkonski_Michal/Fuckir.sap",
+		"Composers/Cierkonski_Michal/Ja_jo.sap",
+		"Composers/Cierkonski_Michal/Kaszana.sap",
+		"Composers/Cierkonski_Michal/Kowboj.sap",
+		"Composers/Cierkonski_Michal/Mixer_1.sap",
+		"Composers/Cierkonski_Michal/Scene_Register_5_0_Intro.sap",
+		"Composers/Cierkonski_Michal/Schizophrenics_Vision.sap",
+		"Composers/Cierkonski_Michal/The_Dream_3.sap",
+		"Composers/Cierkonski_Michal/Yeah_Yeah.sap",
+		"Composers/Cierkonski_Michal/Yo.sap",
+		"Composers/Cieslewicz_Tomasz/Koziol.sap",
+		"Composers/Cieslewicz_Tomasz/Nasze.sap",
+		"Composers/Claas_Clever/Time_to_Enjoy_Part_2.sap",
+		"Composers/Cornelius_Orall/Ruff_And_Reddy.sap",
+		"Composers/Cornelius_Orall/Sidewinder_2.sap",
+		"Composers/Cornelius_Orall/Slingshot.sap",
+		"Composers/Cornelius_Orall/Speed_Hawk.sap",
+		"Composers/Cornelius_Orall/Super_Soccer.sap",
+		"Composers/Cornelius_Orall/Tiger_Attack.sap",
+		"Composers/Czartynski_Marcin/Demo.sap",
+		"Composers/Czartynski_Marcin/Gravity_97_Invitro.sap",
+		"Composers/Czartynski_Marcin/Heretic_Crew_Limited_Dem_3.sap",
+		"Composers/Czartynski_Marcin/Journey.sap",
+		"Composers/Czartynski_Marcin/Journey_Alternative.sap",
+		"Composers/Czartynski_Marcin/Juzek.sap",
+		"Composers/Czartynski_Marcin/Rush_Hours_97_Invitro.sap",
+		"Composers/Czartynski_Marcin/Saper_Konstruktor.sap",
+		"Composers/Czartynski_Marcin/Slideshit_Intro.sap",
+		"Composers/Czartynski_Marcin/Titus_Slideshow.sap",
+		"Composers/Czlowiek_W_Atomizerze/500_Proc_Intro_Mustak.sap",
+		"Composers/Czlowiek_W_Atomizerze/Piua_TarCZoWA.sap",
+		"Composers/Czlowiek_W_Atomizerze/p0maranCZ0WA_plAma.sap",
+		"Composers/Diepenhorst_Marius/I_Will_Survive.sap",
+		"Composers/Diepenhorst_Marius/JHV_2k2_Demo.sap",
+		"Composers/Dojwa_Jacek/Jumping_Jack_Ingame.sap",
+		"Composers/Drozdowski_Marek/Help_Owsiak.sap",
+		"Composers/Drozdowski_Marek/Lemmings_Prevision_Intro.sap",
+		"Composers/Duesterhoeft_Stephan/ABBUC_8.sap",
+		"Composers/Duma_Dariusz/Bug_in_the_Mug.sap",
+		"Composers/Duma_Dariusz/Day_Without_Idea.sap",
+		"Composers/Duma_Dariusz/Follow_Your_Dream.sap",
+		"Composers/Duma_Dariusz/Izolation.sap",
+		"Composers/Duma_Dariusz/Lay_Down_and_Enjoy_It.sap",
+		"Composers/Duma_Dariusz/Murder_Intro.sap",
+		"Composers/Duma_Dariusz/Natural_Excess.sap",
+		"Composers/Duma_Dariusz/One_Fast_Day.sap",
+		"Composers/Duma_Dariusz/Rotten_Juice_Intro.sap",
+		"Composers/Duma_Dariusz/Smooth_Loop.sap",
+		"Composers/Duma_Dariusz/Superboy.sap",
+		"Composers/Eisenhammer_Zdenek/Deus_Ex_Machina.sap",
+		"Composers/Eisenhammer_Zdenek/Diamondz_Ingame.sap",
+		"Composers/Eisenhammer_Zdenek/Diamondz_Title.sap",
+		"Composers/Eisenhammer_Zdenek/Jozin_z_bazin.sap",
+		"Composers/Eisenhammer_Zdenek/Krakout.sap",
+		"Composers/Eisenhammer_Zdenek/Mind_Blast_Ingame.sap",
+		"Composers/Eisenhammer_Zdenek/Spellbound_Partial_Version.sap",
+		"Composers/Esquivel_Sal/ActRaiser_Level_1_1.sap",
+		"Composers/Esquivel_Sal/ActRaiser_Level_1_1_Stereo.sap",
+		"Composers/Esquivel_Sal/Battle_Squadron.sap",
+		"Composers/Esquivel_Sal/Battle_Squadron_Stereo.sap",
+		"Composers/Esquivel_Sal/Blaster_Master_Level_1.sap",
+		"Composers/Esquivel_Sal/Blaster_Master_Level_1_Ste.sap",
+		"Composers/Esquivel_Sal/Crocketts_Theme.sap",
+		"Composers/Esquivel_Sal/Every_Breath_You_Take.sap",
+		"Composers/Esquivel_Sal/Gemini_Man.sap",
+		"Composers/Esquivel_Sal/Hybris_Title.sap",
+		"Composers/Esquivel_Sal/Mega_Man_III_Sparkman.sap",
+		"Composers/Esquivel_Sal/Obliterator_Stereo.sap",
+		"Composers/Esquivel_Sal/OutRun_Magical_Sound_Sho_S.sap",
+		"Composers/Esquivel_Sal/OutRun_Magical_Sound_Showe.sap",
+		"Composers/Esquivel_Sal/OutRun_Splash_Wave.sap",
+		"Composers/Esquivel_Sal/OutRun_Splash_Wave_Stereo.sap",
+		"Composers/Esquivel_Sal/Outrun_Passing_Breeze.sap",
+		"Composers/Esquivel_Sal/Outrun_Passing_Breeze_Ster.sap",
+		"Composers/Esquivel_Sal/Space_Harrier_Godarni.sap",
+		"Composers/Esquivel_Sal/Space_Harrier_Lakeside_Mem.sap",
+		"Composers/Esquivel_Sal/Space_Harrier_White_Summer.sap",
+		"Composers/Esquivel_Sal/Space_Harrier_Wiwi_Jumbo.sap",
+		"Composers/Esquivel_Sal/Stardust_Memories.sap",
+		"Composers/Esquivel_Sal/Tempest_Xtreem_Song_One.sap",
+		"Composers/Esquivel_Sal/Tempest_Xtreem_Song_Three.sap",
+		"Composers/Esquivel_Sal/Tempest_Xtreem_Song_Two.sap",
+		"Composers/Esquivel_Sal/Tempest_Xtreem_Title_Song.sap",
+		"Composers/Esquivel_Sal/Toobin.sap",
+		"Composers/Esquivel_Sal/Toobin_Title.sap",
+		"Composers/Esquivel_Sal/Trans_Atlantic.sap",
+		"Composers/Ezcan_Kemal/Digiloo_Digiley.sap",
+		"Composers/Ezcan_Kemal/Globetrotter.sap",
+		"Composers/Farkas_Felker/ABBUC_36.sap",
+		"Composers/Farkas_Felker/Joyride_End.sap",
+		"Composers/Farkas_Felker/Joyride_Juggler.sap",
+		"Composers/Farkas_Felker/Joyride_Landscape.sap",
+		"Composers/Farkas_Felker/Joyride_Scrolls.sap",
+		"Composers/Farkas_Felker/Joyride_Turn_Disk.sap",
+		"Composers/Farkas_Felker/Joyride_Twirl.sap",
+		"Composers/Feske_Nils/Tambumbi.sap",
+		"Composers/Feske_Nils/Twista.sap",
+		"Composers/Galinski_Adrian/Demology_2.sap",
+		"Composers/Gilbertson_Gary/Alternate_Reality_City_Dan.sap",
+		"Composers/Gilbertson_Gary/Alternate_Reality_City_Int.sap",
+		"Composers/Gilbertson_Gary/Alternate_Reality_City_Smi.sap",
+		"Composers/Gilmore_Adam/Zybex.sap",
+		"Composers/Godlewski_Artur/Sea.sap",
+		"Composers/Goff_Mark/Me_and_Ui_Jumping_in_the_S.sap",
+		"Composers/Goff_Mark/crab_in_a_cave_final_boss.sap",
+		"Composers/Goff_Mark/seaweed_cipst_underwater.sap",
+		"Composers/Golewski_Filip/Another_Speedtro.sap",
+		"Composers/Golewski_Filip/Big_Zine_1_Greetings.sap",
+		"Composers/Golewski_Filip/Black.sap",
+		"Composers/Golewski_Filip/Crazy_Magazine_1_2.sap",
+		"Composers/Golewski_Filip/Date.sap",
+		"Composers/Golewski_Filip/Future.sap",
+		"Composers/Golewski_Filip/Heal.sap",
+		"Composers/Golewski_Filip/Label.sap",
+		"Composers/Golewski_Filip/SFW.sap",
+		"Composers/Golewski_Filip/Story_Module.sap",
+		"Composers/Golewski_Filip/TRC.sap",
+		"Composers/Golewski_Filip/Tekkno.sap",
+		"Composers/Golewski_Filip/Walenie_W_Stolek.sap",
+		"Composers/Grad_Jacek/Grom.sap",
+		"Composers/Grad_Jacek/Twarze_i_Cienie.sap",
+		"Composers/Grayscale/Chromaluma.sap",
+		"Composers/Grayscale/DrillDance.sap",
+		"Composers/Grayscale/Gray_Set_Willy.sap",
+		"Composers/Grayscale/Irish_Wood.sap",
+		"Composers/Grayscale/Jam_Session.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Alive.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Alone.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Back_To_Life_2.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Cause_It_Hurts.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Czubeck_Parejd.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Deep_Kick.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Detox.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Expectancy.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Expression_2.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Extreme.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Extremely_Flammable.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/For_Replay.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Heartbreaker.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Hip.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Hope_1999.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Misunderstanding.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/One_Little_Step.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Poor_Rock_n_Roll.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Reborn.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Sabbath_2.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Sadness.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Schizofrenia.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Short_Reflex.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Slim_to_none.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/So_Alone.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Soul_Breakin.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Szczur.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Szwindel.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Total_Eclipse.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Transmission_Into_Your_Hea.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Tribute_to.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Ultra.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Ultrance.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/UnderTrencinPressure.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Voice_of_Silence_III_Previ.sap",
+		"Composers/Grayscale/Kwiatek_Grzegorz/Voice_of_Silence_IV.sap",
+		"Composers/Grayscale/Pneumatic_Driller.sap",
+		"Composers/Grayscale/Running_Emu.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/ABC_Ingame.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Accident.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Andal.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Barymag_2_5.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Beer_Bibber.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Boremloza.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Cabil.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Czarna_dziura_w_dupie.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Dziobaty.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Falex.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Genia.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Glikol.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Happy_Oriental_Kids.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Kasz.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Klita.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Kowip.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Mepss.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Mixer.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Porazka_3_KamiBa.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Rake_in_Church.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Smell_Illusion.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Swift_Ray.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/Time_Is_Get_Rid_of_Grandfa.sap",
+		"Composers/Grayscale/Sychowicz_Lukasz/X_Ray_2.sap",
+		"Composers/Grayscale/Wasiel_Bartek/Dropsy_King.sap",
+		"Composers/Grayscale/Wasiel_Bartek/Too_Late.sap",
+		"Composers/Grayscale/Windy_Mind.sap",
+		"Composers/Grayscale/WooBooDoo.sap",
+		"Composers/Hay_Adam/Amegas.sap",
+		"Composers/Hay_Adam/Approachong.sap",
+		"Composers/Hay_Adam/Gyges_Will_You_Help_Me.sap",
+		"Composers/Hay_Adam/Hawkeye.sap",
+		"Composers/Hay_Adam/Psilocybe_Mexicana.sap",
+		"Composers/Hay_Adam/Reaxion_Title.sap",
+		"Composers/Hay_Adam/Wiz.sap",
+		"Composers/Holda_Leszek/Klatwa_Ingame.sap",
+		"Composers/Hryn_Piotr/Party_5.sap",
+		"Composers/Hubbard_Rob/Extirpator.sap",
+		"Composers/Hubbard_Rob/International_Karate.sap",
+		"Composers/Hubbard_Rob/Jet_Set_Willy.sap",
+		"Composers/Hubbard_Rob/Warhawk.sap",
+		"Composers/Hudak_Matej/Shorty_Noises.sap",
+		"Composers/Huntington_Glenys/Capt_Stickys_Gold.sap",
+		"Composers/Huntington_Glenys/Fire_Chief.sap",
+		"Composers/Huntington_Glenys/Robin_Hood.sap",
+		"Composers/Husak_Jakub/Problem_Jasia_Ingame.sap",
+		"Composers/Husak_Jakub/Rycerz.sap",
+		"Composers/Husak_Jakub/Thinker_1.sap",
+		"Composers/Iwaszko_Krystian/Droga_do_Duplandu.sap",
+		"Composers/Iwaszko_Krystian/Dziad_sie_jara.sap",
+		"Composers/Iwaszko_Krystian/Every_Bone_Broken.sap",
+		"Composers/Iwaszko_Krystian/Hooy_F.sap",
+		"Composers/Iwaszko_Krystian/IK_Crazy_Remix.sap",
+		"Composers/Iwaszko_Krystian/Konduktor_Przyjacielem_Jes.sap",
+		"Composers/Iwaszko_Krystian/Mechanic.sap",
+		"Composers/Iwaszko_Krystian/No_Name.sap",
+		"Composers/Iwaszko_Krystian/Pies_drapie_sie_po_jajach.sap",
+		"Composers/Iwaszko_Krystian/R2K440.sap",
+		"Composers/Iwaszko_Krystian/Samantha.sap",
+		"Composers/Iwaszko_Krystian/Satan_Huj.sap",
+		"Composers/Iwaszko_Krystian/Satan_Rox.sap",
+		"Composers/Iwaszko_Krystian/THC_Kokot.sap",
+		"Composers/Iwaszko_Krystian/THC_Rulla.sap",
+		"Composers/Iwaszko_Krystian/THC_TMC.sap",
+		"Composers/Iwaszko_Krystian/XC12.sap",
+		"Composers/Iwaszko_Krystian/Z53.sap",
+		"Composers/Iwaszko_Krystian/Zielony_Naplet.sap",
+		"Composers/Jastrzemski_Marcin/Czdkom_2.sap",
+		"Composers/Jastrzemski_Marcin/Fox.sap",
+		"Composers/Johnson_Steve/Enemy_Within.sap",
+		"Composers/Kalinowski_Bartosz/Barymag_1_Intro.sap",
+		"Composers/Kalinowski_Bartosz/Hcl5.sap",
+		"Composers/Kalinowski_Bartosz/Kapitan_Planeta.sap",
+		"Composers/Kalinowski_Bartosz/Robin_Wojownik_Czasu.sap",
+		"Composers/Kalinowski_Bartosz/Self_Test_2.sap",
+		"Composers/Kalinowski_Bartosz/Sweet_Illusions_Shadebobs.sap",
+		"Composers/Kalinowski_Bartosz/Zepi.sap",
+		"Composers/Kalinowski_Bartosz/Zeus.sap",
+		"Composers/Karpowicz_Henryk/Koleda_1.sap",
+		"Composers/Karwacki_Jakub/East_Party_2003_Invi_Intro.sap",
+		"Composers/Karwacki_Jakub/Lanos.sap",
+		"Composers/Karwacki_Jakub/Lark.sap",
+		"Composers/Karwacki_Jakub/Qwerty.sap",
+		"Composers/Karwoth_Torsten/Demo_1.sap",
+		"Composers/Karwoth_Torsten/FOFT.sap",
+		"Composers/Kazimierczak_Leszek/Bad_Girl.sap",
+		"Composers/Kazimierczak_Leszek/Megata_Zine_1_Intro.sap",
+		"Composers/Kidaj_Andrzej/Minier.sap",
+		"Composers/Kidaj_Andrzej/Yamaha.sap",
+		"Composers/Kociuba_Dariusz/Odezwa_3_Lobo.sap",
+		"Composers/Kociuba_Dariusz/Salcesonfix_Zine.sap",
+		"Composers/Kociuba_Dariusz/Vioris.sap",
+		"Composers/Kolakowski_Daniel/Mozart_01.sap",
+		"Composers/Kolakowski_Daniel/Unite.sap",
+		"Composers/Krawczyk_Adam/Magic_Dimension_1.sap",
+		"Composers/Krix_Mario/Breakthrung.sap",
+		"Composers/Krix_Mario/Complex.sap",
+		"Composers/Krix_Mario/Dragon_Fine.sap",
+		"Composers/Krix_Mario/Panther.sap",
+		"Composers/Krix_Mario/Satisfaction.sap",
+		"Composers/Krix_Mario/Sll1.sap",
+		"Composers/Krix_Mario/Slow.sap",
+		"Composers/Krix_Mario/Stardust_Memories.sap",
+		"Composers/Krix_Mario/TT.sap",
+		"Composers/Krix_Mario/Zeldahm.sap",
+		"Composers/Kucharski_Konrad/Piczka.sap",
+		"Composers/Kucisz_Tomasz/Network.sap",
+		"Composers/Kuczek_Ireneusz/Echo.sap",
+		"Composers/Kuczek_Ireneusz/Mama.sap",
+		"Composers/Kuczek_Ireneusz/Said_I_Love_You.sap",
+		"Composers/Kulinski_Grzegorz/Psy_hoza.sap",
+		"Composers/Kulinski_Grzegorz/Yeah.sap",
+		"Composers/Lajciak_Pavol/R_Type.sap",
+		"Composers/Lajciak_Pavol/This_One_Comes_from_Slovak.sap",
+		"Composers/Lajciak_Pavol/Wild_Jet.sap",
+		"Composers/Lepkowski_Michal/Blackout.sap",
+		"Composers/Lepkowski_Michal/Cypress.sap",
+		"Composers/Lepkowski_Michal/Likuit_4k.sap",
+		"Composers/Lepkowski_Michal/Odyssey_of_the_Mind.sap",
+		"Composers/Lepkowski_Michal/Tekblast_Ingame_2.sap",
+		"Composers/Lepkowski_Michal/Vengeance_Main_Part.sap",
+		"Composers/Lewandowski_Marcin/Grunwald_1410_Ingame_2.sap",
+		"Composers/Libic_Ladislav/Lac_Intro_II_part_6.sap",
+		"Composers/Liebich_Tomasz/Alien.sap",
+		"Composers/Liebich_Tomasz/Dictum_Acerbum.sap",
+		"Composers/Liebich_Tomasz/Drack.sap",
+		"Composers/Liebich_Tomasz/Duksap_1.sap",
+		"Composers/Liebich_Tomasz/Fluid_Kha_Intro.sap",
+		"Composers/Liebich_Tomasz/Hawkmoon.sap",
+		"Composers/Liebich_Tomasz/Nemesis_2.sap",
+		"Composers/Liebich_Tomasz/Perestroyka_Left_Channel.sap",
+		"Composers/Liebich_Tomasz/Perestroyka_Right_Channel.sap",
+		"Composers/Liebich_Tomasz/Sky_Computer_Network.sap",
+		"Composers/Liebich_Tomasz/Technus.sap",
+		"Composers/Liebich_Tomasz/Ucieczka.sap",
+		"Composers/Lis_Marcin/Pyramid_Ingame.sap",
+		"Composers/Lis_Piotr/Wyjasnijmy_to_sobie.sap",
+		"Composers/Luberda_Michal/Barahir_Ingame.sap",
+		"Composers/Luberda_Michal/Frank_and_Mark_Ingame.sap",
+		"Composers/Luberda_Michal/Kernaw.sap",
+		"Composers/Luberda_Michal/Kernaw_Ingame.sap",
+		"Composers/Luberda_Michal/U235.sap",
+		"Composers/Maderanek_Peter/Avex_1.sap",
+		"Composers/Majchrzak_Marcin/D_City.sap",
+		"Composers/Majchrzak_Marcin/Faza_4_Mona.sap",
+		"Composers/Majchrzak_Marcin/Psychodela.sap",
+		"Composers/Majchrzak_Marcin/Techno_Collection_4.sap",
+		"Composers/Majewski_Tomasz/Copy_Party_1996_Info.sap",
+		"Composers/Majewski_Tomasz/Detonator_Title.sap",
+		"Composers/Majewski_Tomasz/Detonator_Winner.sap",
+		"Composers/Majewski_Tomasz/Hellgate.sap",
+		"Composers/Majewski_Tomasz/Lunapark.sap",
+		"Composers/Majewski_Tomasz/Ninja.sap",
+		"Composers/Majewski_Tomasz/Outsider.sap",
+		"Composers/Majewski_Tomasz/Riders_From_The_Stars.sap",
+		"Composers/Majewski_Tomasz/The_Truth_Is_Out_There.sap",
+		"Composers/Maris_John/Mines.sap",
+		"Composers/Martin_Aleksander/Bobsland.sap",
+		"Composers/Martin_Aleksander/Kit_14.sap",
+		"Composers/Martin_Aleksander/Max_Ingame.sap",
+		"Composers/Martin_Aleksander/More.sap",
+		"Composers/Martin_Aleksander/Mr_Proper.sap",
+		"Composers/Martin_Aleksander/Mr_Proper_Ingame.sap",
+		"Composers/Martin_Aleksander/Mr_Proper_Ingame_2.sap",
+		"Composers/Martin_Aleksander/Sheol_side_A.sap",
+		"Composers/Martin_Aleksander/Timeless_Announcemt_Load_5.sap",
+		"Composers/Martin_Aleksander/Unknown.sap",
+		"Composers/Martin_Chris/After_the_Storm.sap",
+		"Composers/Martin_Chris/Approachong.sap",
+		"Composers/Martin_Chris/Approachong_stereo.sap",
+		"Composers/Martin_Chris/Blue_Monday.sap",
+		"Composers/Martin_Chris/Crystal_Hammer.sap",
+		"Composers/Martin_Chris/Cybernoid_Song.sap",
+		"Composers/Martin_Chris/Deflector.sap",
+		"Composers/Martin_Chris/Ecstacy_Song.sap",
+		"Composers/Martin_Chris/Fairlightning.sap",
+		"Composers/Martin_Chris/Popcorn_Song.sap",
+		"Composers/Martin_Chris/Push_Maxi_Re_Mix.sap",
+		"Composers/Matoga_Adrian/Meryb.sap",
+		"Composers/Matoga_Adrian/Scream.sap",
+		"Composers/Matyasik_Krzysztof/Atak_serca.sap",
+		"Composers/Matyasik_Krzysztof/Karkoweczka.sap",
+		"Composers/Matyasik_Krzysztof/Koninka.sap",
+		"Composers/Matyasik_Krzysztof/Ogluszacz_Intro.sap",
+		"Composers/Matyasik_Krzysztof/Pretty_Chlebek.sap",
+		"Composers/Matyasik_Krzysztof/Schabik.sap",
+		"Composers/Matyasik_Krzysztof/Wieprzowinka.sap",
+		"Composers/Matyasik_Krzysztof/Wolowinka.sap",
+		"Composers/Matyasik_Krzysztof/Wolowinka_Sampled.sap",
+		"Composers/Mikolajczak_Pawel/Zbir.sap",
+		"Composers/Mrozowski_Robert/Going_to_California.sap",
+		"Composers/Munns_Richard/Black_Lamp.sap",
+		"Composers/Munns_Richard/Black_Lamp_Ingame.sap",
+		"Composers/Munns_Richard/Crumbles_Crisis.sap",
+		"Composers/Munns_Richard/Filthy_Rich.sap",
+		"Composers/Munns_Richard/Plastron.sap",
+		"Composers/Munns_Richard/Rebound.sap",
+		"Composers/Munns_Richard/Tagalon.sap",
+		"Composers/Munns_Richard/Tube_Baddies.sap",
+		"Composers/Munns_Richard/Zero_War.sap",
+		"Composers/Murray_Chris/Winter_Games_88_Biathlon.sap",
+		"Composers/Murray_Chris/Winter_Games_88_Bobsled.sap",
+		"Composers/Murray_Chris/Winter_Games_88_Downhill.sap",
+		"Composers/Murray_Chris/Winter_Games_88_Ski_Jump.sap",
+		"Composers/Murray_Chris/Winter_Games_88_Slalom.sap",
+		"Composers/Nedved_Vojtech/Amelie.sap",
+		"Composers/Nedved_Vojtech/Aoki.sap",
+		"Composers/Nedved_Vojtech/Rudi_Extrudi_Goes_to_Pragu.sap",
+		"Composers/Numan_Daniel/Dwuetyloamid.sap",
+		"Composers/Numan_Daniel/Komercja.sap",
+		"Composers/Numan_Daniel/Motherfuckin_Bitch_Wodecka.sap",
+		"Composers/Numan_Daniel/Pentagram_2_Info.sap",
+		"Composers/Numan_Daniel/Pentagram_3_Music_1.sap",
+		"Composers/Numan_Daniel/Pentagram_3_Music_3.sap",
+		"Composers/Numan_Daniel/Pentagram_4_Silence.sap",
+		"Composers/Numan_Daniel/Psychodelic_Acied.sap",
+		"Composers/Numan_Daniel/Raving_Vieprz_1.sap",
+		"Composers/Numan_Daniel/THC_Vibration.sap",
+		"Composers/Numan_Daniel/Vasco_Public_Domain_10_3.sap",
+		"Composers/Oglodek_Marek/Odsyfka.sap",
+		"Composers/Oscadal_Filip/Balleantro.sap",
+		"Composers/Oscadal_Filip/Brutal_Recall_Demo.sap",
+		"Composers/Oscadal_Filip/Lemmings_Intro.sap",
+		"Composers/Oscadal_Filip/Lemmings_Intro_2.sap",
+		"Composers/Oscadal_Filip/Vaxeen_Photographic.sap",
+		"Composers/Padula_Jaroslaw/Horror.sap",
+		"Composers/Padula_Jaroslaw/Keczapek.sap",
+		"Composers/Padula_Jaroslaw/Men_02.sap",
+		"Composers/Padula_Jaroslaw/Przepraszam.sap",
+		"Composers/Padula_Jaroslaw/Reason.sap",
+		"Composers/Padula_Jaroslaw/So_Old.sap",
+		"Composers/Padula_Jaroslaw/Some_Nice_AB.sap",
+		"Composers/Padula_Jaroslaw/Tech2.sap",
+		"Composers/Padula_Jaroslaw/Techno_Collection_1.sap",
+		"Composers/Padula_Jaroslaw/Toy_Intro.sap",
+		"Composers/Padula_Jaroslaw/Very_Very.sap",
+		"Composers/Padula_Jaroslaw/Wave_X.sap",
+		"Composers/Padula_Jaroslaw/Xc9012.sap",
+		"Composers/Padula_Jaroslaw/Z.sap",
+		"Composers/Panopticum/Atari.sap",
+		"Composers/Panopticum/Autumn.sap",
+		"Composers/Panopticum/Bonanza.sap",
+		"Composers/Panopticum/Guns.sap",
+		"Composers/Panopticum/Morze.sap",
+		"Composers/Panopticum/Motor.sap",
+		"Composers/Panopticum/Musiczka.sap",
+		"Composers/Panopticum/Summer.sap",
+		"Composers/Pasiecznik_Michal/Damned.sap",
+		"Composers/Pasiecznik_Michal/Damned_Remix.sap",
+		"Composers/Pelc_Janusz/Captain_Gather.sap",
+		"Composers/Pelc_Janusz/Lasermania.sap",
+		"Composers/Pelc_Janusz/Winner.sap",
+		"Composers/Pesout_Marek/Acid_1.sap",
+		"Composers/Pesout_Marek/Anger.sap",
+		"Composers/Pesout_Marek/Asylum.sap",
+		"Composers/Pesout_Marek/Bad_Drome.sap",
+		"Composers/Pesout_Marek/Blade_Runner.sap",
+		"Composers/Pesout_Marek/Bounce.sap",
+		"Composers/Pesout_Marek/Czech_Sound_2.sap",
+		"Composers/Pesout_Marek/Delirium.sap",
+		"Composers/Pesout_Marek/Destruction.sap",
+		"Composers/Pesout_Marek/Dick_Tracy.sap",
+		"Composers/Pesout_Marek/Gangsters.sap",
+		"Composers/Pesout_Marek/Genlog.sap",
+		"Composers/Pesout_Marek/Lemmblaster.sap",
+		"Composers/Pesout_Marek/Liftboy.sap",
+		"Composers/Pesout_Marek/Megamix.sap",
+		"Composers/Pesout_Marek/Messiah_from_Outer_Space.sap",
+		"Composers/Pesout_Marek/Molecula.sap",
+		"Composers/Pesout_Marek/Paegas.sap",
+		"Composers/Pesout_Marek/Paradise.sap",
+		"Composers/Pesout_Marek/Peach.sap",
+		"Composers/Pesout_Marek/Picture_H_I_P.sap",
+		"Composers/Pesout_Marek/Science.sap",
+		"Composers/Pesout_Marek/Shadow.sap",
+		"Composers/Pesout_Marek/Swamp_Thing.sap",
+		"Composers/Pesout_Marek/T_Rex.sap",
+		"Composers/Pesout_Marek/Techwalk.sap",
+		"Composers/Pesout_Marek/Tekk_Drums_1.sap",
+		"Composers/Pesout_Marek/Tekkno_Experience_part_2_1.sap",
+		"Composers/Pesout_Marek/Tekkno_Experience_part_2_2.sap",
+		"Composers/Pesout_Marek/Ticket.sap",
+		"Composers/Pesout_Marek/Tribal.sap",
+		"Composers/Pesout_Marek/Who_3.sap",
+		"Composers/Piscol_Juergen/Atari_Variationen.sap",
+		"Composers/Piscol_Juergen/Synthi_1.sap",
+		"Composers/Podedworny_Wojtek/Pandemonium.sap",
+		"Composers/Podedworny_Wojtek/Wizard.sap",
+		"Composers/Potter_Mike/Chicken.sap",
+		"Composers/Potter_Mike/Plaque_Man.sap",
+		"Composers/Potter_Mike/Protector.sap",
+		"Composers/Potter_Mike/Protector_II.sap",
+		"Composers/Potter_Mike/Shadow_World.sap",
+		"Composers/Przybyszewski_Krzysztof/Blasta_Basta.sap",
+		"Composers/Przybyszewski_Krzysztof/Darkness_Subway.sap",
+		"Composers/Przybyszewski_Krzysztof/Fast_Excess.sap",
+		"Composers/Przybyszewski_Krzysztof/Happy_97.sap",
+		"Composers/Przybyszewski_Krzysztof/Lama.sap",
+		"Composers/Przybyszewski_Krzysztof/Lokowka_Szal.sap",
+		"Composers/Przybyszewski_Krzysztof/Place_in_the_Space.sap",
+		"Composers/Przybyszewski_Krzysztof/Room.sap",
+		"Composers/Przybyszewski_Krzysztof/Siphon.sap",
+		"Composers/Przybyszewski_Krzysztof/Spawik.sap",
+		"Composers/Pucinski_Rafal/AR_1.sap",
+		"Composers/Pucinski_Rafal/Anty_SS_Zine_2.sap",
+		"Composers/Pucinski_Rafal/Disk.sap",
+		"Composers/Pucinski_Rafal/Memory.sap",
+		"Composers/Pucinski_Rafal/Warrior.sap",
+		"Composers/Radecki_Michal/Ilusia.sap",
+		"Composers/Radecki_Michal/Kostka.sap",
+		"Composers/Radzikowski_Ireneusz/Another_Day_in_Paradise.sap",
+		"Composers/Radzikowski_Ireneusz/Back_to_Life.sap",
+		"Composers/Radzikowski_Ireneusz/Christmas_mix.sap",
+		"Composers/Radzikowski_Ireneusz/Comeback.sap",
+		"Composers/Radzikowski_Ireneusz/Cyper_Space.sap",
+		"Composers/Radzikowski_Ireneusz/Draconus_Remix.sap",
+		"Composers/Radzikowski_Ireneusz/Escape_from_the_Orbit.sap",
+		"Composers/Radzikowski_Ireneusz/Historia_Niespelnionych_4.sap",
+		"Composers/Radzikowski_Ireneusz/Puzmania.sap",
+		"Composers/Radzikowski_Ireneusz/Savage_Intro.sap",
+		"Composers/Radzikowski_Ireneusz/The_Best_Car.sap",
+		"Composers/Rentgen/Victoria_JHS_Hidden_1.sap",
+		"Composers/Roemer_Markus/Biene_Maja.sap",
+		"Composers/Rymorz_W/Arkanoid_II.sap",
+		"Composers/Scarim_Nicholas/Spy_vs_Spy_Arctic_Antics.sap",
+		"Composers/Skwiot_Stanislaw/Fortuna.sap",
+		"Composers/Stanik_Krzysztof/Ble_ble_ble.sap",
+		"Composers/Stanik_Krzysztof/Mroczny.sap",
+		"Composers/Sterba_Radek/Android.sap",
+		"Composers/Sterba_Radek/Astro4road.sap",
+		"Composers/Sterba_Radek/Basix.sap",
+		"Composers/Sterba_Radek/Cervi2.sap",
+		"Composers/Sterba_Radek/Cubico.sap",
+		"Composers/Sterba_Radek/Enigma_part_2.sap",
+		"Composers/Sterba_Radek/First.sap",
+		"Composers/Sterba_Radek/Flop_Magazin_30_Just_Now.sap",
+		"Composers/Sterba_Radek/Flop_Magazin_31.sap",
+		"Composers/Sterba_Radek/Flop_Magazin_31_Christmas.sap",
+		"Composers/Sterba_Radek/Flop_Magazin_33.sap",
+		"Composers/Sterba_Radek/Flop_Magazin_36_38.sap",
+		"Composers/Sterba_Radek/Flop_Magazin_40.sap",
+		"Composers/Sterba_Radek/Gem_x.sap",
+		"Composers/Sterba_Radek/Illusion_2.sap",
+		"Composers/Sterba_Radek/Indiana_Jones_4.sap",
+		"Composers/Sterba_Radek/L45t_M1nut3.sap",
+		"Composers/Sterba_Radek/Music.sap",
+		"Composers/Sterba_Radek/Naturix_Tune_2.sap",
+		"Composers/Sterba_Radek/Posthelper.sap",
+		"Composers/Sterba_Radek/Posthelper_Tune_3.sap",
+		"Composers/Sterba_Radek/Predator.sap",
+		"Composers/Strobe/Romantic_Squirrelwedding_i.sap",
+		"Composers/Strobe/Star_Legend_Mainscreen_Int.sap",
+		"Composers/Strobe/Town_of_Ui.sap",
+		"Composers/Strzelec_Pawel/Miny.sap",
+		"Composers/Szczesniak_Konrad/3d24_1.sap",
+		"Composers/Szczesniak_Konrad/3d24_2.sap",
+		"Composers/Szczesniak_Maciek/Das_Anty_Adolf_Demo_1.sap",
+		"Composers/Szpilowski_Michal/7_Gates_of_Jambala.sap",
+		"Composers/Szpilowski_Michal/Bomb_Jack.sap",
+		"Composers/Szpilowski_Michal/Cherry_Rave_Experimental.sap",
+		"Composers/Szpilowski_Michal/Das_Boot_X.sap",
+		"Composers/Szpilowski_Michal/Docent.sap",
+		"Composers/Szpilowski_Michal/Galaxia_Ingame.sap",
+		"Composers/Szpilowski_Michal/Game_Over.sap",
+		"Composers/Szpilowski_Michal/Isora.sap",
+		"Composers/Szpilowski_Michal/Kaktus.sap",
+		"Composers/Szpilowski_Michal/Mayhem_X.sap",
+		"Composers/Szpilowski_Michal/Moscow_1993_Stage_1.sap",
+		"Composers/Szpilowski_Michal/My_First_One_RMT.sap",
+		"Composers/Szpilowski_Michal/Nexus_Ingame_2.sap",
+		"Composers/Szpilowski_Michal/Ocean_Detox.sap",
+		"Composers/Szpilowski_Michal/Poseidon.sap",
+		"Composers/Szpilowski_Michal/Postcard_from_Middle_East.sap",
+		"Composers/Szpilowski_Michal/Rondell.sap",
+		"Composers/Szpilowski_Michal/Serious_Magazine_3_4.sap",
+		"Composers/Szpilowski_Michal/Sexy_Six_Alfa_Title.sap",
+		"Composers/Szpilowski_Michal/Some_Song_Remixed.sap",
+		"Composers/Szpilowski_Michal/Song_12.sap",
+		"Composers/Szpilowski_Michal/Teacher_Killer.sap",
+		"Composers/Szpilowski_Michal/Techdrum.sap",
+		"Composers/Szpilowski_Michal/Unknown_Game.sap",
+		"Composers/Szpilowski_Michal/X_Demo_Main_Part.sap",
+		"Composers/Szpilowski_Michal/X_Mass_Greetings_Part.sap",
+		"Composers/Szpilowski_Michal/Yie_Ar_Kung_Fu.sap",
+		"Composers/Szpilowski_Michal/rAmols_Revenge.sap",
+		"Composers/Szymczuk_Daniel/Loriens_Tomb_Game_Over.sap",
+		"Composers/Takacs_Gabriel/Cappela.sap",
+		"Composers/Takacs_Gabriel/Trash.sap",
+		"Composers/Tegethoff_Sven/Roller.sap",
+		"Composers/Tegethoff_Sven/The_Top_2_2.sap",
+		"Composers/Ui/3_Joonkiz_Skullz.sap",
+		"Composers/Ui/Los_Osos_hablan_en_Marte.sap",
+		"Composers/Verdaasdonk_Robert/Unconventional_2000.sap",
+		"Composers/Vila_Jaime/Gyruss_Stereo.sap",
+		"Composers/Vila_Jaime/Megamix_Atari.sap",
+		"Composers/Vila_Jaime/Short_Song.sap",
+		"Composers/Vogt_Dariusz/DJ_V_4.sap",
+		"Composers/Vogt_Dariusz/DJ_V_9.sap",
+		"Composers/Vogt_Dariusz/Leiser_Intro.sap",
+		"Composers/Vybostok_Marian/Alpha.sap",
+		"Composers/Vybostok_Marian/Bristly_Hedgehog.sap",
+		"Composers/Vybostok_Marian/Bristly_Hedgehog_Megamix.sap",
+		"Composers/Vybostok_Marian/Wanted_Part_1.sap",
+		"Composers/Vybostok_Marian/Wanted_Part_3_1.sap",
+		"Composers/Vybostok_Marian/Wanted_Part_4_Mix.sap",
+		"Composers/Vybostok_Marian/Wanted_Part_4_Zeus_Mix.sap",
+		"Composers/Wasilewski_Dariusz/Daras.sap",
+		"Composers/Wasilewski_Dariusz/Labirynt_Smierci.sap",
+		"Composers/Whittaker_David/Amaurote.sap",
+		"Composers/Whittaker_David/Grand_Prix_Simulator.sap",
+		"Composers/Whittaker_David/Panther.sap",
+		"Composers/Whittaker_David/Red_Max.sap",
+		"Composers/Whittaker_David/Trans_Muter.sap",
+		"Composers/Wisniewski_Mateusz/High_Tide.sap",
+		"Composers/Wisniewski_Mateusz/Sillyventure_2k4_Inv.sap",
+		"Composers/Witkiewicz_Dariusz/Dragon.sap",
+		"Composers/Witkiewicz_Dariusz/Grass_Slideshow_End.sap",
+		"Games/Alien_Ambush.sap",
+		"Games/Andromeda.sap",
+		"Games/Archon.sap",
+		"Games/Astro_Chase.sap",
+		"Games/Atomia.sap",
+		"Games/Bilbo.sap",
+		"Games/Boulder_Dash_2.sap",
+		"Games/Bristles.sap",
+		"Games/Carnival_Massacre.sap",
+		"Games/Caverns_of_Khafka.sap",
+		"Games/Chimera.sap",
+		"Games/Clowns_and_Balloons.sap",
+		"Games/Conan.sap",
+		"Games/Culmins_1.sap",
+		"Games/Culmins_2.sap",
+		"Games/Dan_Strikes_Back.sap",
+		"Games/Darts.sap",
+		"Games/Diamonds.sap",
+		"Games/Elevator_Repairman.sap",
+		"Games/Emil_Hilf.sap",
+		"Games/Fire_Power.sap",
+		"Games/Flip_and_Flop.sap",
+		"Games/Floor_Walker.sap",
+		"Games/Frogger.sap",
+		"Games/Frogger_II.sap",
+		"Games/Ghost_Chaser.sap",
+		"Games/Groove.sap",
+		"Games/Gunfight.sap",
+		"Games/Gyruss.sap",
+		"Games/Herbert.sap",
+		"Games/Jigsaws.sap",
+		"Games/Jumping_Jacks_Big_Adventur.sap",
+		"Games/Kasiarz.sap",
+		"Games/Keystone_Kapers.sap",
+		"Games/Killa_Cycle.sap",
+		"Games/Loaded_Brain.sap",
+		"Games/Loops_DX.sap",
+		"Games/Major_Bronx.sap",
+		"Games/Mario_Bros.sap",
+		"Games/Master_of_Time.sap",
+		"Games/Master_of_the_Lamps.sap",
+		"Games/Mediator.sap",
+		"Games/Moon_Patrol.sap",
+		"Games/Nadral.sap",
+		"Games/Ninja.sap",
+		"Games/On_Track.sap",
+		"Games/Pac_Man.sap",
+		"Games/Pac_Man_Eric_Wolz.sap",
+		"Games/Pacific_Coast_Highway.sap",
+		"Games/Poker_Sam.sap",
+		"Games/Professor_IQ.sap",
+		"Games/Saper.sap",
+		"Games/Sargon_II.sap",
+		"Games/Screaming_Wings.sap",
+		"Games/Sea_Chase.sap",
+		"Games/Shamus.sap",
+		"Games/Shamus_Case_II.sap",
+		"Games/Softoy.sap",
+		"Games/Special_Delivery.sap",
+		"Games/Spy_Games_Ingame.sap",
+		"Games/Spys_Demise.sap",
+		"Games/Star_Intruder.sap",
+		"Games/Strip_Poker.sap",
+		"Games/Submission.sap",
+		"Games/Tapper.sap",
+		"Games/Taxicab_Hill.sap",
+		"Games/William_Tell.sap",
+		"Misc/Astrosphere.sap",
+		"Misc/Avex_Intro.sap",
+		"Misc/Bajm.sap",
+		"Misc/Banklan_2.sap",
+		"Misc/Deadline.sap",
+		"Misc/Debiut.sap",
+		"Misc/Desease.sap",
+		"Misc/Hobbytronic_89_1.sap",
+		"Misc/Huhi.sap",
+		"Misc/Instrumentarium.sap",
+		"Misc/L_Orneta_Demo.sap",
+		"Misc/Luzik.sap",
+		"Misc/My_First_Pokey.sap",
+		"Misc/New_Song_1D.sap",
+		"Misc/Only_Chipchop_Can_Save_Us.sap",
+		"Misc/Pokety_Bitches.sap",
+		"Misc/Star_Shot.sap",
+		"Misc/Tajemnice_Atari_Intro.sap",
+		"Misc/Takie_Cos.sap",
+		"Misc/The_Great_Commandment.sap",
+		"Misc/Tribute_To_Virus.sap",
+		"Unknown/AMS/Abracadabra.sap",
+		"Unknown/AMS/Africa.sap",
+		"Unknown/AMS/American_Pie.sap",
+		"Unknown/AMS/Another_Brick_in_the_Wall.sap",
+		"Unknown/AMS/Back_in_the_USSR.sap",
+		"Unknown/AMS/Bee_Fly.sap",
+		"Unknown/AMS/Blue_Moon.sap",
+		"Unknown/AMS/Calypso.sap",
+		"Unknown/AMS/Cancan.sap",
+		"Unknown/AMS/Cecilia.sap",
+		"Unknown/AMS/Copacabana.sap",
+		"Unknown/AMS/Dallas.sap",
+		"Unknown/AMS/Dancing_in_the_Dark.sap",
+		"Unknown/AMS/Do_Ya_Think_I_am_Sexy.sap",
+		"Unknown/AMS/Down_Under.sap",
+		"Unknown/AMS/Eleanor_Rigby.sap",
+		"Unknown/AMS/Footloose.sap",
+		"Unknown/AMS/Hey_Jude.sap",
+		"Unknown/AMS/I_Just_Call_to_Say_I_Love.sap",
+		"Unknown/AMS/Imperial_March_2.sap",
+		"Unknown/AMS/Jingle_Bells.sap",
+		"Unknown/AMS/Light_My_Fire.sap",
+		"Unknown/AMS/Lucy_in_the_Sky_with_Diamo.sap",
+		"Unknown/AMS/Maniac.sap",
+		"Unknown/AMS/Moonlight_Shadow.sap",
+		"Unknown/AMS/Muppet_Show.sap",
+		"Unknown/AMS/Ninety_Nine_Red_Balloons_2.sap",
+		"Unknown/AMS/Norwegian_Wood.sap",
+		"Unknown/AMS/Oh_My_Darling_Clementine.sap",
+		"Unknown/AMS/Old_Batman_TV_Show.sap",
+		"Unknown/AMS/Owner_of_the_Lonely_Heart.sap",
+		"Unknown/AMS/Paperback_Writer.sap",
+		"Unknown/AMS/Rosanna.sap",
+		"Unknown/AMS/Say_Say_Say.sap",
+		"Unknown/AMS/Sleigh_Ride.sap",
+		"Unknown/AMS/Sleigh_Ride_2.sap",
+		"Unknown/AMS/Smoke_on_the_Water.sap",
+		"Unknown/AMS/Stairway_to_Heaven.sap",
+		"Unknown/AMS/Star_Trek.sap",
+		"Unknown/AMS/Star_Wars_Cantina_2.sap",
+		"Unknown/AMS/Summer_Nights.sap",
+		"Unknown/AMS/Take_Five.sap",
+		"Unknown/AMS/Tie_a_Yellow_Ribbon_Round.sap",
+		"Unknown/AMS/Total_Eclipse_of_the_Heart.sap",
+		"Unknown/AMS/Tradition.sap",
+		"Unknown/AMS/We_Can_Work_It_out.sap",
+		"Unknown/AMS/When_Im_64.sap",
+		"Unknown/AMS/Winds_of_War.sap",
+		"Unknown/AMS/Yellow_Submarine.sap",
+		"Unknown/Autum.sap",
+		"Unknown/Blus.sap",
+		"Unknown/CompyShop_Magazin_Inside_B.sap",
+		"Unknown/Condor.sap",
+		"Unknown/Dajana.sap",
+		"Unknown/Door.sap",
+		"Unknown/For_Lobo_2.sap",
+		"Unknown/Grzyby.sap",
+		"Unknown/High_Society_Girl.sap",
+		"Unknown/House_of_Rising_Sun.sap",
+		"Unknown/Lunatic.sap",
+		"Unknown/Music1.sap",
+		"Unknown/Music2.sap",
+		"Unknown/NATO.sap",
+		"Unknown/Panorama.sap",
+		"Unknown/Ranger1.sap",
+		"Unknown/Ranger7.sap",
+		"Unknown/Ranger9.sap",
+		"Unknown/Skladanka.sap",
+		"Unknown/Techno.sap",
+		"Unknown/Time_To_Enjoy.sap",
+		"Unknown/Train.sap",
+		"Unknown/Voyager.sap",
+		"Unknown/Yeach.sap"
+	};
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/vlc/libasap_plugin.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/vlc/libasap_plugin.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/vlc/libasap_plugin.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/vlc/libasap_plugin.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,250 @@
+/*
+ * libasap_plugin.c - ASAP plugin for VLC
+ *
+ * Copyright (C) 2012-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#define __PLUGIN__
+#define MODULE_NAME  asap
+#define MODULE_STRING  "asap"
+
+#include <stdarg.h>
+#include <stdbool.h>
+
+#include <vlc_common.h>
+#include <vlc_input.h>
+#include <vlc_demux.h>
+#include <vlc_plugin.h>
+
+#include "asap.h"
+
+#define BITS_PER_SAMPLE  16
+#define BUFFER_BYTES  4096
+
+struct demux_sys_t
+{
+	ASAP *asap;
+	es_out_id_t *es;
+	date_t pts;
+	int bytes_per_frame;
+	int duration;
+};
+
+static int Demux(demux_t *demux)
+{
+	demux_sys_t *sys = demux->p_sys;
+
+	block_t *block = block_Alloc(BUFFER_BYTES);
+	if (unlikely(block == NULL))
+		return 0;
+
+	int len = ASAP_Generate(sys->asap, block->p_buffer, BUFFER_BYTES,
+		BITS_PER_SAMPLE == 16 ? ASAPSampleFormat_S16_L_E : ASAPSampleFormat_U8);
+	if (len <= 0) {
+		block_Release(block);
+		return 0;
+	}
+	block->i_buffer = len;
+	block->i_pts = block->i_dts = VLC_TS_0 + date_Get(&sys->pts);
+	es_out_Control(demux->out, ES_OUT_SET_PCR, block->i_pts);
+	es_out_Send(demux->out, sys->es, block);
+	date_Increment(&sys->pts, len / sys->bytes_per_frame);
+	return 1;
+}
+
+static bool PlaySong(demux_t *demux, demux_sys_t *sys, int song)
+{
+	const ASAPInfo *info = ASAP_GetInfo(sys->asap);
+	int duration = ASAPInfo_GetDuration(info, song);
+	if (!ASAP_PlaySong(sys->asap, song, duration))
+		return false;
+	sys->duration = duration;
+	demux->info.i_title = song;
+	demux->info.i_update |= INPUT_UPDATE_TITLE;
+	return true;
+}
+
+static int Control(demux_t *demux, int query, va_list args)
+{
+	demux_sys_t *sys = demux->p_sys;
+
+	switch (query) {
+		case DEMUX_GET_POSITION: {
+			if (sys->duration <= 0)
+				return VLC_EGENERIC;
+			double *v = va_arg(args, double *);
+			*v = (double) ASAP_GetPosition(sys->asap) / sys->duration;
+			return VLC_SUCCESS;
+		}
+		case DEMUX_SET_POSITION: {
+			if (sys->duration <= 0)
+				return VLC_EGENERIC;
+			double v = va_arg(args, double);
+			if (v < 0 || v > 1 || !ASAP_Seek(sys->asap, (int) (v * sys->duration)))
+				return VLC_EGENERIC;
+			return VLC_SUCCESS;
+		}
+		case DEMUX_GET_LENGTH: {
+			if (sys->duration <= 0)
+				return VLC_EGENERIC;
+			int64_t *v = va_arg(args, int64_t *);
+			*v = sys->duration * INT64_C(1000);
+			return VLC_SUCCESS;
+		}
+		case DEMUX_GET_TIME: {
+			int64_t *v = va_arg(args, int64_t *);
+			*v = ASAP_GetPosition(sys->asap) * INT64_C(1000);
+			return VLC_SUCCESS;
+		}
+		case DEMUX_SET_TIME: {
+			int64_t v = va_arg(args, int64_t) / 1000;
+			if (v > 0x7fffffff || !ASAP_Seek(sys->asap, v))
+				return VLC_EGENERIC;
+			return VLC_SUCCESS;
+		}
+		case DEMUX_GET_META: {
+			const ASAPInfo *info = ASAP_GetInfo(sys->asap);
+			vlc_meta_t *p_meta = (vlc_meta_t *) va_arg(args, vlc_meta_t *);
+			const char *s = ASAPInfo_GetTitle(info);
+			if (s[0] != '\0')
+				vlc_meta_SetTitle(p_meta, s);
+			s = ASAPInfo_GetAuthor(info);
+			if (s[0] != '\0')
+				vlc_meta_SetArtist(p_meta, s);
+			int year = ASAPInfo_GetYear(info);
+			if (year > 0) {
+				char s[16];
+				sprintf(s, "%d", year);
+				vlc_meta_SetDate(p_meta, s);
+			}
+			return VLC_SUCCESS;
+		}
+		case DEMUX_GET_TITLE_INFO: {
+			int songs = ASAPInfo_GetSongs(ASAP_GetInfo(sys->asap));
+			if (songs <= 1)
+				return VLC_EGENERIC;
+			input_title_t ***titlev = va_arg(args, input_title_t ***);
+			int *titlec = va_arg(args, int *);
+			*titlev = malloc(sizeof(**titlev) * songs);
+			if (unlikely(*titlev == NULL)) {
+				*titlec = 0;
+				return VLC_ENOMEM;
+			}
+			*titlec = songs;
+			for (int i = 0; i < songs; i++)
+				(*titlev)[i] = vlc_input_title_New();
+			return VLC_SUCCESS;
+		}
+		case DEMUX_SET_TITLE: {
+			int song = (int) va_arg(args, int);
+			if (!PlaySong(demux, sys, song))
+				return VLC_EGENERIC;
+			return VLC_SUCCESS;
+		}
+		default:
+			return VLC_EGENERIC;
+	}
+}
+
+static int Open(vlc_object_t *obj)
+{
+	demux_t *demux = (demux_t *) obj;
+
+	/* read module */
+	int64_t module_len = stream_Size(demux->s);
+	if (module_len > ASAPInfo_MAX_MODULE_LENGTH)
+		return VLC_EGENERIC;
+	uint8_t *module = (uint8_t *) malloc(module_len);
+	if (unlikely(module == NULL))
+		return VLC_ENOMEM;
+	if (
+#ifdef vlc_stream_MemoryNew /* VLC 3.0+ */
+		vlc_stream_Read
+#else
+		stream_Read
+#endif
+			(demux->s, module, module_len) < module_len) {
+		free(module);
+		return VLC_EGENERIC;
+	}
+
+	/* load into ASAP and start */
+	demux_sys_t *sys = malloc(sizeof(demux_sys_t));
+	if (unlikely(sys == NULL)) {
+		free(module);
+		return VLC_ENOMEM;
+	}
+	sys->asap = ASAP_New();
+	if (unlikely(sys->asap == NULL)) {
+		free(sys);
+		free(module);
+		return VLC_ENOMEM;
+	}
+	if (!ASAP_Load(sys->asap, NULL, module, module_len)) {
+		ASAP_Delete(sys->asap);
+		free(sys);
+		free(module);
+		return VLC_EGENERIC;
+	}
+	free(module);
+	const ASAPInfo *info = ASAP_GetInfo(sys->asap);
+	int song = ASAPInfo_GetDefaultSong(info);
+	if (!PlaySong(demux, sys, song)) {
+		ASAP_Delete(sys->asap);
+		free(sys);
+		return VLC_EGENERIC;
+	}
+
+	/* setup VLC */
+	es_format_t fmt;
+	es_format_Init(&fmt, AUDIO_ES, BITS_PER_SAMPLE == 16 ? VLC_CODEC_S16L : VLC_CODEC_U8);
+	fmt.audio.i_channels = ASAPInfo_GetChannels(info);
+	fmt.audio.i_bitspersample = BITS_PER_SAMPLE;
+	fmt.audio.i_rate = ASAP_SAMPLE_RATE;
+	fmt.audio.i_blockalign = fmt.audio.i_frame_length = fmt.audio.i_bytes_per_frame = sys->bytes_per_frame = fmt.audio.i_channels * (BITS_PER_SAMPLE / 8);
+	fmt.i_bitrate = ASAP_SAMPLE_RATE * 8 * fmt.audio.i_bytes_per_frame;
+	sys->es = es_out_Add(demux->out, &fmt);
+	date_Init(&sys->pts, ASAP_SAMPLE_RATE, 1);
+	date_Set(&sys->pts, 0);
+	demux->pf_demux = Demux;
+	demux->pf_control = Control;
+	demux->p_sys = sys;
+
+	return VLC_SUCCESS;
+}
+
+
+static void Close(vlc_object_t *obj)
+{
+	demux_t *demux = (demux_t *) obj;
+	demux_sys_t *sys = demux->p_sys;
+
+	ASAP_Delete(sys->asap);
+	free(sys);
+}
+
+vlc_module_begin()
+	set_shortname("ASAP")
+	set_description("Another Slight Atari Player")
+	set_category(CAT_INPUT)
+	set_subcategory(SUBCAT_INPUT_DEMUX)
+	set_capability("demux", 100)
+	set_callbacks(Open, Close)
+vlc_module_end()
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/vlc/vlc.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/vlc/vlc.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/vlc/vlc.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/vlc/vlc.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,50 @@
+# Linux
+
+VLC_CFLAGS = -std=gnu99 -I/usr/include/vlc/plugins
+VLC_DEMUX_PLUGIN_DIR = `pkg-config --variable pluginsdir vlc-plugin`/demux
+
+# macOS
+
+VLC_OSX_CFLAGS = -std=gnu99 -I../plugins -dynamiclib -flat_namespace
+VLC_OSX_PLUGIN_DIR = /Applications/VLC.app/Contents/MacOS/plugins
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "vlc.mk")
+endif
+
+# Linux
+
+asap-vlc: libasap_plugin.so
+.PHONY: asap-vlc
+
+libasap_plugin.so: $(call src,vlc/libasap_plugin.c asap.[ch])
+	$(DO_CC) $(VLC_CFLAGS)
+CLEAN += libasap_plugin.so
+
+install-vlc: libasap_plugin.so
+	$(call INSTALL_PROGRAM,libasap_plugin.so,$(VLC_DEMUX_PLUGIN_DIR))
+.PHONY: install-vlc
+
+uninstall-vlc:
+	$(RM) $(DESTDIR)$(VLC_DEMUX_PLUGIN_DIR)/libasap_plugin.so
+.PHONY: uninstall-vlc
+
+# macOS
+
+asap-vlc-osx: libasap_plugin.dylib
+.PHONY: asap-vlc-osx
+
+libasap_plugin.dylib: $(call src,vlc/libasap_plugin.c asap.[ch])
+	$(OSX_CC) $(VLC_OSX_CFLAGS)
+CLEAN += libasap_plugin.dylib
+
+install-vlc-osx: libasap_plugin.dylib
+	$(call INSTALL_DATA,libasap_plugin.dylib,$(VLC_OSX_PLUGIN_DIR))
+.PHONY: install-vlc-osx
+
+uninstall-vlc-osx:
+	$(RM) $(DESTDIR)$(VLC_OSX_PLUGIN_DIR)/libasap_plugin.dylib
+.PHONY: uninstall-vlc-osx
+
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass-addon.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass-addon.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass-addon.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass-addon.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+	BASS 2.4 add-on C/C++ header file
+	Copyright (c) 2003-2009 Un4seen Developments Ltd.
+*/
+
+#include "bass.h"
+
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *BASSFILE;
+
+typedef struct {
+	DWORD flags; // ADDON_xxx flags
+	void (WINAPI *Free)(void *inst);
+	QWORD (WINAPI *GetLength)(void *inst, DWORD mode);
+	const char *(WINAPI *GetTags)(void *inst, DWORD tags); // optional
+	QWORD (WINAPI *GetFilePosition)(void *inst, DWORD mode); // optional
+	void (WINAPI *GetInfo)(void *inst, BASS_CHANNELINFO *info);
+	BOOL (WINAPI *CanSetPosition)(void *inst, QWORD pos, DWORD mode);
+	QWORD (WINAPI *SetPosition)(void *inst, QWORD pos, DWORD mode);
+	QWORD (WINAPI *GetPosition)(void *inst, QWORD pos, DWORD mode); // optional
+	HSYNC (WINAPI *SetSync)(void *inst, DWORD type, QWORD param, SYNCPROC *proc, void *user); // not required if not setting syncs
+	void (WINAPI *RemoveSync)(void *inst, HSYNC sync); // optional
+	BOOL (WINAPI *CanResume)(void *inst); // optional
+	DWORD (WINAPI *SetFlags)(void *inst, DWORD flags); // optional
+	BOOL (WINAPI *Attribute)(void *inst, DWORD attrib, float *value, BOOL set); // optional
+} ADDON_FUNCTIONS;
+
+#define ADDON_OWNPOS	1 // handles all position tracking (including POS/END syncs)
+
+typedef struct {
+	void (WINAPI *Free)(void *inst);
+	BOOL (WINAPI *SetParameters)(void *inst, const void *param);
+	BOOL (WINAPI *GetParameters)(void *inst, void *param);
+	BOOL (WINAPI *Reset)(void *inst);
+} ADDON_FUNCTIONS_FX;
+
+typedef HSTREAM (CALLBACK STREAMCREATEPROC)(BASSFILE file, DWORD flags); // BASS_StreamCreateFile/User/URL plugin function
+typedef HSTREAM (CALLBACK STREAMCREATEURLPROC)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user); // BASS_StreamCreateURL plugin function (unsupported URI scheme)
+typedef BOOL (CALLBACK BASSCONFIGPROC)(DWORD option, DWORD flags, void *value); // config plugin function
+typedef HFX (CALLBACK BASSFXPROC)(DWORD chan, DWORD type, int priority); // FX plugin function
+
+// BASSCONFIGPROC flags
+#define BASSCONFIG_SET	1 // set the config (otherwise get it)
+#define BASSCONFIG_PTR	2 // value is a pointer
+
+// RegisterPlugin modes
+#define PLUGIN_CONFIG_ADD		0 // add a config plugin
+#define PLUGIN_CONFIG_REMOVE	1 // remove a config plugin
+#define PLUGIN_FX_ADD			2 // add an FX plugin
+#define PLUGIN_FX_REMOVE		3 // remove an FX plugin
+
+typedef struct {
+	void (WINAPI *SetError)(int error); // set error code
+	void (WINAPI *RegisterPlugin)(void *proc, DWORD mode); // add/remove a plugin function
+	HSTREAM (WINAPI *CreateStream)(DWORD freq, DWORD chan, DWORD flags, STREAMPROC *proc, void *inst, const ADDON_FUNCTIONS *funcs); // create a stream
+	HFX (WINAPI *SetFX)(DWORD chan, DSPPROC *proc, void *inst, int priority, const ADDON_FUNCTIONS_FX *funcs); // set FX on a channel
+	void *(WINAPI *GetInst)(DWORD handle, const void *funcs); // get stream or FX instance data
+
+	void *(WINAPI *GetLock)(HSTREAM handle); // get stream access lock
+	HSYNC (WINAPI *NewSync)(HSTREAM handle, DWORD type, SYNCPROC *proc, void *user); // add a sync to a channel
+	BOOL (WINAPI *TriggerSync)(HSTREAM handle, HSYNC sync, QWORD pos, DWORD data); // trigger a sync
+	QWORD (WINAPI *GetCount)(HSTREAM handle, BOOL output); // get raw count (output=0) or current output position (output=1)
+	QWORD (WINAPI *GetPosition)(HSTREAM handle, QWORD count, DWORD mode); // get raw "count" translated to source position
+
+	struct { // file functions
+		BASSFILE (WINAPI *Open)(BOOL mem, const void *file, QWORD offset, QWORD length, DWORD flags, BOOL readtags); // open a file
+		BASSFILE (WINAPI *OpenURL)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user, BOOL readtags); // open a URL
+		BASSFILE (WINAPI *OpenUser)(DWORD system, DWORD flags, const BASS_FILEPROCS *proc, void *user, BOOL readtags); // open a custom file
+		void (WINAPI *Close)(BASSFILE file); // close an opened file
+		const void *(WINAPI *GetFileName)(BASSFILE file, BOOL *unicode); // get the filename/url (NULL=memory/custom file)
+		BOOL (WINAPI *SetStream)(BASSFILE file, HSTREAM handle); // set stream handle (for auto closing and META/DOWNLOAD syncs)
+		DWORD (WINAPI *GetFlags)(BASSFILE file); // get BASSFILE_xxx flags
+		void (WINAPI *SetFlags)(BASSFILE file, DWORD flags); // set BASSFILE_xxx flags (BASSFILE_RESTRATE/FULL only)
+		DWORD (WINAPI *Read)(BASSFILE file, void *buf, DWORD len); // read from file
+		BOOL (WINAPI *Seek)(BASSFILE file, QWORD pos); // seek in file
+		QWORD (WINAPI *GetPos)(BASSFILE file, DWORD mode); // get file position (mode=BASS_FILEPOS_xxx)
+		BOOL (WINAPI *Eof)(BASSFILE file); // End of file?
+		const char *(WINAPI *GetTags)(BASSFILE file, DWORD tags); // get tags (ID3/ID3V2/LYRICS3/RIFF_INFO/HTTP/ICY/META)
+		// net/buffered-only stuff
+		BOOL (WINAPI *StartThread)(BASSFILE f, DWORD bitrate, DWORD offset); // start download thread (bitrate in bytes/sec)
+		BOOL (WINAPI *CanResume)(BASSFILE file); // enough data buffered to resume?
+	} file;
+
+	struct { // sample data processing functions (len=samples, dst=src is ok)
+		void (WINAPI *Float2Int)(const float *src, void *dst, DWORD len, DWORD res); // convert floating-point data to 8/16-bit (res=1/2)
+		void (WINAPI *Int2Float)(const void *src, float *dst, DWORD len, DWORD res); // convert 8/16/24/32-bit (res=1/2/3/4) to floating-point
+		void (WINAPI *Swap)(const void *src, void *dst, DWORD len, DWORD res); // swap byte order of 16/32-bit (res=2/4) data
+	} data;
+} BASS_FUNCTIONS;
+
+#define BASSFILE_BUFFERED	1	// net/buffered file
+#define BASSFILE_NOLIMIT	2	// enable reading beyond end of audio data (into tags)
+#define BASSFILE_BLOCK		BASS_STREAM_BLOCK
+#define BASSFILE_RESTRATE	BASS_STREAM_RESTRATE
+#define BASSFILE_UNICODE	BASS_UNICODE
+
+typedef const void *(WINAPI BASSPLUGIN)(DWORD face); // plugin interface function
+
+// BASSplugin "faces"
+#define BASSPLUGIN_INFO			0 // BASS_PLUGININFO
+#define BASSPLUGIN_CREATE		1 // STREAMCREATEPROC
+#define BASSPLUGIN_CREATEURL	2 // STREAMCREATEURLPROC
+
+#define BASS_FREQ_INIT	0x80000001 // BASS_Init freq
+
+#define BASS_TAG_DOWNLOADPROC	0x80000001 // pointer to DOWNLOADPROC and user parameter
+
+#define BASS_SYNC_EX 0x10000000
+typedef void (CALLBACK SYNCPROCEX)(HSYNC handle, DWORD channel, DWORD data, void *user, QWORD pos);
+
+#define BASS_STREAMPROC_REPEAT	0x40000000 // call STREAMPROC again for any remainder
+
+#define BASS_POS_RESTART	0x80000000 // restarting
+
+#define BASS_CONFIG_ADDON		0x8000
+
+#ifndef GetBassFunc
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+extern __declspec(dllimport) const BASS_FUNCTIONS _;
+#define bassfunc (&_)
+#define GetBassFunc() 1
+#elif defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
+extern const BASS_FUNCTIONS _;
+#define bassfunc (&_)
+#define GetBassFunc() 1
+#else
+extern const BASS_FUNCTIONS *bassfunc;
+#define GetBassFunc() (bassfunc=(BASS_FUNCTIONS*)BASS_GetConfigPtr(BASS_CONFIG_ADDON))
+#endif
+
+// SetError macros
+#define noerror() return (bassfunc->SetError(BASS_OK),TRUE)
+#define noerrorn(n) return (bassfunc->SetError(BASS_OK),n)
+#define error(n) return (bassfunc->SetError(n),FALSE) // error = 0/NULL
+#define errorn(n) return (bassfunc->SetError(n),-1) // error = -1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass_asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass_asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass_asap.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass_asap.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,217 @@
+/*
+ * bass_asap.c - ASAP add-on for BASS
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <windows.h>
+
+#include "bass-addon.h"
+
+/* ID3 tag doesn't work in AIMP because it doesn't call GetTags.
+   It works e.g. in http://sourceforge.net/projects/encorebassing/ */
+#define SUPPORT_ID3
+
+#define BASS_CTYPE_MUSIC_ASAP  0x1f100
+
+#include "asap.h"
+
+static const BASS_PLUGINFORM pluginform = {
+	BASS_CTYPE_MUSIC_ASAP, "ASAP", "*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc"
+};
+
+static const BASS_PLUGININFO plugininfo = { 0x02040000, 1, &pluginform };
+
+typedef struct
+{
+	ASAP *asap;
+	int duration;
+#ifdef SUPPORT_ID3
+	TAG_ID3 tag;
+#endif
+} ASAPSTREAM;
+
+static void WINAPI ASAP_Free(void *inst)
+{
+	free(inst);
+}
+
+static QWORD WINAPI ASAP_GetLength(void *inst, DWORD mode)
+{
+	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
+	if (mode != BASS_POS_BYTE)
+		errorn(BASS_ERROR_NOTAVAIL);
+	int channels = ASAPInfo_GetChannels(ASAP_GetInfo(stream->asap));
+	noerrorn((stream->duration * (ASAP_SAMPLE_RATE / 100) / 10) << channels); // assumes 16-bit
+}
+
+#ifdef SUPPORT_ID3
+
+static const char * WINAPI ASAP_GetTags(void *inst, DWORD tags)
+{
+	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
+	if (tags != BASS_TAG_ID3)
+		return NULL;
+	TAG_ID3 *tag = &stream->tag;
+	memset(tag, 0, sizeof(TAG_ID3));
+	tag->id[0] = 'T';
+	tag->id[1] = 'A';
+	tag->id[2] = 'G';
+	const ASAPInfo *info = ASAP_GetInfo(stream->asap);
+	strncpy(tag->title, ASAPInfo_GetTitleOrFilename(info), sizeof(tag->title));
+	strncpy(tag->artist, ASAPInfo_GetAuthor(info), sizeof(tag->artist));
+	int year = ASAPInfo_GetYear(info);
+	if (year > 0 && year < 10000)
+		sprintf(tag->year, "%d", year);
+	tag->genre = 52; /* Electronic */
+	return (const char *) tag;
+}
+
+#endif
+
+static void WINAPI ASAP_GetBassInfo(void *inst, BASS_CHANNELINFO *info)
+{
+	info->ctype = BASS_CTYPE_MUSIC_ASAP;
+}
+
+static int bytes_to_duration(ASAPSTREAM *stream, int pos)
+{
+	int channels = ASAPInfo_GetChannels(ASAP_GetInfo(stream->asap));
+	return (pos >> channels) * 10 / (ASAP_SAMPLE_RATE / 100);
+}
+
+static BOOL WINAPI ASAP_CanSetPosition(void *inst, QWORD pos, DWORD mode)
+{
+	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
+	if ((BYTE) mode != BASS_POS_BYTE)
+		error(BASS_ERROR_NOTAVAIL);
+	if (stream->duration >= 0 && (pos > 0xffffffff || bytes_to_duration(stream, pos) >= stream->duration))
+		error(BASS_ERROR_POSITION);
+	return TRUE;
+}
+
+static QWORD WINAPI ASAP_SetPosition(void *inst, QWORD pos, DWORD mode)
+{
+	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
+	if ((BYTE) mode != BASS_POS_BYTE)
+		errorn(BASS_ERROR_NOTAVAIL);
+	ASAP_Seek(stream->asap, bytes_to_duration(stream, pos));
+	return pos;
+}
+
+static ADDON_FUNCTIONS ASAPfuncs = {
+	0,
+	ASAP_Free,
+	ASAP_GetLength,
+#ifdef SUPPORT_ID3
+	ASAP_GetTags,
+#else
+	NULL,
+#endif
+	NULL,
+	ASAP_GetBassInfo,
+	ASAP_CanSetPosition,
+	ASAP_SetPosition,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static DWORD CALLBACK StreamProc(HSTREAM handle, void *buffer, DWORD length, void *inst)
+{
+	ASAPSTREAM *stream = (ASAPSTREAM *) inst;
+	int c = ASAP_Generate(stream->asap, buffer, length, ASAPSampleFormat_S16_L_E);
+	if (c < length)
+		c |= BASS_STREAMPROC_END;
+	return c;
+}
+
+static HSTREAM WINAPI StreamCreateProc(BASSFILE file, DWORD flags)
+{
+	BOOL unicode = FALSE;
+	const char *filename = (const char *) bassfunc->file.GetFileName(file, &unicode);
+	char aFilename[MAX_PATH];
+	if (filename != NULL && unicode) {
+		if (WideCharToMultiByte(CP_ACP, 0, (LPCWSTR) filename, -1, aFilename, MAX_PATH, NULL, NULL) <= 0)
+			error(BASS_ERROR_NOTFILE);
+		filename = aFilename;
+	}
+	byte module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len = bassfunc->file.Read(file, module, sizeof(module));
+	ASAPSTREAM *stream = malloc(sizeof(ASAPSTREAM));
+	if (stream == NULL)
+		error(BASS_ERROR_MEM);
+	stream->asap = ASAP_New();
+	if (stream->asap == NULL) {
+		free(stream);
+		error(BASS_ERROR_MEM);
+	}
+	if (!ASAP_Load(stream->asap, filename, module, module_len)) {
+		free(stream);
+		error(BASS_ERROR_FILEFORM);
+	}
+	flags &= BASS_SAMPLE_SOFTWARE | BASS_SAMPLE_LOOP | BASS_SAMPLE_3D | BASS_SAMPLE_FX
+		| BASS_STREAM_DECODE | BASS_STREAM_AUTOFREE | 0x3f000000; // 0x3f000000 = all speaker flags
+	const ASAPInfo *info = ASAP_GetInfo(stream->asap);
+	int song = ASAPInfo_GetDefaultSong(info);
+	int duration;
+	if ((flags & BASS_MUSIC_LOOP) != 0 && ASAPInfo_GetLoop(info, song))
+		duration = -1;
+	else
+		duration = ASAPInfo_GetDuration(info, song);
+	stream->duration = duration;
+	if (!ASAP_PlaySong(stream->asap, song, duration)) {
+		free(stream);
+		error(BASS_ERROR_FILEFORM);
+	}
+	HSTREAM handle = bassfunc->CreateStream(ASAP_SAMPLE_RATE, ASAPInfo_GetChannels(info), flags, &StreamProc, stream, &ASAPfuncs);
+	if (handle == 0) {
+		free(stream);
+		return 0; // CreateStream set the error code
+	}
+	bassfunc->file.SetStream(file, handle);
+	noerrorn(handle);
+}
+
+__declspec(dllexport) const void *WINAPI BASSplugin(DWORD face)
+{
+	switch (face) {
+	case BASSPLUGIN_INFO:
+		return &plugininfo;
+	case BASSPLUGIN_CREATE:
+		return StreamCreateProc;
+	default:
+		return NULL;
+	}
+}
+
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+{
+	if (dwReason == DLL_PROCESS_ATTACH && HIWORD(BASS_GetVersion()) != BASSVERSION) {
+		MessageBox(NULL, "Incorrect BASS.DLL version (" BASSVERSIONTEXT " is required)", "ASAP", MB_ICONERROR);
+		return FALSE;
+	}
+	return TRUE;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,905 @@
+/*
+	BASS 2.4 C/C++ header file
+	Copyright (c) 1999-2009 Un4seen Developments Ltd.
+
+	See the BASS.CHM file for more detailed documentation
+*/
+
+#ifndef BASS_H
+#define BASS_H
+
+#ifdef _WIN32
+#include <wtypes.h>
+typedef unsigned __int64 QWORD;
+#else
+#include <stdint.h>
+#define WINAPI
+#define CALLBACK
+typedef uint8_t BYTE;
+typedef uint16_t WORD;
+typedef uint32_t DWORD;
+typedef uint64_t QWORD;
+#ifndef __OBJC__
+typedef int BOOL;
+#endif
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+#define LOBYTE(a) (BYTE)(a)
+#define HIBYTE(a) (BYTE)((a)>>8)
+#define LOWORD(a) (WORD)(a)
+#define HIWORD(a) (WORD)((a)>>16)
+#define MAKEWORD(a,b) (WORD)(((a)&0xff)|((b)<<8))
+#define MAKELONG(a,b) (DWORD)(((a)&0xffff)|((b)<<16))
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BASSVERSION			0x204	// API version
+#define BASSVERSIONTEXT		"2.4"
+
+#ifndef BASSDEF
+#define BASSDEF(f) WINAPI f
+#endif
+
+typedef DWORD HMUSIC;		// MOD music handle
+typedef DWORD HSAMPLE;		// sample handle
+typedef DWORD HCHANNEL;		// playing sample's channel handle
+typedef DWORD HSTREAM;		// sample stream handle
+typedef DWORD HRECORD;		// recording handle
+typedef DWORD HSYNC;		// synchronizer handle
+typedef DWORD HDSP;			// DSP handle
+typedef DWORD HFX;			// DX8 effect handle
+typedef DWORD HPLUGIN;		// Plugin handle
+
+// Error codes returned by BASS_ErrorGetCode
+#define BASS_OK				0	// all is OK
+#define BASS_ERROR_MEM		1	// memory error
+#define BASS_ERROR_FILEOPEN	2	// can't open the file
+#define BASS_ERROR_DRIVER	3	// can't find a free/valid driver
+#define BASS_ERROR_BUFLOST	4	// the sample buffer was lost
+#define BASS_ERROR_HANDLE	5	// invalid handle
+#define BASS_ERROR_FORMAT	6	// unsupported sample format
+#define BASS_ERROR_POSITION	7	// invalid position
+#define BASS_ERROR_INIT		8	// BASS_Init has not been successfully called
+#define BASS_ERROR_START	9	// BASS_Start has not been successfully called
+#define BASS_ERROR_ALREADY	14	// already initialized/paused/whatever
+#define BASS_ERROR_NOCHAN	18	// can't get a free channel
+#define BASS_ERROR_ILLTYPE	19	// an illegal type was specified
+#define BASS_ERROR_ILLPARAM	20	// an illegal parameter was specified
+#define BASS_ERROR_NO3D		21	// no 3D support
+#define BASS_ERROR_NOEAX	22	// no EAX support
+#define BASS_ERROR_DEVICE	23	// illegal device number
+#define BASS_ERROR_NOPLAY	24	// not playing
+#define BASS_ERROR_FREQ		25	// illegal sample rate
+#define BASS_ERROR_NOTFILE	27	// the stream is not a file stream
+#define BASS_ERROR_NOHW		29	// no hardware voices available
+#define BASS_ERROR_EMPTY	31	// the MOD music has no sequence data
+#define BASS_ERROR_NONET	32	// no internet connection could be opened
+#define BASS_ERROR_CREATE	33	// couldn't create the file
+#define BASS_ERROR_NOFX		34	// effects are not available
+#define BASS_ERROR_NOTAVAIL	37	// requested data is not available
+#define BASS_ERROR_DECODE	38	// the channel is a "decoding channel"
+#define BASS_ERROR_DX		39	// a sufficient DirectX version is not installed
+#define BASS_ERROR_TIMEOUT	40	// connection timedout
+#define BASS_ERROR_FILEFORM	41	// unsupported file format
+#define BASS_ERROR_SPEAKER	42	// unavailable speaker
+#define BASS_ERROR_VERSION	43	// invalid BASS version (used by add-ons)
+#define BASS_ERROR_CODEC	44	// codec is not available/supported
+#define BASS_ERROR_ENDED	45	// the channel/file has ended
+#define BASS_ERROR_UNKNOWN	-1	// some other mystery problem
+
+// BASS_SetConfig options
+#define BASS_CONFIG_BUFFER			0
+#define BASS_CONFIG_UPDATEPERIOD	1
+#define BASS_CONFIG_GVOL_SAMPLE		4
+#define BASS_CONFIG_GVOL_STREAM		5
+#define BASS_CONFIG_GVOL_MUSIC		6
+#define BASS_CONFIG_CURVE_VOL		7
+#define BASS_CONFIG_CURVE_PAN		8
+#define BASS_CONFIG_FLOATDSP		9
+#define BASS_CONFIG_3DALGORITHM		10
+#define BASS_CONFIG_NET_TIMEOUT		11
+#define BASS_CONFIG_NET_BUFFER		12
+#define BASS_CONFIG_PAUSE_NOPLAY	13
+#define BASS_CONFIG_NET_PREBUF		15
+#define BASS_CONFIG_NET_PASSIVE		18
+#define BASS_CONFIG_REC_BUFFER		19
+#define BASS_CONFIG_NET_PLAYLIST	21
+#define BASS_CONFIG_MUSIC_VIRTUAL	22
+#define BASS_CONFIG_VERIFY			23
+#define BASS_CONFIG_UPDATETHREADS	24
+#if defined(__linux__) || defined (_WIN32_WCE)
+#define BASS_CONFIG_DEV_BUFFER		27
+#endif
+
+// BASS_SetConfigPtr options
+#define BASS_CONFIG_NET_AGENT		16
+#define BASS_CONFIG_NET_PROXY		17
+
+// Initialization flags
+#define BASS_DEVICE_8BITS		1	// use 8 bit resolution, else 16 bit
+#define BASS_DEVICE_MONO		2	// use mono, else stereo
+#define BASS_DEVICE_3D			4	// enable 3D functionality
+#define BASS_DEVICE_LATENCY		256	// calculate device latency (BASS_INFO struct)
+#define BASS_DEVICE_CPSPEAKERS	1024 // detect speakers via Windows control panel
+#define BASS_DEVICE_SPEAKERS	2048 // force enabling of speaker assignment
+#define BASS_DEVICE_NOSPEAKER	4096 // ignore speaker arrangement
+#ifdef __linux__
+#define BASS_DEVICE_DMIX		8192 // use "dmix" (shared) output
+#endif
+
+// DirectSound interfaces (for use with BASS_GetDSoundObject)
+#define BASS_OBJECT_DS		1	// IDirectSound
+#define BASS_OBJECT_DS3DL	2	// IDirectSound3DListener
+
+// Device info structure
+typedef struct {
+#ifdef _WIN32_WCE
+	const wchar_t *name;	// description
+	const wchar_t *driver;	// driver
+#else
+	const char *name;	// description
+	const char *driver;	// driver
+#endif
+	DWORD flags;
+} BASS_DEVICEINFO;
+
+// BASS_DEVICEINFO flags
+#define BASS_DEVICE_ENABLED		1
+#define BASS_DEVICE_DEFAULT		2
+#define BASS_DEVICE_INIT		4
+
+typedef struct {
+	DWORD flags;	// device capabilities (DSCAPS_xxx flags)
+	DWORD hwsize;	// size of total device hardware memory
+	DWORD hwfree;	// size of free device hardware memory
+	DWORD freesam;	// number of free sample slots in the hardware
+	DWORD free3d;	// number of free 3D sample slots in the hardware
+	DWORD minrate;	// min sample rate supported by the hardware
+	DWORD maxrate;	// max sample rate supported by the hardware
+	BOOL eax;		// device supports EAX? (always FALSE if BASS_DEVICE_3D was not used)
+	DWORD minbuf;	// recommended minimum buffer length in ms (requires BASS_DEVICE_LATENCY)
+	DWORD dsver;	// DirectSound version
+	DWORD latency;	// delay (in ms) before start of playback (requires BASS_DEVICE_LATENCY)
+	DWORD initflags;// BASS_Init "flags" parameter
+	DWORD speakers; // number of speakers available
+	DWORD freq;		// current output rate (Vista/OSX only)
+} BASS_INFO;
+
+// BASS_INFO flags (from DSOUND.H)
+#define DSCAPS_CONTINUOUSRATE	0x00000010	// supports all sample rates between min/maxrate
+#define DSCAPS_EMULDRIVER		0x00000020	// device does NOT have hardware DirectSound support
+#define DSCAPS_CERTIFIED		0x00000040	// device driver has been certified by Microsoft
+#define DSCAPS_SECONDARYMONO	0x00000100	// mono
+#define DSCAPS_SECONDARYSTEREO	0x00000200	// stereo
+#define DSCAPS_SECONDARY8BIT	0x00000400	// 8 bit
+#define DSCAPS_SECONDARY16BIT	0x00000800	// 16 bit
+
+// Recording device info structure
+typedef struct {
+	DWORD flags;	// device capabilities (DSCCAPS_xxx flags)
+	DWORD formats;	// supported standard formats (WAVE_FORMAT_xxx flags)
+	DWORD inputs;	// number of inputs
+	BOOL singlein;	// TRUE = only 1 input can be set at a time
+	DWORD freq;		// current input rate (Vista/OSX only)
+} BASS_RECORDINFO;
+
+// BASS_RECORDINFO flags (from DSOUND.H)
+#define DSCCAPS_EMULDRIVER	DSCAPS_EMULDRIVER	// device does NOT have hardware DirectSound recording support
+#define DSCCAPS_CERTIFIED	DSCAPS_CERTIFIED	// device driver has been certified by Microsoft
+
+// defines for formats field of BASS_RECORDINFO (from MMSYSTEM.H)
+#ifndef WAVE_FORMAT_1M08
+#define WAVE_FORMAT_1M08       0x00000001       /* 11.025 kHz, Mono,   8-bit  */
+#define WAVE_FORMAT_1S08       0x00000002       /* 11.025 kHz, Stereo, 8-bit  */
+#define WAVE_FORMAT_1M16       0x00000004       /* 11.025 kHz, Mono,   16-bit */
+#define WAVE_FORMAT_1S16       0x00000008       /* 11.025 kHz, Stereo, 16-bit */
+#define WAVE_FORMAT_2M08       0x00000010       /* 22.05  kHz, Mono,   8-bit  */
+#define WAVE_FORMAT_2S08       0x00000020       /* 22.05  kHz, Stereo, 8-bit  */
+#define WAVE_FORMAT_2M16       0x00000040       /* 22.05  kHz, Mono,   16-bit */
+#define WAVE_FORMAT_2S16       0x00000080       /* 22.05  kHz, Stereo, 16-bit */
+#define WAVE_FORMAT_4M08       0x00000100       /* 44.1   kHz, Mono,   8-bit  */
+#define WAVE_FORMAT_4S08       0x00000200       /* 44.1   kHz, Stereo, 8-bit  */
+#define WAVE_FORMAT_4M16       0x00000400       /* 44.1   kHz, Mono,   16-bit */
+#define WAVE_FORMAT_4S16       0x00000800       /* 44.1   kHz, Stereo, 16-bit */
+#endif
+
+// Sample info structure
+typedef struct {
+	DWORD freq;		// default playback rate
+	float volume;	// default volume (0-1)
+	float pan;		// default pan (-1=left, 0=middle, 1=right)
+	DWORD flags;	// BASS_SAMPLE_xxx flags
+	DWORD length;	// length (in bytes)
+	DWORD max;		// maximum simultaneous playbacks
+	DWORD origres;	// original resolution bits
+	DWORD chans;	// number of channels
+	DWORD mingap;	// minimum gap (ms) between creating channels
+	DWORD mode3d;	// BASS_3DMODE_xxx mode
+	float mindist;	// minimum distance
+	float maxdist;	// maximum distance
+	DWORD iangle;	// angle of inside projection cone
+	DWORD oangle;	// angle of outside projection cone
+	float outvol;	// delta-volume outside the projection cone
+	DWORD vam;		// voice allocation/management flags (BASS_VAM_xxx)
+	DWORD priority;	// priority (0=lowest, 0xffffffff=highest)
+} BASS_SAMPLE;
+
+#define BASS_SAMPLE_8BITS		1	// 8 bit
+#define BASS_SAMPLE_FLOAT		256	// 32-bit floating-point
+#define BASS_SAMPLE_MONO		2	// mono
+#define BASS_SAMPLE_LOOP		4	// looped
+#define BASS_SAMPLE_3D			8	// 3D functionality
+#define BASS_SAMPLE_SOFTWARE	16	// not using hardware mixing
+#define BASS_SAMPLE_MUTEMAX		32	// mute at max distance (3D only)
+#define BASS_SAMPLE_VAM			64	// DX7 voice allocation & management
+#define BASS_SAMPLE_FX			128	// old implementation of DX8 effects
+#define BASS_SAMPLE_OVER_VOL	0x10000	// override lowest volume
+#define BASS_SAMPLE_OVER_POS	0x20000	// override longest playing
+#define BASS_SAMPLE_OVER_DIST	0x30000 // override furthest from listener (3D only)
+
+#define BASS_STREAM_PRESCAN		0x20000 // enable pin-point seeking/length (MP3/MP2/MP1)
+#define BASS_MP3_SETPOS			BASS_STREAM_PRESCAN
+#define BASS_STREAM_AUTOFREE	0x40000	// automatically free the stream when it stop/ends
+#define BASS_STREAM_RESTRATE	0x80000	// restrict the download rate of internet file streams
+#define BASS_STREAM_BLOCK		0x100000 // download/play internet file stream in small blocks
+#define BASS_STREAM_DECODE		0x200000 // don't play the stream, only decode (BASS_ChannelGetData)
+#define BASS_STREAM_STATUS		0x800000 // give server status info (HTTP/ICY tags) in DOWNLOADPROC
+
+#define BASS_MUSIC_FLOAT		BASS_SAMPLE_FLOAT
+#define BASS_MUSIC_MONO			BASS_SAMPLE_MONO
+#define BASS_MUSIC_LOOP			BASS_SAMPLE_LOOP
+#define BASS_MUSIC_3D			BASS_SAMPLE_3D
+#define BASS_MUSIC_FX			BASS_SAMPLE_FX
+#define BASS_MUSIC_AUTOFREE		BASS_STREAM_AUTOFREE
+#define BASS_MUSIC_DECODE		BASS_STREAM_DECODE
+#define BASS_MUSIC_PRESCAN		BASS_STREAM_PRESCAN	// calculate playback length
+#define BASS_MUSIC_CALCLEN		BASS_MUSIC_PRESCAN
+#define BASS_MUSIC_RAMP			0x200	// normal ramping
+#define BASS_MUSIC_RAMPS		0x400	// sensitive ramping
+#define BASS_MUSIC_SURROUND		0x800	// surround sound
+#define BASS_MUSIC_SURROUND2	0x1000	// surround sound (mode 2)
+#define BASS_MUSIC_FT2MOD		0x2000	// play .MOD as FastTracker 2 does
+#define BASS_MUSIC_PT1MOD		0x4000	// play .MOD as ProTracker 1 does
+#define BASS_MUSIC_NONINTER		0x10000	// non-interpolated sample mixing
+#define BASS_MUSIC_SINCINTER	0x800000 // sinc interpolated sample mixing
+#define BASS_MUSIC_POSRESET		0x8000	// stop all notes when moving position
+#define BASS_MUSIC_POSRESETEX	0x400000 // stop all notes and reset bmp/etc when moving position
+#define BASS_MUSIC_STOPBACK		0x80000	// stop the music on a backwards jump effect
+#define BASS_MUSIC_NOSAMPLE		0x100000 // don't load the samples
+
+// Speaker assignment flags
+#define BASS_SPEAKER_FRONT	0x1000000	// front speakers
+#define BASS_SPEAKER_REAR	0x2000000	// rear/side speakers
+#define BASS_SPEAKER_CENLFE	0x3000000	// center & LFE speakers (5.1)
+#define BASS_SPEAKER_REAR2	0x4000000	// rear center speakers (7.1)
+#define BASS_SPEAKER_N(n)	((n)<<24)	// n'th pair of speakers (max 15)
+#define BASS_SPEAKER_LEFT	0x10000000	// modifier: left
+#define BASS_SPEAKER_RIGHT	0x20000000	// modifier: right
+#define BASS_SPEAKER_FRONTLEFT	BASS_SPEAKER_FRONT|BASS_SPEAKER_LEFT
+#define BASS_SPEAKER_FRONTRIGHT	BASS_SPEAKER_FRONT|BASS_SPEAKER_RIGHT
+#define BASS_SPEAKER_REARLEFT	BASS_SPEAKER_REAR|BASS_SPEAKER_LEFT
+#define BASS_SPEAKER_REARRIGHT	BASS_SPEAKER_REAR|BASS_SPEAKER_RIGHT
+#define BASS_SPEAKER_CENTER		BASS_SPEAKER_CENLFE|BASS_SPEAKER_LEFT
+#define BASS_SPEAKER_LFE		BASS_SPEAKER_CENLFE|BASS_SPEAKER_RIGHT
+#define BASS_SPEAKER_REAR2LEFT	BASS_SPEAKER_REAR2|BASS_SPEAKER_LEFT
+#define BASS_SPEAKER_REAR2RIGHT	BASS_SPEAKER_REAR2|BASS_SPEAKER_RIGHT
+
+#define BASS_UNICODE			0x80000000
+
+#define BASS_RECORD_PAUSE		0x8000	// start recording paused
+
+// DX7 voice allocation & management flags
+#define BASS_VAM_HARDWARE		1
+#define BASS_VAM_SOFTWARE		2
+#define BASS_VAM_TERM_TIME		4
+#define BASS_VAM_TERM_DIST		8
+#define BASS_VAM_TERM_PRIO		16
+
+// Channel info structure
+typedef struct {
+	DWORD freq;		// default playback rate
+	DWORD chans;	// channels
+	DWORD flags;	// BASS_SAMPLE/STREAM/MUSIC/SPEAKER flags
+	DWORD ctype;	// type of channel
+	DWORD origres;	// original resolution
+	HPLUGIN plugin;	// plugin
+	HSAMPLE sample; // sample
+	const char *filename; // filename
+} BASS_CHANNELINFO;
+
+// BASS_CHANNELINFO types
+#define BASS_CTYPE_SAMPLE		1
+#define BASS_CTYPE_RECORD		2
+#define BASS_CTYPE_STREAM		0x10000
+#define BASS_CTYPE_STREAM_OGG	0x10002
+#define BASS_CTYPE_STREAM_MP1	0x10003
+#define BASS_CTYPE_STREAM_MP2	0x10004
+#define BASS_CTYPE_STREAM_MP3	0x10005
+#define BASS_CTYPE_STREAM_AIFF	0x10006
+#define BASS_CTYPE_STREAM_CA	0x10007
+#define BASS_CTYPE_STREAM_WAV	0x40000 // WAVE flag, LOWORD=codec
+#define BASS_CTYPE_STREAM_WAV_PCM	0x50001
+#define BASS_CTYPE_STREAM_WAV_FLOAT	0x50003
+#define BASS_CTYPE_MUSIC_MOD	0x20000
+#define BASS_CTYPE_MUSIC_MTM	0x20001
+#define BASS_CTYPE_MUSIC_S3M	0x20002
+#define BASS_CTYPE_MUSIC_XM		0x20003
+#define BASS_CTYPE_MUSIC_IT		0x20004
+#define BASS_CTYPE_MUSIC_MO3	0x00100 // MO3 flag
+
+typedef struct {
+	DWORD ctype;		// channel type
+#ifdef _WIN32_WCE
+	const wchar_t *name;	// format description
+	const wchar_t *exts;	// file extension filter (*.ext1;*.ext2;etc...)
+#else
+	const char *name;	// format description
+	const char *exts;	// file extension filter (*.ext1;*.ext2;etc...)
+#endif
+} BASS_PLUGINFORM;
+
+typedef struct {
+	DWORD version;					// version (same form as BASS_GetVersion)
+	DWORD formatc;					// number of formats
+	const BASS_PLUGINFORM *formats;	// the array of formats
+} BASS_PLUGININFO;
+
+// 3D vector (for 3D positions/velocities/orientations)
+typedef struct BASS_3DVECTOR {
+#ifdef __cplusplus
+	BASS_3DVECTOR() {};
+	BASS_3DVECTOR(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {};
+#endif
+	float x;	// +=right, -=left
+	float y;	// +=up, -=down
+	float z;	// +=front, -=behind
+} BASS_3DVECTOR;
+
+// 3D channel modes
+#define BASS_3DMODE_NORMAL		0	// normal 3D processing
+#define BASS_3DMODE_RELATIVE	1	// position is relative to the listener
+#define BASS_3DMODE_OFF			2	// no 3D processing
+
+// software 3D mixing algorithms (used with BASS_CONFIG_3DALGORITHM)
+#define BASS_3DALG_DEFAULT	0
+#define BASS_3DALG_OFF		1
+#define BASS_3DALG_FULL		2
+#define BASS_3DALG_LIGHT	3
+
+// EAX environments, use with BASS_SetEAXParameters
+enum
+{
+    EAX_ENVIRONMENT_GENERIC,
+    EAX_ENVIRONMENT_PADDEDCELL,
+    EAX_ENVIRONMENT_ROOM,
+    EAX_ENVIRONMENT_BATHROOM,
+    EAX_ENVIRONMENT_LIVINGROOM,
+    EAX_ENVIRONMENT_STONEROOM,
+    EAX_ENVIRONMENT_AUDITORIUM,
+    EAX_ENVIRONMENT_CONCERTHALL,
+    EAX_ENVIRONMENT_CAVE,
+    EAX_ENVIRONMENT_ARENA,
+    EAX_ENVIRONMENT_HANGAR,
+    EAX_ENVIRONMENT_CARPETEDHALLWAY,
+    EAX_ENVIRONMENT_HALLWAY,
+    EAX_ENVIRONMENT_STONECORRIDOR,
+    EAX_ENVIRONMENT_ALLEY,
+    EAX_ENVIRONMENT_FOREST,
+    EAX_ENVIRONMENT_CITY,
+    EAX_ENVIRONMENT_MOUNTAINS,
+    EAX_ENVIRONMENT_QUARRY,
+    EAX_ENVIRONMENT_PLAIN,
+    EAX_ENVIRONMENT_PARKINGLOT,
+    EAX_ENVIRONMENT_SEWERPIPE,
+    EAX_ENVIRONMENT_UNDERWATER,
+    EAX_ENVIRONMENT_DRUGGED,
+    EAX_ENVIRONMENT_DIZZY,
+    EAX_ENVIRONMENT_PSYCHOTIC,
+
+    EAX_ENVIRONMENT_COUNT			// total number of environments
+};
+
+// EAX presets, usage: BASS_SetEAXParameters(EAX_PRESET_xxx)
+#define EAX_PRESET_GENERIC         EAX_ENVIRONMENT_GENERIC,0.5F,1.493F,0.5F
+#define EAX_PRESET_PADDEDCELL      EAX_ENVIRONMENT_PADDEDCELL,0.25F,0.1F,0.0F
+#define EAX_PRESET_ROOM            EAX_ENVIRONMENT_ROOM,0.417F,0.4F,0.666F
+#define EAX_PRESET_BATHROOM        EAX_ENVIRONMENT_BATHROOM,0.653F,1.499F,0.166F
+#define EAX_PRESET_LIVINGROOM      EAX_ENVIRONMENT_LIVINGROOM,0.208F,0.478F,0.0F
+#define EAX_PRESET_STONEROOM       EAX_ENVIRONMENT_STONEROOM,0.5F,2.309F,0.888F
+#define EAX_PRESET_AUDITORIUM      EAX_ENVIRONMENT_AUDITORIUM,0.403F,4.279F,0.5F
+#define EAX_PRESET_CONCERTHALL     EAX_ENVIRONMENT_CONCERTHALL,0.5F,3.961F,0.5F
+#define EAX_PRESET_CAVE            EAX_ENVIRONMENT_CAVE,0.5F,2.886F,1.304F
+#define EAX_PRESET_ARENA           EAX_ENVIRONMENT_ARENA,0.361F,7.284F,0.332F
+#define EAX_PRESET_HANGAR          EAX_ENVIRONMENT_HANGAR,0.5F,10.0F,0.3F
+#define EAX_PRESET_CARPETEDHALLWAY EAX_ENVIRONMENT_CARPETEDHALLWAY,0.153F,0.259F,2.0F
+#define EAX_PRESET_HALLWAY         EAX_ENVIRONMENT_HALLWAY,0.361F,1.493F,0.0F
+#define EAX_PRESET_STONECORRIDOR   EAX_ENVIRONMENT_STONECORRIDOR,0.444F,2.697F,0.638F
+#define EAX_PRESET_ALLEY           EAX_ENVIRONMENT_ALLEY,0.25F,1.752F,0.776F
+#define EAX_PRESET_FOREST          EAX_ENVIRONMENT_FOREST,0.111F,3.145F,0.472F
+#define EAX_PRESET_CITY            EAX_ENVIRONMENT_CITY,0.111F,2.767F,0.224F
+#define EAX_PRESET_MOUNTAINS       EAX_ENVIRONMENT_MOUNTAINS,0.194F,7.841F,0.472F
+#define EAX_PRESET_QUARRY          EAX_ENVIRONMENT_QUARRY,1.0F,1.499F,0.5F
+#define EAX_PRESET_PLAIN           EAX_ENVIRONMENT_PLAIN,0.097F,2.767F,0.224F
+#define EAX_PRESET_PARKINGLOT      EAX_ENVIRONMENT_PARKINGLOT,0.208F,1.652F,1.5F
+#define EAX_PRESET_SEWERPIPE       EAX_ENVIRONMENT_SEWERPIPE,0.652F,2.886F,0.25F
+#define EAX_PRESET_UNDERWATER      EAX_ENVIRONMENT_UNDERWATER,1.0F,1.499F,0.0F
+#define EAX_PRESET_DRUGGED         EAX_ENVIRONMENT_DRUGGED,0.875F,8.392F,1.388F
+#define EAX_PRESET_DIZZY           EAX_ENVIRONMENT_DIZZY,0.139F,17.234F,0.666F
+#define EAX_PRESET_PSYCHOTIC       EAX_ENVIRONMENT_PSYCHOTIC,0.486F,7.563F,0.806F
+
+typedef DWORD (CALLBACK STREAMPROC)(HSTREAM handle, void *buffer, DWORD length, void *user);
+/* User stream callback function. NOTE: A stream function should obviously be as quick
+as possible, other streams (and MOD musics) can't be mixed until it's finished.
+handle : The stream that needs writing
+buffer : Buffer to write the samples in
+length : Number of bytes to write
+user   : The 'user' parameter value given when calling BASS_StreamCreate
+RETURN : Number of bytes written. Set the BASS_STREAMPROC_END flag to end
+         the stream. */
+
+#define BASS_STREAMPROC_END		0x80000000	// end of user stream flag
+
+// special STREAMPROCs
+#define STREAMPROC_DUMMY		(STREAMPROC*)0		// "dummy" stream
+#define STREAMPROC_PUSH			(STREAMPROC*)-1		// push stream
+
+// BASS_StreamCreateFileUser file systems
+#define STREAMFILE_NOBUFFER		0
+#define STREAMFILE_BUFFER		1
+#define STREAMFILE_BUFFERPUSH	2
+
+// User file stream callback functions
+typedef void (CALLBACK FILECLOSEPROC)(void *user);
+typedef QWORD (CALLBACK FILELENPROC)(void *user);
+typedef DWORD (CALLBACK FILEREADPROC)(void *buffer, DWORD length, void *user);
+typedef BOOL (CALLBACK FILESEEKPROC)(QWORD offset, void *user);
+
+typedef struct {
+	FILECLOSEPROC *close;
+	FILELENPROC *length;
+	FILEREADPROC *read;
+	FILESEEKPROC *seek;
+} BASS_FILEPROCS;
+
+// BASS_StreamPutFileData options
+#define BASS_FILEDATA_END		0	// end & close the file
+
+// BASS_StreamGetFilePosition modes
+#define BASS_FILEPOS_CURRENT	0
+#define BASS_FILEPOS_DECODE		BASS_FILEPOS_CURRENT
+#define BASS_FILEPOS_DOWNLOAD	1
+#define BASS_FILEPOS_END		2
+#define BASS_FILEPOS_START		3
+#define BASS_FILEPOS_CONNECTED	4
+#define BASS_FILEPOS_BUFFER		5
+#define BASS_FILEPOS_SOCKET		6
+
+typedef void (CALLBACK DOWNLOADPROC)(const void *buffer, DWORD length, void *user);
+/* Internet stream download callback function.
+buffer : Buffer containing the downloaded data... NULL=end of download
+length : Number of bytes in the buffer
+user   : The 'user' parameter value given when calling BASS_StreamCreateURL */
+
+// BASS_ChannelSetSync types
+#define BASS_SYNC_POS			0
+#define BASS_SYNC_END			2
+#define BASS_SYNC_META			4
+#define BASS_SYNC_SLIDE			5
+#define BASS_SYNC_STALL			6
+#define BASS_SYNC_DOWNLOAD		7
+#define BASS_SYNC_FREE			8
+#define BASS_SYNC_SETPOS		11
+#define BASS_SYNC_MUSICPOS		10
+#define BASS_SYNC_MUSICINST		1
+#define BASS_SYNC_MUSICFX		3
+#define BASS_SYNC_OGG_CHANGE	12
+#define BASS_SYNC_MIXTIME		0x40000000	// FLAG: sync at mixtime, else at playtime
+#define BASS_SYNC_ONETIME		0x80000000	// FLAG: sync only once, else continuously
+
+typedef void (CALLBACK SYNCPROC)(HSYNC handle, DWORD channel, DWORD data, void *user);
+/* Sync callback function. NOTE: a sync callback function should be very
+quick as other syncs can't be processed until it has finished. If the sync
+is a "mixtime" sync, then other streams and MOD musics can't be mixed until
+it's finished either.
+handle : The sync that has occured
+channel: Channel that the sync occured in
+data   : Additional data associated with the sync's occurance
+user   : The 'user' parameter given when calling BASS_ChannelSetSync */
+
+typedef void (CALLBACK DSPPROC)(HDSP handle, DWORD channel, void *buffer, DWORD length, void *user);
+/* DSP callback function. NOTE: A DSP function should obviously be as quick as
+possible... other DSP functions, streams and MOD musics can not be processed
+until it's finished.
+handle : The DSP handle
+channel: Channel that the DSP is being applied to
+buffer : Buffer to apply the DSP to
+length : Number of bytes in the buffer
+user   : The 'user' parameter given when calling BASS_ChannelSetDSP */
+
+typedef BOOL (CALLBACK RECORDPROC)(HRECORD handle, const void *buffer, DWORD length, void *user);
+/* Recording callback function.
+handle : The recording handle
+buffer : Buffer containing the recorded sample data
+length : Number of bytes
+user   : The 'user' parameter value given when calling BASS_RecordStart
+RETURN : TRUE = continue recording, FALSE = stop */
+
+// BASS_ChannelIsActive return values
+#define BASS_ACTIVE_STOPPED	0
+#define BASS_ACTIVE_PLAYING	1
+#define BASS_ACTIVE_STALLED	2
+#define BASS_ACTIVE_PAUSED	3
+
+// Channel attributes
+#define BASS_ATTRIB_FREQ			1
+#define BASS_ATTRIB_VOL				2
+#define BASS_ATTRIB_PAN				3
+#define BASS_ATTRIB_EAXMIX			4
+#define BASS_ATTRIB_MUSIC_AMPLIFY	0x100
+#define BASS_ATTRIB_MUSIC_PANSEP	0x101
+#define BASS_ATTRIB_MUSIC_PSCALER	0x102
+#define BASS_ATTRIB_MUSIC_BPM		0x103
+#define BASS_ATTRIB_MUSIC_SPEED		0x104
+#define BASS_ATTRIB_MUSIC_VOL_GLOBAL 0x105
+#define BASS_ATTRIB_MUSIC_VOL_CHAN	0x200 // + channel #
+#define BASS_ATTRIB_MUSIC_VOL_INST	0x300 // + instrument #
+
+// BASS_ChannelGetData flags
+#define BASS_DATA_AVAILABLE	0			// query how much data is buffered
+#define BASS_DATA_FLOAT		0x40000000	// flag: return floating-point sample data
+#define BASS_DATA_FFT256	0x80000000	// 256 sample FFT
+#define BASS_DATA_FFT512	0x80000001	// 512 FFT
+#define BASS_DATA_FFT1024	0x80000002	// 1024 FFT
+#define BASS_DATA_FFT2048	0x80000003	// 2048 FFT
+#define BASS_DATA_FFT4096	0x80000004	// 4096 FFT
+#define BASS_DATA_FFT8192	0x80000005	// 8192 FFT
+#define BASS_DATA_FFT_INDIVIDUAL 0x10	// FFT flag: FFT for each channel, else all combined
+#define BASS_DATA_FFT_NOWINDOW	0x20	// FFT flag: no Hanning window
+
+// BASS_ChannelGetTags types : what's returned
+#define BASS_TAG_ID3		0	// ID3v1 tags : TAG_ID3 structure
+#define BASS_TAG_ID3V2		1	// ID3v2 tags : variable length block
+#define BASS_TAG_OGG		2	// OGG comments : series of null-terminated UTF-8 strings
+#define BASS_TAG_HTTP		3	// HTTP headers : series of null-terminated ANSI strings
+#define BASS_TAG_ICY		4	// ICY headers : series of null-terminated ANSI strings
+#define BASS_TAG_META		5	// ICY metadata : ANSI string
+#define BASS_TAG_VENDOR		9	// OGG encoder : UTF-8 string
+#define BASS_TAG_LYRICS3	10	// Lyric3v2 tag : ASCII string
+#define BASS_TAG_CA_CODEC	11	// CoreAudio codec info : TAG_CA_CODEC structure
+#define BASS_TAG_RIFF_INFO	0x100 // RIFF "INFO" tags : series of null-terminated ANSI strings
+#define BASS_TAG_RIFF_BEXT	0x101 // RIFF/BWF "bext" tags : TAG_BEXT structure
+#define BASS_TAG_RIFF_CART	0x102 // RIFF/BWF "cart" tags : TAG_CART structure
+#define BASS_TAG_MUSIC_NAME		0x10000	// MOD music name : ANSI string
+#define BASS_TAG_MUSIC_MESSAGE	0x10001	// MOD message : ANSI string
+#define BASS_TAG_MUSIC_ORDERS	0x10002	// MOD order list : BYTE array of pattern numbers
+#define BASS_TAG_MUSIC_INST		0x10100	// + instrument #, MOD instrument name : ANSI string
+#define BASS_TAG_MUSIC_SAMPLE	0x10300	// + sample #, MOD sample name : ANSI string
+
+// ID3v1 tag structure
+typedef struct {
+	char id[3];
+	char title[30];
+	char artist[30];
+	char album[30];
+	char year[4];
+	char comment[30];
+	BYTE genre;
+} TAG_ID3;
+
+// BWF "bext" tag structure
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4200)
+#endif
+#pragma pack(push,1)
+typedef struct {
+	char Description[256];			// description
+	char Originator[32];			// name of the originator
+	char OriginatorReference[32];	// reference of the originator
+	char OriginationDate[10];		// date of creation (yyyy-mm-dd)
+	char OriginationTime[8];		// time of creation (hh-mm-ss)
+	QWORD TimeReference;			// first sample count since midnight (little-endian)
+	WORD Version;					// BWF version (little-endian)
+	BYTE UMID[64];					// SMPTE UMID
+	BYTE Reserved[190];
+#if defined(__GNUC__) && __GNUC__<3
+	char CodingHistory[0];			// history
+#elif 1 // change to 0 if compiler fails the following line
+	char CodingHistory[];			// history
+#else
+	char CodingHistory[1];			// history
+#endif
+} TAG_BEXT;
+#pragma pack(pop)
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// BWF "cart" tag structures
+typedef struct
+{
+	DWORD dwUsage;					// FOURCC timer usage ID
+	DWORD dwValue;					// timer value in samples from head
+} TAG_CART_TIMER;
+
+typedef struct
+{
+	char Version[4];				// version of the data structure
+	char Title[64];					// title of cart audio sequence
+	char Artist[64];				// artist or creator name
+	char CutID[64];					// cut number identification
+	char ClientID[64];				// client identification
+	char Category[64];				// category ID, PSA, NEWS, etc
+	char Classification[64];		// classification or auxiliary key
+	char OutCue[64];				// out cue text
+	char StartDate[10];				// yyyy-mm-dd
+	char StartTime[8];				// hh:mm:ss
+	char EndDate[10];				// yyyy-mm-dd
+	char EndTime[8];				// hh:mm:ss
+	char ProducerAppID[64];			// name of vendor or application
+	char ProducerAppVersion[64];	// version of producer application
+	char UserDef[64];				// user defined text
+	DWORD dwLevelReference;			// sample value for 0 dB reference
+	TAG_CART_TIMER PostTimer[8];	// 8 time markers after head
+	char Reserved[276];
+	char URL[1024];					// uniform resource locator
+#if defined(__GNUC__) && __GNUC__<3
+	char TagText[0];				// free form text for scripts or tags
+#elif 1 // change to 0 if compiler fails the following line
+	char TagText[];					// free form text for scripts or tags
+#else
+	char TagText[1];				// free form text for scripts or tags
+#endif
+} TAG_CART;
+
+// CoreAudio codec info structure
+typedef struct {
+	DWORD ftype;					// file format
+	DWORD atype;					// audio format
+	const char *name;				// description
+} TAG_CA_CODEC;
+
+// BASS_ChannelGetLength/GetPosition/SetPosition modes
+#define BASS_POS_BYTE			0		// byte position
+#define BASS_POS_MUSIC_ORDER	1		// order.row position, MAKELONG(order,row)
+#define BASS_POS_DECODE			0x10000000 // flag: get the decoding (not playing) position
+
+// BASS_RecordSetInput flags
+#define BASS_INPUT_OFF		0x10000
+#define BASS_INPUT_ON		0x20000
+
+#define BASS_INPUT_TYPE_MASK		0xff000000
+#define BASS_INPUT_TYPE_UNDEF		0x00000000
+#define BASS_INPUT_TYPE_DIGITAL		0x01000000
+#define BASS_INPUT_TYPE_LINE		0x02000000
+#define BASS_INPUT_TYPE_MIC			0x03000000
+#define BASS_INPUT_TYPE_SYNTH		0x04000000
+#define BASS_INPUT_TYPE_CD			0x05000000
+#define BASS_INPUT_TYPE_PHONE		0x06000000
+#define BASS_INPUT_TYPE_SPEAKER		0x07000000
+#define BASS_INPUT_TYPE_WAVE		0x08000000
+#define BASS_INPUT_TYPE_AUX			0x09000000
+#define BASS_INPUT_TYPE_ANALOG		0x0a000000
+
+// DX8 effect types, use with BASS_ChannelSetFX
+enum
+{
+	BASS_FX_DX8_CHORUS,
+	BASS_FX_DX8_COMPRESSOR,
+	BASS_FX_DX8_DISTORTION,
+	BASS_FX_DX8_ECHO,
+	BASS_FX_DX8_FLANGER,
+	BASS_FX_DX8_GARGLE,
+	BASS_FX_DX8_I3DL2REVERB,
+	BASS_FX_DX8_PARAMEQ,
+	BASS_FX_DX8_REVERB
+};
+
+typedef struct {
+    float       fWetDryMix;
+    float       fDepth;
+    float       fFeedback;
+    float       fFrequency;
+    DWORD       lWaveform;	// 0=triangle, 1=sine
+    float       fDelay;
+    DWORD       lPhase;		// BASS_DX8_PHASE_xxx
+} BASS_DX8_CHORUS;
+
+typedef struct {
+    float   fGain;
+    float   fAttack;
+    float   fRelease;
+    float   fThreshold;
+    float   fRatio;
+    float   fPredelay;
+} BASS_DX8_COMPRESSOR;
+
+typedef struct {
+    float   fGain;
+    float   fEdge;
+    float   fPostEQCenterFrequency;
+    float   fPostEQBandwidth;
+    float   fPreLowpassCutoff;
+} BASS_DX8_DISTORTION;
+
+typedef struct {
+    float   fWetDryMix;
+    float   fFeedback;
+    float   fLeftDelay;
+    float   fRightDelay;
+    BOOL    lPanDelay;
+} BASS_DX8_ECHO;
+
+typedef struct {
+    float       fWetDryMix;
+    float       fDepth;
+    float       fFeedback;
+    float       fFrequency;
+    DWORD       lWaveform;	// 0=triangle, 1=sine
+    float       fDelay;
+    DWORD       lPhase;		// BASS_DX8_PHASE_xxx
+} BASS_DX8_FLANGER;
+
+typedef struct {
+    DWORD       dwRateHz;               // Rate of modulation in hz
+    DWORD       dwWaveShape;            // 0=triangle, 1=square
+} BASS_DX8_GARGLE;
+
+typedef struct {
+    int     lRoom;                  // [-10000, 0]      default: -1000 mB
+    int     lRoomHF;                // [-10000, 0]      default: 0 mB
+    float   flRoomRolloffFactor;    // [0.0, 10.0]      default: 0.0
+    float   flDecayTime;            // [0.1, 20.0]      default: 1.49s
+    float   flDecayHFRatio;         // [0.1, 2.0]       default: 0.83
+    int     lReflections;           // [-10000, 1000]   default: -2602 mB
+    float   flReflectionsDelay;     // [0.0, 0.3]       default: 0.007 s
+    int     lReverb;                // [-10000, 2000]   default: 200 mB
+    float   flReverbDelay;          // [0.0, 0.1]       default: 0.011 s
+    float   flDiffusion;            // [0.0, 100.0]     default: 100.0 %
+    float   flDensity;              // [0.0, 100.0]     default: 100.0 %
+    float   flHFReference;          // [20.0, 20000.0]  default: 5000.0 Hz
+} BASS_DX8_I3DL2REVERB;
+
+typedef struct {
+    float   fCenter;
+    float   fBandwidth;
+    float   fGain;
+} BASS_DX8_PARAMEQ;
+
+typedef struct {
+    float   fInGain;                // [-96.0,0.0]            default: 0.0 dB
+    float   fReverbMix;             // [-96.0,0.0]            default: 0.0 db
+    float   fReverbTime;            // [0.001,3000.0]         default: 1000.0 ms
+    float   fHighFreqRTRatio;       // [0.001,0.999]          default: 0.001
+} BASS_DX8_REVERB;
+
+#define BASS_DX8_PHASE_NEG_180        0
+#define BASS_DX8_PHASE_NEG_90         1
+#define BASS_DX8_PHASE_ZERO           2
+#define BASS_DX8_PHASE_90             3
+#define BASS_DX8_PHASE_180            4
+
+BOOL BASSDEF(BASS_SetConfig)(DWORD option, DWORD value);
+DWORD BASSDEF(BASS_GetConfig)(DWORD option);
+BOOL BASSDEF(BASS_SetConfigPtr)(DWORD option, void *value);
+void *BASSDEF(BASS_GetConfigPtr)(DWORD option);
+DWORD BASSDEF(BASS_GetVersion)();
+int BASSDEF(BASS_ErrorGetCode)();
+BOOL BASSDEF(BASS_GetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info);
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, HWND win, const GUID *dsguid);
+#else
+BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, void *win, void *dsguid);
+#endif
+BOOL BASSDEF(BASS_SetDevice)(DWORD device);
+DWORD BASSDEF(BASS_GetDevice)();
+BOOL BASSDEF(BASS_Free)();
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+void *BASSDEF(BASS_GetDSoundObject)(DWORD object);
+#endif
+BOOL BASSDEF(BASS_GetInfo)(BASS_INFO *info);
+BOOL BASSDEF(BASS_Update)(DWORD length);
+float BASSDEF(BASS_GetCPU)();
+BOOL BASSDEF(BASS_Start)();
+BOOL BASSDEF(BASS_Stop)();
+BOOL BASSDEF(BASS_Pause)();
+BOOL BASSDEF(BASS_SetVolume)(float volume);
+float BASSDEF(BASS_GetVolume)();
+
+HPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags);
+BOOL BASSDEF(BASS_PluginFree)(HPLUGIN handle);
+const BASS_PLUGININFO *BASSDEF(BASS_PluginGetInfo)(HPLUGIN handle);
+
+BOOL BASSDEF(BASS_Set3DFactors)(float distf, float rollf, float doppf);
+BOOL BASSDEF(BASS_Get3DFactors)(float *distf, float *rollf, float *doppf);
+BOOL BASSDEF(BASS_Set3DPosition)(const BASS_3DVECTOR *pos, const BASS_3DVECTOR *vel, const BASS_3DVECTOR *front, const BASS_3DVECTOR *top);
+BOOL BASSDEF(BASS_Get3DPosition)(BASS_3DVECTOR *pos, BASS_3DVECTOR *vel, BASS_3DVECTOR *front, BASS_3DVECTOR *top);
+void BASSDEF(BASS_Apply3D)();
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+BOOL BASSDEF(BASS_SetEAXParameters)(int env, float vol, float decay, float damp);
+BOOL BASSDEF(BASS_GetEAXParameters)(DWORD *env, float *vol, float *decay, float *damp);
+#endif
+
+HMUSIC BASSDEF(BASS_MusicLoad)(BOOL mem, const void *file, QWORD offset, DWORD length, DWORD flags, DWORD freq);
+BOOL BASSDEF(BASS_MusicFree)(HMUSIC handle);
+
+HSAMPLE BASSDEF(BASS_SampleLoad)(BOOL mem, const void *file, QWORD offset, DWORD length, DWORD max, DWORD flags);
+HSAMPLE BASSDEF(BASS_SampleCreate)(DWORD length, DWORD freq, DWORD chans, DWORD max, DWORD flags);
+BOOL BASSDEF(BASS_SampleFree)(HSAMPLE handle);
+BOOL BASSDEF(BASS_SampleSetData)(HSAMPLE handle, const void *buffer);
+BOOL BASSDEF(BASS_SampleGetData)(HSAMPLE handle, void *buffer);
+BOOL BASSDEF(BASS_SampleGetInfo)(HSAMPLE handle, BASS_SAMPLE *info);
+BOOL BASSDEF(BASS_SampleSetInfo)(HSAMPLE handle, const BASS_SAMPLE *info);
+HCHANNEL BASSDEF(BASS_SampleGetChannel)(HSAMPLE handle, BOOL onlynew);
+DWORD BASSDEF(BASS_SampleGetChannels)(HSAMPLE handle, HCHANNEL *channels);
+BOOL BASSDEF(BASS_SampleStop)(HSAMPLE handle);
+
+HSTREAM BASSDEF(BASS_StreamCreate)(DWORD freq, DWORD chans, DWORD flags, STREAMPROC *proc, void *user);
+HSTREAM BASSDEF(BASS_StreamCreateFile)(BOOL mem, const void *file, QWORD offset, QWORD length, DWORD flags);
+HSTREAM BASSDEF(BASS_StreamCreateURL)(const char *url, DWORD offset, DWORD flags, DOWNLOADPROC *proc, void *user);
+HSTREAM BASSDEF(BASS_StreamCreateFileUser)(DWORD system, DWORD flags, const BASS_FILEPROCS *proc, void *user);
+BOOL BASSDEF(BASS_StreamFree)(HSTREAM handle);
+QWORD BASSDEF(BASS_StreamGetFilePosition)(HSTREAM handle, DWORD mode);
+DWORD BASSDEF(BASS_StreamPutData)(HSTREAM handle, const void *buffer, DWORD length);
+DWORD BASSDEF(BASS_StreamPutFileData)(HSTREAM handle, const void *buffer, DWORD length);
+
+BOOL BASSDEF(BASS_RecordGetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info);
+BOOL BASSDEF(BASS_RecordInit)(int device);
+BOOL BASSDEF(BASS_RecordSetDevice)(DWORD device);
+DWORD BASSDEF(BASS_RecordGetDevice)();
+BOOL BASSDEF(BASS_RecordFree)();
+BOOL BASSDEF(BASS_RecordGetInfo)(BASS_RECORDINFO *info);
+const char *BASSDEF(BASS_RecordGetInputName)(int input);
+BOOL BASSDEF(BASS_RecordSetInput)(int input, DWORD flags, float volume);
+DWORD BASSDEF(BASS_RecordGetInput)(int input, float *volume);
+HRECORD BASSDEF(BASS_RecordStart)(DWORD freq, DWORD chans, DWORD flags, RECORDPROC *proc, void *user);
+
+double BASSDEF(BASS_ChannelBytes2Seconds)(DWORD handle, QWORD pos);
+QWORD BASSDEF(BASS_ChannelSeconds2Bytes)(DWORD handle, double pos);
+DWORD BASSDEF(BASS_ChannelGetDevice)(DWORD handle);
+BOOL BASSDEF(BASS_ChannelSetDevice)(DWORD handle, DWORD device);
+DWORD BASSDEF(BASS_ChannelIsActive)(DWORD handle);
+BOOL BASSDEF(BASS_ChannelGetInfo)(DWORD handle, BASS_CHANNELINFO *info);
+const char *BASSDEF(BASS_ChannelGetTags)(DWORD handle, DWORD tags);
+DWORD BASSDEF(BASS_ChannelFlags)(DWORD handle, DWORD flags, DWORD mask);
+BOOL BASSDEF(BASS_ChannelUpdate)(DWORD handle, DWORD length);
+BOOL BASSDEF(BASS_ChannelLock)(DWORD handle, BOOL lock);
+BOOL BASSDEF(BASS_ChannelPlay)(DWORD handle, BOOL restart);
+BOOL BASSDEF(BASS_ChannelStop)(DWORD handle);
+BOOL BASSDEF(BASS_ChannelPause)(DWORD handle);
+BOOL BASSDEF(BASS_ChannelSetAttribute)(DWORD handle, DWORD attrib, float value);
+BOOL BASSDEF(BASS_ChannelGetAttribute)(DWORD handle, DWORD attrib, float *value);
+BOOL BASSDEF(BASS_ChannelSlideAttribute)(DWORD handle, DWORD attrib, float value, DWORD time);
+BOOL BASSDEF(BASS_ChannelIsSliding)(DWORD handle, DWORD attrib);
+BOOL BASSDEF(BASS_ChannelSet3DAttributes)(DWORD handle, int mode, float min, float max, int iangle, int oangle, float outvol);
+BOOL BASSDEF(BASS_ChannelGet3DAttributes)(DWORD handle, DWORD *mode, float *min, float *max, DWORD *iangle, DWORD *oangle, float *outvol);
+BOOL BASSDEF(BASS_ChannelSet3DPosition)(DWORD handle, const BASS_3DVECTOR *pos, const BASS_3DVECTOR *orient, const BASS_3DVECTOR *vel);
+BOOL BASSDEF(BASS_ChannelGet3DPosition)(DWORD handle, BASS_3DVECTOR *pos, BASS_3DVECTOR *orient, BASS_3DVECTOR *vel);
+QWORD BASSDEF(BASS_ChannelGetLength)(DWORD handle, DWORD mode);
+BOOL BASSDEF(BASS_ChannelSetPosition)(DWORD handle, QWORD pos, DWORD mode);
+QWORD BASSDEF(BASS_ChannelGetPosition)(DWORD handle, DWORD mode);
+DWORD BASSDEF(BASS_ChannelGetLevel)(DWORD handle);
+DWORD BASSDEF(BASS_ChannelGetData)(DWORD handle, void *buffer, DWORD length);
+HSYNC BASSDEF(BASS_ChannelSetSync)(DWORD handle, DWORD type, QWORD param, SYNCPROC *proc, void *user);
+BOOL BASSDEF(BASS_ChannelRemoveSync)(DWORD handle, HSYNC sync);
+HDSP BASSDEF(BASS_ChannelSetDSP)(DWORD handle, DSPPROC *proc, void *user, int priority);
+BOOL BASSDEF(BASS_ChannelRemoveDSP)(DWORD handle, HDSP dsp);
+BOOL BASSDEF(BASS_ChannelSetLink)(DWORD handle, DWORD chan);
+BOOL BASSDEF(BASS_ChannelRemoveLink)(DWORD handle, DWORD chan);
+HFX BASSDEF(BASS_ChannelSetFX)(DWORD handle, DWORD type, int priority);
+BOOL BASSDEF(BASS_ChannelRemoveFX)(DWORD handle, HFX fx);
+
+BOOL BASSDEF(BASS_FXSetParameters)(HFX handle, const void *params);
+BOOL BASSDEF(BASS_FXGetParameters)(HFX handle, void *params);
+BOOL BASSDEF(BASS_FXReset)(HFX handle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/bass/bass.lib and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/bass/bass.lib differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/diff-sap.js kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/diff-sap.js
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/diff-sap.js	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/diff-sap.js	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,65 @@
+// wscript.exe "PATH\TO\diff-sap.js" %base %mine %bname %yname //E:javascript
+
+// Get command-line arguments
+
+var sap1;
+var sap2;
+var names = "";
+switch (WScript.Arguments.length) {
+case 4:
+	names =  " /basename:\"" + WScript.Arguments(2) + "\" /minename:\"" + WScript.Arguments(3) + "\"";
+	// FALLTHROUGH
+case 2:
+	sap1 = WScript.Arguments(0);
+	sap2 = WScript.Arguments(1);
+	break;
+default:
+	WScript.Echo("Specify two filenames plus optional two headers");
+	WScript.Quit(1);
+}
+
+// Find TortoiseMerge
+
+var wsh = new ActiveXObject("WScript.Shell");
+var tmerge;
+try {
+	tmerge = wsh.RegRead("HKLM\\SOFTWARE\\TortoiseSVN\\TMergePath");
+}
+catch (e) {
+	try {
+		tmerge = wsh.RegRead("HKLM\\SOFTWARE\\TortoiseGit\\TMergePath");
+	}
+	catch (e) {
+		WScript.Echo("TortoiseMerge not found!");
+		WScript.Quit(1);
+	}
+}
+
+// Convert SAPs to plain text
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var exe = fso.GetParentFolderName(WScript.ScriptFullName);
+exe = fso.BuildPath(exe, "sap2txt.exe");
+
+function sap2txt(sap)
+{
+	var txt = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName());
+	wsh.Run("cmd /c \"\"" + exe + "\" \"" + sap + "\" >\"" + txt + "\"\"", 0, true);
+	return txt;
+}
+
+var txt1 = sap2txt(sap1);
+var txt2 = sap2txt(sap2);
+
+// Display results
+
+wsh.Run("\"" + tmerge + "\" /base:\"" + txt1 + "\" /mine:\"" + txt2 + "\"" + names, 4, true);
+
+// Write back changes
+
+wsh.Run("\"" + exe +"\" \"" + txt2 + "\" \"" + sap2 + "\"", 0, true);
+
+// Delete temporary files when done
+
+fso.DeleteFile(txt2);
+fso.DeleteFile(txt1);
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/foobar2000/foo_asap.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/foobar2000/foo_asap.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/foobar2000/foo_asap.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/foobar2000/foo_asap.cpp	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,751 @@
+/*
+ * foo_asap.cpp - ASAP plugin for foobar2000
+ *
+ * Copyright (C) 2006-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#define _WINSOCKAPI_ /* prevents compilation errors */
+#include <windows.h>
+#include <string.h>
+
+#include "aatr-stdio.h"
+#include "asap.h"
+#include "info_dlg.h"
+#include "settings_dlg.h"
+
+#define UNICODE /* NOT for info_dlg.h */
+#include "foobar2000/SDK/foobar2000.h"
+
+#define BITS_PER_SAMPLE    16
+#define BUFFERED_BLOCKS    1024
+
+/* Configuration --------------------------------------------------------- */
+
+static const GUID preferences_guid =
+	{ 0xf7c0a763, 0x7c20, 0x4b64, { 0x92, 0xbf, 0x11, 0xe5, 0x5d, 0x8, 0xe5, 0x53 } };
+
+static const GUID song_length_guid =
+	{ 0x810e12f0, 0xa695, 0x42d2, { 0xab, 0xc0, 0x14, 0x1e, 0xe5, 0xf3, 0xb3, 0xb7 } };
+static cfg_int song_length(song_length_guid, -1);
+
+static const GUID silence_seconds_guid =
+	{ 0x40170cb0, 0xc18c, 0x4f97, { 0xaa, 0x06, 0xdb, 0xe7, 0x45, 0xb0, 0x7e, 0x1d } };
+static cfg_int silence_seconds(silence_seconds_guid, -1);
+
+static const GUID play_loops_guid =
+	{ 0xf08d12f8, 0x58d6, 0x49fc, { 0xae, 0xc5, 0xf4, 0xd0, 0x2f, 0xb2, 0x20, 0xaf } };
+static cfg_bool play_loops(play_loops_guid, false);
+
+static const GUID mute_mask_guid =
+	{ 0x8bd94472, 0x82f1, 0x4e77, { 0x95, 0x78, 0xe9, 0x84, 0x75, 0xad, 0x17, 0x04 } };
+static cfg_int mute_mask(mute_mask_guid, 0);
+
+static const GUID playing_info_guid =
+	{ 0x8a2d4509, 0x405e, 0x482e, { 0xa1, 0x30, 0x3f, 0x0c, 0xd6, 0x16, 0x98, 0x59 } };
+static cfg_bool playing_info_cfg(playing_info_guid, false);
+
+void onUpdatePlayingInfo()
+{
+	playing_info_cfg = playing_info != FALSE; /* avoid warning C4800 */
+}
+
+
+/* Decoding -------------------------------------------------------------- */
+
+inline bool has_ext(const char *path, const char *ext)
+{
+	size_t len = strlen(path);
+	return len >= 4 && _stricmp(path + len - 4, ext) == 0;
+}
+
+class input_asap
+{
+	static input_asap *head;
+	input_asap *prev = nullptr;
+	input_asap *next;
+	service_ptr_t<file> m_file;
+	char *url = nullptr;
+	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len;
+	ASAP *asap;
+
+	int get_song_duration(int song, bool play)
+	{
+		const ASAPInfo *info = ASAP_GetInfo(asap);
+		int duration = ASAPInfo_GetDuration(info, song);
+		if (duration < 0) {
+			if (play)
+				ASAP_DetectSilence(asap, silence_seconds);
+			return 1000 * song_length;
+		}
+		if (play)
+			ASAP_DetectSilence(asap, 0);
+		if (play_loops && ASAPInfo_GetLoop(info, song))
+			return 1000 * song_length;
+		return duration;
+	}
+
+	static void meta_set(file_info &p_info, const char *p_name, const char *p_value)
+	{
+		if (p_value[0] != '\0')
+			p_info.meta_set(p_name, p_value);
+	}
+
+	static const char *empty_if_null(const char *s)
+	{
+		return s != nullptr ? s : "";
+	}
+
+public:
+
+	static void g_set_mute_mask(int mask)
+	{
+		for (input_asap *p = head; p != nullptr; p = p->next)
+			ASAP_MutePokeyChannels(p->asap, mask);
+	}
+
+	static bool g_is_our_content_type(const char *p_content_type)
+	{
+		return false;
+	}
+
+	static bool g_is_our_path(const char *p_path, const char *p_extension)
+	{
+		return ASAPInfo_IsOurFile(p_path) != 0;
+	}
+
+	static GUID g_get_guid()
+	{
+		static const GUID guid =
+			{ 0xe8790443, 0x3a6b, 0x47d9, { 0x80, 0x4c, 0x1, 0x58, 0x93, 0xbf, 0xfe, 0x96 } };
+		return guid;
+	}
+
+	static const char *g_get_name()
+	{
+		return "ASAP";
+	}
+
+	static GUID g_get_preferences_guid()
+	{
+		return preferences_guid;
+	}
+
+	static bool g_is_low_merit()
+	{
+		return false;
+	}
+
+	input_asap()
+	{
+		if (head != nullptr)
+			head->prev = this;
+		next = head;
+		head = this;
+		asap = ASAP_New();
+	}
+
+	~input_asap()
+	{
+		ASAP_Delete(asap);
+		free(url);
+		if (prev != nullptr)
+			prev->next = next;
+		if (next != nullptr)
+			next->prev = prev;
+		if (head == this)
+			head = next;
+	}
+
+	void open(service_ptr_t<file> p_filehint, const char *p_path, t_input_open_reason p_reason, abort_callback &p_abort)
+	{
+		switch (p_reason) {
+		case input_open_info_write:
+			if (!has_ext(p_path, ".sap"))
+				throw exception_io_unsupported_format();
+			/* FALLTHROUGH */
+		case input_open_decode:
+			free(url);
+			url = strdup(p_path);
+			break;
+		default:
+			break;
+		}
+		if (p_filehint.is_empty())
+			filesystem::g_open(p_filehint, p_path, filesystem::open_mode_read, p_abort);
+		m_file = p_filehint;
+		module_len = static_cast<int>(m_file->read(module, sizeof(module), p_abort));
+		if (!ASAP_Load(asap, p_path, module, module_len))
+			throw exception_io_unsupported_format();
+	}
+
+	t_uint32 get_subsong_count()
+	{
+		return ASAPInfo_GetSongs(ASAP_GetInfo(asap));
+	}
+
+	t_uint32 get_subsong(t_uint32 p_index)
+	{
+		return p_index;
+	}
+
+	void get_info(t_uint32 p_subsong, file_info &p_info, abort_callback &p_abort)
+	{
+		int duration = get_song_duration(p_subsong, false);
+		if (duration >= 0)
+			p_info.set_length(duration / 1000.0);
+		const ASAPInfo *info = ASAP_GetInfo(asap);
+		p_info.info_set_int("channels", ASAPInfo_GetChannels(info));
+		p_info.info_set_int("subsongs", ASAPInfo_GetSongs(info));
+		meta_set(p_info, "composer", ASAPInfo_GetAuthor(info));
+		meta_set(p_info, "title", ASAPInfo_GetTitle(info));
+		meta_set(p_info, "date", ASAPInfo_GetDate(info));
+	}
+
+	t_filestats get_file_stats(abort_callback &p_abort)
+	{
+		return m_file->get_stats(p_abort);
+	}
+
+	void decode_initialize(t_uint32 p_subsong, unsigned p_flags, abort_callback &p_abort)
+	{
+		int duration = get_song_duration(p_subsong, true);
+		if (!ASAP_PlaySong(asap, p_subsong, duration))
+			throw exception_io_unsupported_format();
+		ASAP_MutePokeyChannels(asap, mute_mask);
+		const char *filename = url;
+		if (foobar2000_io::_extract_native_path_ptr(filename))
+			setPlayingSong(filename, p_subsong);
+	}
+
+	bool decode_run(audio_chunk &p_chunk, abort_callback &p_abort)
+	{
+		int channels = ASAPInfo_GetChannels(ASAP_GetInfo(asap));
+		int buffered_bytes = BUFFERED_BLOCKS * channels * (BITS_PER_SAMPLE / 8);
+		BYTE buffer[BUFFERED_BLOCKS * 2 * (BITS_PER_SAMPLE / 8)];
+
+		buffered_bytes = ASAP_Generate(asap, buffer, buffered_bytes,
+			BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
+		if (buffered_bytes == 0)
+			return false;
+		p_chunk.set_data_fixedpoint(buffer, buffered_bytes, ASAP_SAMPLE_RATE,
+			channels, BITS_PER_SAMPLE,
+			channels == 2 ? audio_chunk::channel_config_stereo : audio_chunk::channel_config_mono);
+		return true;
+	}
+
+	void decode_seek(double p_seconds, abort_callback &p_abort)
+	{
+		ASAP_Seek(asap, static_cast<int>(p_seconds * 1000));
+	}
+
+	bool decode_can_seek()
+	{
+		return true;
+	}
+
+	bool decode_get_dynamic_info(file_info &p_out, double &p_timestamp_delta)
+	{
+		return false;
+	}
+
+	bool decode_get_dynamic_info_track(file_info &p_out, double &p_timestamp_delta)
+	{
+		return false;
+	}
+
+	void decode_on_idle(abort_callback &p_abort)
+	{
+		m_file->on_idle(p_abort);
+	}
+
+	void retag_set_info(t_uint32 p_subsong, const file_info &p_info, abort_callback &p_abort)
+	{
+		ASAPInfo *info = const_cast<ASAPInfo *>(ASAP_GetInfo(asap));
+		ASAPInfo_SetAuthor(info, empty_if_null(p_info.meta_get("composer", 0)));
+		ASAPInfo_SetTitle(info, empty_if_null(p_info.meta_get("title", 0)));
+		ASAPInfo_SetDate(info, empty_if_null(p_info.meta_get("date", 0)));
+	}
+
+	void retag_commit(abort_callback &p_abort)
+	{
+		ASAPWriter *writer = ASAPWriter_New();
+		if (writer == nullptr)
+			throw exception_io_data();
+		BYTE output[ASAPInfo_MAX_MODULE_LENGTH];
+		ASAPWriter_SetOutput(writer, output, 0, sizeof(output));
+		int output_len = ASAPWriter_Write(writer, url, ASAP_GetInfo(asap), module, module_len, FALSE);
+		ASAPWriter_Delete(writer);
+		if (output_len < 0)
+			throw exception_io_unsupported_format();
+
+		m_file.release();
+		filesystem::g_open(m_file, url, filesystem::open_mode_write_new, p_abort);
+		m_file->write(output, output_len, p_abort);
+	}
+
+	void set_logger(event_logger::ptr ptr)
+	{
+	}
+
+	typedef input_decoder interface_decoder_t;
+	typedef input_info_reader interface_info_reader_t;
+	typedef input_info_writer interface_info_writer_t;
+};
+
+input_asap *input_asap::head = nullptr;
+static input_factory_t<input_asap> g_input_asap_factory;
+
+
+/* Configuration --------------------------------------------------------- */
+
+static preferences_page_callback::ptr g_callback;
+
+static INT_PTR CALLBACK settings_dialog_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg) {
+	case WM_INITDIALOG:
+		settingsDialogSet(hDlg, song_length, silence_seconds, play_loops, mute_mask);
+		return TRUE;
+	case WM_COMMAND:
+		switch (wParam) {
+		case MAKEWPARAM(IDC_UNLIMITED, BN_CLICKED):
+			enableTimeInput(hDlg, FALSE);
+			g_callback->on_state_changed();
+			return TRUE;
+		case MAKEWPARAM(IDC_LIMITED, BN_CLICKED):
+			enableTimeInput(hDlg, TRUE);
+			setFocusAndSelect(hDlg, IDC_MINUTES);
+			g_callback->on_state_changed();
+			return TRUE;
+		case MAKEWPARAM(IDC_SILENCE, BN_CLICKED):
+		{
+			BOOL enabled = (IsDlgButtonChecked(hDlg, IDC_SILENCE) == BST_CHECKED);
+			EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), enabled);
+			if (enabled)
+				setFocusAndSelect(hDlg, IDC_SILSECONDS);
+			g_callback->on_state_changed();
+			return TRUE;
+		}
+		case MAKEWPARAM(IDC_MINUTES, EN_CHANGE):
+		case MAKEWPARAM(IDC_SECONDS, EN_CHANGE):
+		case MAKEWPARAM(IDC_SILSECONDS, EN_CHANGE):
+		case MAKEWPARAM(IDC_LOOPS, BN_CLICKED):
+		case MAKEWPARAM(IDC_NOLOOPS, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 1, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 2, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 3, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 4, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 5, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 6, BN_CLICKED):
+		case MAKEWPARAM(IDC_MUTE1 + 7, BN_CLICKED):
+			g_callback->on_state_changed();
+			return TRUE;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+	return FALSE;
+}
+
+class preferences_page_instance_asap : public preferences_page_instance
+{
+	HWND m_parent;
+	HWND m_hWnd;
+
+	int get_time_input()
+	{
+		HWND hDlg = m_hWnd;
+		if (IsDlgButtonChecked(hDlg, IDC_UNLIMITED) == BST_CHECKED)
+			return -1;
+		UINT minutes = GetDlgItemInt(hDlg, IDC_MINUTES, NULL, FALSE);
+		UINT seconds = GetDlgItemInt(hDlg, IDC_SECONDS, NULL, FALSE);
+		return static_cast<int>(60 * minutes + seconds);
+	}
+
+	int get_silence_input()
+	{
+		HWND hDlg = m_hWnd;
+		if (IsDlgButtonChecked(hDlg, IDC_SILENCE) != BST_CHECKED)
+			return -1;
+		return GetDlgItemInt(hDlg, IDC_SILSECONDS, NULL, FALSE);
+	}
+
+	bool get_loops_input()
+	{
+		return IsDlgButtonChecked(m_hWnd, IDC_LOOPS) == BST_CHECKED;
+	}
+
+	int get_mute_input()
+	{
+		HWND hDlg = m_hWnd;
+		int mask = 0;
+		for (int i = 0; i < 8; i++)
+			if (IsDlgButtonChecked(hDlg, IDC_MUTE1 + i) == BST_CHECKED)
+				mask |= 1 << i;
+		return mask;
+	}
+
+public:
+
+	preferences_page_instance_asap(HWND parent) : m_parent(parent)
+	{
+		m_hWnd = CreateDialog(core_api::get_my_instance(), MAKEINTRESOURCE(IDD_SETTINGS), parent, ::settings_dialog_proc);
+	}
+
+	t_uint32 get_state() override
+	{
+		if (song_length != get_time_input()
+		 || silence_seconds != get_silence_input()
+		 || play_loops != get_loops_input())
+			return preferences_state::changed /* | preferences_state::needs_restart_playback */ | preferences_state::resettable;
+		if (mute_mask != get_mute_input())
+			return preferences_state::changed | preferences_state::resettable;
+		return preferences_state::resettable;
+	}
+
+	HWND get_wnd() override
+	{
+		return m_hWnd;
+	}
+
+	void apply() override
+	{
+		song_length = get_time_input();
+		silence_seconds = get_silence_input();
+		play_loops = get_loops_input();
+		mute_mask = get_mute_input();
+		input_asap::g_set_mute_mask(mute_mask);
+		g_callback->on_state_changed();
+	}
+
+	void reset() override
+	{
+		settingsDialogSet(m_hWnd, -1, -1, FALSE, 0);
+		g_callback->on_state_changed();
+	}
+};
+
+class preferences_page_asap : public preferences_page_v3
+{
+public:
+
+	preferences_page_instance::ptr instantiate(HWND parent, preferences_page_callback::ptr callback) override
+	{
+		g_callback = callback;
+		return new service_impl_t<preferences_page_instance_asap>(parent);
+	}
+
+	const char *get_name() override
+	{
+		return "ASAP";
+	}
+
+	GUID get_guid() override
+	{
+		return preferences_guid;
+	}
+
+	GUID get_parent_guid() override
+	{
+		return guid_input;
+	}
+
+	bool get_help_url(pfc::string_base &p_out) override
+	{
+		p_out = "http://asap.sourceforge.net/";
+		return true;
+	}
+};
+
+static service_factory_single_t<preferences_page_asap> g_preferences_page_asap_factory;
+
+
+/* File types ------------------------------------------------------------ */
+
+static const char * const names_and_masks[][2] = {
+	{ "Slight Atari Player", "*.SAP" },
+	{ "Chaos Music Composer", "*.CMC;*.CM3;*.CMR;*.CMS;*.DMC" },
+	{ "Delta Music Composer", "*.DLT" },
+	{ "Music ProTracker", "*.MPT;*.MPD" },
+	{ "Raster Music Tracker", "*.RMT" },
+	{ "Theta Music Composer 1.x", "*.TMC;*.TM8" },
+	{ "Theta Music Composer 2.x", "*.TM2" },
+	{ "Future Composer", "*.FC" }
+};
+
+#define N_FILE_TYPES (sizeof(names_and_masks) / sizeof(names_and_masks[0]))
+
+class input_file_type_asap : public service_impl_single_t<input_file_type>
+{
+public:
+
+	unsigned get_count() override
+	{
+		return N_FILE_TYPES;
+	}
+
+	bool get_name(unsigned idx, pfc::string_base &out) override
+	{
+		if (idx < N_FILE_TYPES) {
+			out = ::names_and_masks[idx][0];
+			return true;
+		}
+		return false;
+	}
+
+	bool get_mask(unsigned idx, pfc::string_base &out) override
+	{
+		if (idx < N_FILE_TYPES) {
+			out = ::names_and_masks[idx][1];
+			return true;
+		}
+		return false;
+	}
+
+	bool is_associatable(unsigned idx) override
+	{
+		return true;
+	}
+};
+
+static service_factory_single_t<input_file_type_asap> g_input_file_type_asap_factory;
+
+
+/* Info window ----------------------------------------------------------- */
+
+class info_menu : public mainmenu_commands
+{
+	t_uint32 get_command_count() override
+	{
+		return 1;
+	}
+
+	GUID get_command(t_uint32 p_index) override
+	{
+		static const GUID guid = { 0x15a24bcd, 0x176b, 0x4e15, { 0xbc, 0xb1, 0x24, 0xfd, 0x92, 0x67, 0xaf, 0x8f } };
+		return guid;
+	}
+
+	void get_name(t_uint32 p_index, pfc::string_base &p_out) override
+	{
+		p_out = "ASAP info";
+	}
+
+	bool get_description(t_uint32 p_index, pfc::string_base &p_out) override
+	{
+		p_out = "Activates the ASAP File Information window.";
+		return true;
+	}
+
+	GUID get_parent() override
+	{
+		return mainmenu_groups::view;
+	}
+
+	bool get_display(t_uint32 p_index, pfc::string_base &p_text, t_uint32 &p_flags) override
+	{
+		p_flags = 0;
+		get_name(p_index, p_text);
+		return true;
+	}
+
+	void execute(t_uint32 p_index, service_ptr_t<service_base> p_callback) override
+	{
+		if (p_index == 0) {
+			playing_info = playing_info_cfg;
+			const char *filename = nullptr;
+			int song = -1;
+			metadb_handle_ptr item;
+			if (static_api_ptr_t<playlist_manager>()->activeplaylist_get_focus_item_handle(item) && item.is_valid()) {
+				const char *url = item->get_path();
+				if (foobar2000_io::_extract_native_path_ptr(url)) {
+					filename = url;
+					song = item->get_subsong_index();
+				}
+			}
+			showInfoDialog(core_api::get_my_instance(), core_api::get_main_window(), filename, song);
+		}
+	}
+};
+
+static mainmenu_commands_factory_t<info_menu> g_info_menu_factory;
+
+
+/* ATR filesystem -------------------------------------------------------- */
+
+class file_atr : public file_readonly
+{
+	AATRFileStream *stream = nullptr;
+
+public:
+
+	file_atr(const char *atr_filename, const char *inside_filename)
+	{
+		AATR *disk = AATRStdio_New(atr_filename);
+		if (disk == nullptr)
+			throw exception_io_data();
+		AATRDirectory *directory = AATRDirectory_New();
+		if (directory == nullptr) {
+			AATRStdio_Delete(disk);
+			throw exception_out_of_resources();
+		}
+		AATRDirectory_OpenRoot(directory, disk);
+		if (!AATRDirectory_FindEntryRecursively(directory, inside_filename) || AATRDirectory_IsEntryDirectory(directory)) {
+			AATRDirectory_Delete(directory);
+			AATRStdio_Delete(disk);
+			throw exception_io_not_found();
+		}
+		stream = AATRFileStream_New();
+		if (stream == nullptr) {
+			AATRDirectory_Delete(directory);
+			AATRStdio_Delete(disk);
+			throw exception_out_of_resources();
+		}
+		AATRFileStream_Open(stream, directory);
+		AATRDirectory_Delete(directory);
+	}
+
+	~file_atr()
+	{
+		if (stream != nullptr) {
+			AATR *disk = const_cast<AATR *>(AATRFileStream_GetDisk(stream));
+			AATRFileStream_Delete(stream);
+			AATRStdio_Delete(disk);
+		}
+	}
+
+	t_size read(void *p_buffer, t_size p_bytes, abort_callback &p_abort) override
+	{
+		int length = p_bytes < INT_MAX ? (int) p_bytes : INT_MAX;
+		int result = AATRFileStream_Read(stream, reinterpret_cast<byte *>(p_buffer), 0, length);
+		if (result < 0)
+			throw exception_io_data();
+		return result;
+	}
+
+	t_filesize get_size(abort_callback &p_abort) override
+	{
+		return AATRFileStream_GetLength(stream);
+	}
+
+	t_filesize get_position(abort_callback &p_abort) override
+	{
+		return AATRFileStream_GetPosition(stream);
+	}
+
+	void seek(t_filesize p_position, abort_callback &p_abort) override
+	{
+		int position = (int) p_position;
+		if (position != p_position || !AATRFileStream_SetPosition(stream, position))
+			throw exception_io_seek_out_of_range();
+	}
+
+	bool can_seek() override
+	{
+		return true;
+	}
+
+	bool get_content_type(pfc::string_base &p_out) override
+	{
+		return false;
+	}
+
+	void reopen(abort_callback &p_abort) override
+	{
+		AATRFileStream_SetPosition(stream, 0);
+	}
+
+	bool is_remote() override
+	{
+		return false;
+	}
+};
+
+class archive_atr : public archive_impl
+{
+public:
+
+	bool supports_content_types() override
+	{
+		return false;
+	}
+
+	const char *get_archive_type() override
+	{
+		return "atr";
+	}
+
+	t_filestats get_stats_in_archive(const char *p_archive, const char *p_file, abort_callback &p_abort) override
+	{
+		service_impl_single_t<file_atr> f(p_archive, p_file);
+		t_filestats stats = { f.get_size(abort_callback_dummy()), filetimestamp_invalid };
+		return stats;
+	}
+
+	void open_archive(service_ptr_t<file> &p_out, const char *archive, const char *file, abort_callback &p_abort) override
+	{
+		p_out = new service_impl_t<file_atr>(archive, file);
+	}
+
+	void archive_list(const char *path, const service_ptr_t<file> &p_reader, archive_callback &p_out, bool p_want_readers) override
+	{
+		if (!_extract_native_path_ptr(path))
+			throw exception_io_data();
+		AATR *disk = AATRStdio_New(path);
+		if (disk == nullptr)
+			throw exception_io_data();
+		AATRRecursiveLister *lister = AATRRecursiveLister_New();
+		if (lister == nullptr) {
+			AATRStdio_Delete(disk);
+			throw exception_out_of_resources();
+		}
+		AATRRecursiveLister_Open(lister, disk);
+		pfc::string8_fastalloc url;
+		for (;;) {
+			const char *fn = AATRRecursiveLister_NextFile(lister);
+			if (fn == nullptr)
+				break;
+			t_filestats stats = { filesize_invalid, filetimestamp_invalid };
+			service_ptr_t<file> p_file;
+			if (p_want_readers) {
+				p_file = new service_impl_t<file_atr>(path, fn);
+			}
+			archive_impl::g_make_unpack_path(url, path, fn, "atr");
+			if (!p_out.on_entry(this, url, stats, p_file))
+				break;
+		}
+		AATRRecursiveLister_Delete(lister);
+		AATRStdio_Delete(disk);
+	}
+
+	bool is_our_archive(const char *path) override
+	{
+		return has_ext(path, ".atr");
+	}
+};
+
+static archive_factory_t<archive_atr> g_archive_atr_factory;
+
+DECLARE_COMPONENT_VERSION("ASAP", ASAPInfo_VERSION, ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT);
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/gui.rc kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/gui.rc
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/gui.rc	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/gui.rc	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,261 @@
+/*
+ * gui.rc - Windows resources
+ *
+ * Copyright (C) 2005-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#if defined(WASAP) || defined(WINAMP) || defined(FOOBAR2000) || defined(XMPLAY)
+#include <windows.h>
+#define IDC_STATIC  -1
+#endif
+
+#include "../asap.h"
+
+#ifdef WASAP
+
+#include "wasap/wasap.h"
+
+#define FILE_DESCRIPTION "WASAP - Windows Another Slight Atari Player"
+#define INTERNAL_NAME "wasap"
+#define ORIGINAL_FILENAME "wasap.exe"
+#define FILE_TYPE 1
+
+IDI_APP ICON "wasap/wasap.ico"
+IDI_STOP ICON "wasap/stop.ico"
+IDI_PLAY ICON "wasap/play.ico"
+
+IDR_TRAYMENU MENU
+{
+	POPUP "WASAP"
+	{
+		MENUITEM "&Open...", IDM_OPEN
+		POPUP "So&ng", GRAYED
+		{
+			MENUITEM "&1", IDM_SONG1
+		}
+		MENUITEM "&Stop", IDM_STOP, GRAYED
+#ifndef _UNICODE /* TODO */
+		MENUITEM "File &information...", IDM_FILE_INFO, GRAYED
+#endif
+		MENUITEM "Save as &WAV...", IDM_SAVE_WAV, GRAYED
+		MENUITEM "&About WASAP...", IDM_ABOUT
+		MENUITEM "&Exit", IDM_EXIT
+	}
+}
+
+#ifdef _WIN64
+#define PROCESSOR_ARCHITECTURE  "amd64"
+#else
+#define PROCESSOR_ARCHITECTURE  "X86"
+#endif
+1 24
+{
+	"<?xml version=""1.0""?>"
+	"<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">"
+		"<assemblyIdentity version=""" ASAPInfo_VERSION ".0"" "
+			"processorArchitecture=""" PROCESSOR_ARCHITECTURE """ name=""WASAP"" type=""win32"" />"
+	"<dependency>"
+		"<dependentAssembly>"
+		"<assemblyIdentity type=""win32"" name=""Microsoft.Windows.Common-Controls"" "
+			"version=""6.0.0.0"" processorArchitecture=""" PROCESSOR_ARCHITECTURE """ "
+			"publicKeyToken=""6595b64144ccf1df"" language=""*"" />"
+		"</dependentAssembly>"
+	"</dependency>"
+	"<application xmlns=""urn:schemas-microsoft-com:asm.v3"">"
+		"<windowsSettings>"
+			"<dpiAware xmlns=""http://schemas.microsoft.com/SMI/2005/WindowsSettings"">true</dpiAware>"
+		"</windowsSettings>"
+	"</application>"
+	"</assembly>"
+}
+
+#endif /* WASAP */
+
+#if defined(WINAMP)
+#  define APP_NAME "Winamp"
+#  define INTERNAL_NAME "in_asap"
+#elif defined(FOOBAR2000)
+#  define APP_NAME "foobar2000"
+#  define INTERNAL_NAME "foo_asap"
+#elif defined(XMPLAY)
+#  define APP_NAME "XMPlay"
+#  define INTERNAL_NAME "xmp-asap"
+#elif defined(BASS)
+#  define INTERNAL_NAME "bass_asap"
+#  define FILE_DESCRIPTION "ASAP add-on for BASS"
+#elif defined(APOKEYSND)
+#  define INTERNAL_NAME "apokeysnd"
+#  define FILE_DESCRIPTION "Another POKEY sound emulator"
+#elif defined(SHELLEX)
+#  define INTERNAL_NAME "ASAPShellEx"
+#  define FILE_DESCRIPTION "ASAP Windows Explorer extension"
+#elif defined(VLC)
+#  define APP_NAME "VLC"
+#  define INTERNAL_NAME "libasap_plugin"
+#endif
+
+#ifndef FILE_DESCRIPTION
+#  define FILE_DESCRIPTION "ASAP " APP_NAME " plugin"
+#endif
+#ifndef ORIGINAL_FILENAME
+#  define ORIGINAL_FILENAME INTERNAL_NAME ".dll"
+#  define FILE_TYPE 2
+#endif
+
+#if defined(WINAMP) || defined(FOOBAR2000) || defined(XMPLAY)
+
+#include "settings_dlg.h"
+
+IDD_SETTINGS DIALOG 0, 0, 184, 216
+#ifdef FOOBAR2000
+STYLE WS_CHILD
+#else
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW
+CAPTION "ASAP Settings"
+#endif
+FONT 8, "MS Shell Dlg 2"
+{
+	AUTORADIOBUTTON "Play endlessly", IDC_UNLIMITED, 16, 16, 152, 12, BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP
+	AUTORADIOBUTTON "Finish after", IDC_LIMITED, 16, 30, 48, 12
+	EDITTEXT IDC_MINUTES, 68, 30, 16, 12, ES_NUMBER | ES_RIGHT | WS_BORDER | WS_TABSTOP
+	LTEXT "m", IDC_STATIC, 88, 32, 10, 12
+	EDITTEXT IDC_SECONDS, 100, 30, 16, 12, ES_NUMBER | ES_RIGHT | WS_BORDER | WS_TABSTOP
+	LTEXT "s", IDC_STATIC, 120, 32, 10, 12
+	AUTOCHECKBOX "Finish after", IDC_SILENCE, 16, 48, 48, 12
+	EDITTEXT IDC_SILSECONDS, 68, 48, 16, 12, ES_NUMBER | ES_RIGHT | WS_BORDER | WS_TABSTOP
+	LTEXT "seconds of silence", IDC_STATIC, 88, 50, 64, 12
+	AUTORADIOBUTTON "Play as above", IDC_LOOPS, 16, 84, 152, 12, BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP
+	AUTORADIOBUTTON "Play just once", IDC_NOLOOPS, 16, 98, 152, 12
+	AUTOCHECKBOX "Channel 1", IDC_MUTE1, 24, 132, 48, 12
+	AUTOCHECKBOX "Channel 2", IDC_MUTE1 + 1, 24, 144, 48, 12
+	AUTOCHECKBOX "Channel 3", IDC_MUTE1 + 2, 24, 156, 48, 12
+	AUTOCHECKBOX "Channel 4", IDC_MUTE1 + 3, 24, 168, 48, 12
+	AUTOCHECKBOX "Channel 1", IDC_MUTE1 + 4, 112, 132, 48, 12
+	AUTOCHECKBOX "Channel 2", IDC_MUTE1 + 5, 112, 144, 48, 12
+	AUTOCHECKBOX "Channel 3", IDC_MUTE1 + 6, 112, 156, 48, 12
+	AUTOCHECKBOX "Channel 4", IDC_MUTE1 + 7, 112, 168, 48, 12
+	GROUPBOX "Songs with unspecified length", IDC_STATIC, 8, 4, 168, 64
+	GROUPBOX "Loops", IDC_STATIC, 8, 72, 168, 46
+	GROUPBOX "Mute base POKEY", IDC_STATIC, 8, 122, 80, 64
+	GROUPBOX "Mute extra POKEY", IDC_STATIC, 96, 122, 80, 64
+#  ifndef FOOBAR2000
+	DEFPUSHBUTTON "OK", IDOK, 38, 194, 50, 14
+	PUSHBUTTON "Cancel", IDCANCEL, 96, 194, 50, 14
+#  endif
+}
+
+#endif /* defined(WINAMP) || defined(FOOBAR2000) || defined(XMPLAY) */
+
+#if defined(WASAP) || defined(WINAMP) || defined(FOOBAR2000) || defined(XMPLAY)
+
+#include "info_dlg.h"
+
+#ifndef _UNICODE /* TODO */
+
+#define INFO_W  270
+#ifdef PLAYING_INFO
+#define INFO_Y  18
+#else
+#define INFO_Y  0
+#endif
+IDD_INFO DIALOG 0, 0, 54 + INFO_W, 214 + INFO_Y
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE
+CAPTION "File information"
+FONT 8, "MS Shell Dlg 2"
+{
+#ifdef PLAYING_INFO
+	AUTOCHECKBOX "Show information about the currently &playing file", IDC_PLAYING, 46, 8, 284, 12
+#endif
+	RTEXT "&Filename:", IDC_STATIC, 8, 10 + INFO_Y, 32, 12
+	EDITTEXT IDC_FILENAME, 46, 8 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP
+	RTEXT "&Author:", IDC_STATIC, 8, 24 + INFO_Y, 32, 12
+	EDITTEXT IDC_AUTHOR, 46, 22 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+	RTEXT "&Name:", IDC_STATIC, 8, 38 + INFO_Y, 32, 12
+	EDITTEXT IDC_NAME, 46, 36 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+	RTEXT "&Date:", IDC_STATIC, 8, 52 + INFO_Y, 32, 12
+	EDITTEXT IDC_DATE, 46, 50 + INFO_Y, INFO_W - 56, 12, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+	PUSHBUTTON "Pick date", IDC_PICKDATE, INFO_W - 4, 49 + INFO_Y, 50, 14
+	RTEXT "S&ong:", IDC_STATIC, 8, 66 + INFO_Y, 32, 12
+	COMBOBOX IDC_SONGNO, 46, 64 + INFO_Y, 26, 12, CBS_DROPDOWNLIST | WS_TABSTOP
+	RTEXT "&Time:", IDC_STATIC, 80, 66 + INFO_Y, 20, 12
+	EDITTEXT IDC_TIME, 108, 64 + INFO_Y, 40, 12
+	AUTOCHECKBOX "&Loop", IDC_LOOP, 156, 64 + INFO_Y, 40, 12
+	RTEXT "Technical:", IDC_STATIC, 8, 82 + INFO_Y, 32, 12
+	EDITTEXT IDC_TECHINFO, 46, 82 + INFO_Y, INFO_W, 48, ES_LEFT | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY | WS_BORDER | WS_TABSTOP | WS_VSCROLL
+	RTEXT "STIL file:", IDC_STATIC, 8, 132 + INFO_Y, 32, 12
+	EDITTEXT IDC_STILFILE, 46, 132 + INFO_Y, INFO_W, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP
+	RTEXT "STIL info:", IDC_STATIC, 8, 144 + INFO_Y, 32, 12
+	EDITTEXT IDC_STILINFO, 46, 144 + INFO_Y, INFO_W, 48, ES_LEFT | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY | WS_BORDER | WS_TABSTOP | WS_VSCROLL
+	DEFPUSHBUTTON "&Save", IDC_SAVE, INFO_W - 140, 194 + INFO_Y, 50, 14
+	PUSHBUTTON "Save as...", IDC_SAVEAS, INFO_W - 82, 194 + INFO_Y, 70, 14
+	PUSHBUTTON "Close", IDCANCEL, INFO_W - 4, 194 + INFO_Y, 50, 14
+}
+
+#endif /* _UNICODE */
+
+#endif /* defined(WASAP) || defined(WINAMP) || defined(FOOBAR2000) || defined(XMPLAY) */
+
+#if defined(WASAP) || defined(WINAMP)
+
+#include <commctrl.h>
+
+IDD_PROGRESS DIALOG 0, 0, 160, 48
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_VISIBLE
+CAPTION "Please wait"
+FONT 8, "MS Sans Serif"
+{
+#ifdef WASAP
+	CTEXT "Writing WAV file", IDC_STATIC, 8, 8, 144, 12
+#else
+	CTEXT "Adding subsongs to the playlist", IDC_STATIC, 8, 8, 144, 12
+#endif
+	CONTROL "", IDC_PROGRESS, PROGRESS_CLASS, 0, 8, 24, 144, 12
+}
+
+#endif /* defined(WASAP) || defined(WINAMP) */
+
+1 VERSIONINFO
+	FILEVERSION ASAPInfo_VERSION_MAJOR, ASAPInfo_VERSION_MINOR, ASAPInfo_VERSION_MICRO, 0
+	PRODUCTVERSION ASAPInfo_VERSION_MAJOR, ASAPInfo_VERSION_MINOR, ASAPInfo_VERSION_MICRO, 0
+	FILEFLAGSMASK 0x3fL
+	FILEFLAGS 0x0L
+	FILEOS 0x40004L
+	FILETYPE FILE_TYPE
+	FILESUBTYPE 0x0L
+{
+	BLOCK "StringFileInfo"
+	{
+		BLOCK "040904b0"
+		{
+			VALUE "CompanyName", "Piotr Fusik\0"
+			VALUE "FileDescription", FILE_DESCRIPTION "\0"
+			VALUE "FileVersion", ASAPInfo_VERSION "\0"
+			VALUE "InternalName", INTERNAL_NAME "\0"
+			VALUE "LegalCopyright", "Copyleft " ASAPInfo_YEARS "\0"
+			VALUE "OriginalFilename", ORIGINAL_FILENAME "\0"
+			VALUE "ProductName", "ASAP\0"
+			VALUE "ProductVersion", ASAPInfo_VERSION "\0"
+		}
+	}
+	BLOCK "VarFileInfo"
+	{
+		VALUE "Translation", 0x409, 1200
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/info_dlg.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/info_dlg.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/info_dlg.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/info_dlg.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,731 @@
+/*
+ * info_dlg.c - file information dialog box
+ *
+ * Copyright (C) 2007-2020  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#define _WIN32_WINNT 0x0600
+#include <windows.h>
+#include <stdio.h>
+#include <string.h>
+#include <tchar.h>
+#include <commctrl.h>
+
+#include "asap.h"
+#include "astil.h"
+#include "info_dlg.h"
+#ifdef WINAMP
+#include "aatr-stdio.h"
+#endif
+
+void combineFilenameExt(LPTSTR dest, LPCTSTR filename, LPCTSTR ext)
+{
+	size_t filenameChars = _tcsrchr(filename, '.') + 1 - filename;
+	memcpy(dest, filename, filenameChars * sizeof(_TCHAR));
+	_tcscpy(dest + filenameChars, ext);
+}
+
+#ifdef WINAMP
+LPCTSTR atrFilenameHash(LPCTSTR filename)
+{
+	for ( ; *filename != '\0'; filename++) {
+		if (_tcsnicmp(filename, _T(".atr#"), 5) == 0)
+			return filename + 4;
+	}
+	return NULL;
+}
+#endif
+
+bool loadModule(LPCTSTR filename, BYTE *module, int *module_len)
+{
+	bool ok;
+#ifdef WINAMP
+	LPCTSTR hash = atrFilenameHash(filename);
+	if (hash != NULL && hash < filename + MAX_PATH) {
+		_TCHAR atr_filename[MAX_PATH];
+		memcpy(atr_filename, filename, (hash - filename) * sizeof(_TCHAR));
+		atr_filename[hash - filename] = '\0';
+		ok = false;
+		AATR *disk = AATRStdio_New(atr_filename);
+		if (disk != NULL) {
+			AATRDirectory *directory = AATRDirectory_New();
+			if (directory != NULL) {
+				AATRDirectory_OpenRoot(directory, disk);
+				if (AATRDirectory_FindEntryRecursively(directory, hash + 1) && !AATRDirectory_IsEntryDirectory(directory)) {
+					AATRFileStream *stream = AATRFileStream_New();
+					if (stream != NULL) {
+						AATRFileStream_Open(stream, directory);
+						*module_len = AATRFileStream_Read(stream, module, 0, ASAPInfo_MAX_MODULE_LENGTH);
+						ok = *module_len >= 0;
+						AATRFileStream_Delete(stream);
+					}
+				}
+				AATRDirectory_Delete(directory);
+			}
+			AATRStdio_Delete(disk);
+		}
+		return ok;
+	}
+#endif
+	HANDLE fh = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (fh == INVALID_HANDLE_VALUE)
+		return false;
+	ok = ReadFile(fh, module, ASAPInfo_MAX_MODULE_LENGTH, (LPDWORD) module_len, NULL);
+	CloseHandle(fh);
+	return ok;
+}
+
+HWND infoDialog = NULL;
+
+#ifndef _UNICODE /* TODO */
+
+static _TCHAR playing_filename[MAX_PATH];
+static int playing_song = 0;
+bool playing_info = false;
+static byte saved_module[ASAPInfo_MAX_MODULE_LENGTH];
+static int saved_module_len;
+static ASAPInfo *edited_info = NULL;
+static int edited_song;
+static _TCHAR saved_author[ASAPInfo_MAX_TEXT_LENGTH + 1];
+static _TCHAR saved_title[ASAPInfo_MAX_TEXT_LENGTH + 1];
+static _TCHAR saved_date[ASAPInfo_MAX_TEXT_LENGTH + 1];
+static int saved_durations[ASAPInfo_MAX_SONGS];
+static bool saved_loops[ASAPInfo_MAX_SONGS];
+static bool can_save;
+static int invalid_fields;
+#define INVALID_FIELD_AUTHOR      1
+#define INVALID_FIELD_NAME        2
+#define INVALID_FIELD_DATE        4
+#define INVALID_FIELD_TIME        8
+#define INVALID_FIELD_TIME_SHOW  16
+static HWND monthcal = NULL;
+static WNDPROC monthcalOriginalWndProc;
+static ASTIL *astil = NULL;
+
+static char *appendStilString(char *p, const char *s)
+{
+	for (;;) {
+		char c = *s++;
+		switch (c) {
+		case '\0':
+			return p;
+		case '\n':
+			c = ' ';
+			break;
+		default:
+			break;
+		}
+		*p++ = c;
+	}
+}
+
+static char *appendStil(char *p, const char *prefix, const char *value)
+{
+	if (value[0] != '\0') {
+		p = appendStilString(p, prefix);
+		p = appendStilString(p, value);
+		*p++ = '\r';
+		*p++ = '\n';
+	}
+	return p;
+}
+
+static char *appendAddress(char *p, const char *format, int value)
+{
+	if (value >= 0)
+		p += sprintf(p, format, value);
+	return p;
+}
+
+static void chomp(char *s)
+{
+	size_t i = strlen(s);
+	if (i >= 2 && s[i - 2] == '\r' && s[i - 1] == '\n')
+		s[i - 2] = '\0';
+}
+
+static void updateTech(void)
+{
+	char buf[16000];
+	char *p = buf;
+	const char *ext;
+	int type;
+	ext = ASAPInfo_GetOriginalModuleExt(edited_info, saved_module, saved_module_len);
+	if (ext != NULL)
+		p += sprintf(p, "Composed in %s\r\n", ASAPInfo_GetExtDescription(ext));
+	int i = ASAPInfo_GetSongs(edited_info);
+	if (i > 1) {
+		p += sprintf(p, "SONGS %d\r\n", i);
+		i = ASAPInfo_GetDefaultSong(edited_info);
+		if (i > 0)
+			p += sprintf(p, "DEFSONG %d (song %d)\r\n", i, i + 1);
+	}
+	p += sprintf(p, ASAPInfo_GetChannels(edited_info) > 1 ? "STEREO\r\n" : "MONO\r\n");
+	p += sprintf(p, ASAPInfo_IsNtsc(edited_info) ? "NTSC\r\n" : "PAL\r\n");
+	type = ASAPInfo_GetTypeLetter(edited_info);
+	if (type != 0)
+		p += sprintf(p, "TYPE %c\r\n", type);
+	p += sprintf(p, "FASTPLAY %d (%d Hz)\r\n", ASAPInfo_GetPlayerRateScanlines(edited_info), ASAPInfo_GetPlayerRateHz(edited_info));
+	if (type == 'C')
+		p += sprintf(p, "MUSIC %04X\r\n", ASAPInfo_GetMusicAddress(edited_info));
+	if (type != 0) {
+		p = appendAddress(p, "INIT %04X\r\n", ASAPInfo_GetInitAddress(edited_info));
+		p = appendAddress(p, "PLAYER %04X\r\n", ASAPInfo_GetPlayerAddress(edited_info));
+		p = appendAddress(p, "COVOX %04X\r\n", ASAPInfo_GetCovoxAddress(edited_info));
+	}
+	i = ASAPInfo_GetSapHeaderLength(edited_info);
+	if (i >= 0) {
+		while (p < buf + sizeof(buf) - 17 && i + 4 < saved_module_len) {
+			int start = saved_module[i] + (saved_module[i + 1] << 8);
+			int end;
+			if (start == 0xffff) {
+				i += 2;
+				start = saved_module[i] + (saved_module[i + 1] << 8);
+			}
+			end = saved_module[i + 2] + (saved_module[i + 3] << 8);
+			p += sprintf(p, "LOAD %04X-%04X\r\n", start, end);
+			i += 5 + end - start;
+		}
+	}
+	chomp(buf);
+	SendDlgItemMessage(infoDialog, IDC_TECHINFO, WM_SETTEXT, 0, (LPARAM) buf);
+}
+
+static void updateStil(void)
+{
+	char buf[16000];
+	char *p = buf;
+	p = appendStil(p, "", ASTIL_GetTitle(astil));
+	p = appendStil(p, "by ", ASTIL_GetAuthor(astil));
+	p = appendStil(p, "Directory comment: ", ASTIL_GetDirectoryComment(astil));
+	p = appendStil(p, "File comment: ", ASTIL_GetFileComment(astil));
+	p = appendStil(p, "Song comment: ", ASTIL_GetSongComment(astil));
+	for (int i = 0; ; i++) {
+		const ASTILCover *cover = ASTIL_GetCover(astil, i);
+		int startSeconds;
+		const char *s;
+		if (cover == NULL)
+			break;
+		startSeconds = ASTILCover_GetStartSeconds(cover);
+		if (startSeconds >= 0) {
+			int endSeconds = ASTILCover_GetEndSeconds(cover);
+			if (endSeconds >= 0)
+				p += sprintf(p, "At %d:%02d-%d:%02d c", startSeconds / 60, startSeconds % 60, endSeconds / 60, endSeconds % 60);
+			else
+				p += sprintf(p, "At %d:%02d c", startSeconds / 60, startSeconds % 60);
+		}
+		else
+			*p++ = 'C';
+		s = ASTILCover_GetTitleAndSource(cover);
+		p = appendStil(p, "overs: ", s[0] != '\0' ? s : "<?>");
+		p = appendStil(p, "by ", ASTILCover_GetArtist(cover));
+		p = appendStil(p, "Comment: ", ASTILCover_GetComment(cover));
+	}
+	*p = '\0';
+	chomp(buf);
+#if 1
+	/* not compatible with Windows 9x */
+	if (ASTIL_IsUTF8(astil)) {
+		WCHAR wBuf[16000];
+		if (MultiByteToWideChar(CP_UTF8, 0, buf, -1, wBuf, 16000) > 0) {
+			SendDlgItemMessageW(infoDialog, IDC_STILINFO, WM_SETTEXT, 0, (LPARAM) wBuf);
+			return;
+		}
+	}
+#endif
+	SendDlgItemMessage(infoDialog, IDC_STILINFO, WM_SETTEXT, 0, (LPARAM) buf);
+}
+
+static void setEditedSong(int song)
+{
+	unsigned char str[ASAPWriter_MAX_DURATION_LENGTH + 1];
+	edited_song = song;
+	int len = ASAPWriter_DurationToString(str, ASAPInfo_GetDuration(edited_info, song));
+	str[len] = '\0';
+	SendDlgItemMessage(infoDialog, IDC_TIME, WM_SETTEXT, 0, (LPARAM) str);
+	CheckDlgButton(infoDialog, IDC_LOOP, ASAPInfo_GetLoop(edited_info, song) ? BST_CHECKED : BST_UNCHECKED);
+	EnableWindow(GetDlgItem(infoDialog, IDC_LOOP), len > 0);
+
+	_TCHAR filename[MAX_PATH];
+	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_GETTEXT, MAX_PATH, (LPARAM) filename);
+	ASTIL_Load(astil, filename, song);
+	SendDlgItemMessage(infoDialog, IDC_STILFILE, WM_SETTEXT, 0, (LPARAM) ASTIL_GetStilFilename(astil));
+	updateStil();
+}
+
+static void showEditTip(int nID, LPCTSTR title, LPCTSTR message)
+{
+#ifndef _UNICODE
+
+#ifndef EM_SHOWBALLOONTIP
+/* missing in MinGW */
+typedef struct
+{
+	DWORD cbStruct;
+	LPCWSTR pszTitle;
+	LPCWSTR pszText;
+	INT ttiIcon;
+} EDITBALLOONTIP;
+#define TTI_ERROR  3
+#define EM_SHOWBALLOONTIP  0x1503
+#endif
+	WCHAR wTitle[64];
+	WCHAR wMessage[64];
+	EDITBALLOONTIP ebt = { sizeof(EDITBALLOONTIP), wTitle, wMessage, TTI_ERROR };
+	if (MultiByteToWideChar(CP_ACP, 0, title, -1, wTitle, 64) <= 0
+	 || MultiByteToWideChar(CP_ACP, 0, message, -1, wMessage, 64) <= 0
+	 || !SendDlgItemMessage(infoDialog, nID, EM_SHOWBALLOONTIP, 0, (LPARAM) &ebt))
+
+#endif /* _UNICODE */
+
+		/* Windows before XP don't support balloon tips */
+		MessageBox(infoDialog, message, title, MB_OK | MB_ICONERROR);
+}
+
+static bool isExt(LPCTSTR filename, LPCTSTR ext)
+{
+	return _tcsicmp(filename + _tcslen(filename) - 4, ext) == 0;
+}
+
+static void setSaved(void)
+{
+	_tcscpy(saved_author, ASAPInfo_GetAuthor(edited_info));
+	_tcscpy(saved_title, ASAPInfo_GetTitle(edited_info));
+	_tcscpy(saved_date, ASAPInfo_GetDate(edited_info));
+	for (int i = 0; i < ASAPInfo_GetSongs(edited_info); i++) {
+		saved_durations[i] = ASAPInfo_GetDuration(edited_info, i);
+		saved_loops[i] = ASAPInfo_GetLoop(edited_info, i);
+	}
+}
+
+static bool infoChanged(void)
+{
+	if (_tcscmp(ASAPInfo_GetAuthor(edited_info), saved_author) != 0
+	 || _tcscmp(ASAPInfo_GetTitle(edited_info), saved_title) != 0
+	 || _tcscmp(ASAPInfo_GetDate(edited_info), saved_date) != 0)
+		return true;
+	for (int i = 0; i < ASAPInfo_GetSongs(edited_info); i++) {
+		if (ASAPInfo_GetDuration(edited_info, i) != saved_durations[i])
+			return true;
+		if (saved_durations[i] >= 0 && ASAPInfo_GetLoop(edited_info, i) != saved_loops[i])
+			return true;
+	}
+	return false;
+}
+
+static void updateSaveButtons(int mask, bool ok)
+{
+	if (ok) {
+		invalid_fields &= ~mask;
+		ok = invalid_fields == 0;
+	}
+	else
+		invalid_fields |= mask;
+	if (can_save)
+		EnableWindow(GetDlgItem(infoDialog, IDC_SAVE), ok && infoChanged());
+	EnableWindow(GetDlgItem(infoDialog, IDC_SAVEAS), ok);
+}
+
+static void updateInfoString(HWND hDlg, int nID, int mask, bool (*func)(ASAPInfo *, LPCTSTR))
+{
+	_TCHAR str[ASAPInfo_MAX_TEXT_LENGTH + 1];
+	SendDlgItemMessage(hDlg, nID, WM_GETTEXT, ASAPInfo_MAX_TEXT_LENGTH + 1, (LPARAM) str);
+	bool ok = func(edited_info, str);
+	updateSaveButtons(mask, ok);
+	if (!ok)
+		showEditTip(nID, _T("Invalid characters"), _T("Avoid national characters and quotation marks"));
+}
+
+static LRESULT CALLBACK MonthCalWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg) {
+	case WM_KILLFOCUS:
+		ShowWindow(hWnd, SW_HIDE);
+		break;
+	case WM_KEYDOWN:
+		if (wParam == VK_ESCAPE)
+			ShowWindow(hWnd, SW_HIDE);
+		break;
+	case WM_DESTROY:
+		SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR) monthcalOriginalWndProc);
+		break;
+	default:
+		break;
+	}
+	return CallWindowProc(monthcalOriginalWndProc, hWnd, uMsg, wParam, lParam);
+}
+
+static void toggleCalendar(HWND hDlg)
+{
+	if (monthcal == NULL) {
+		INITCOMMONCONTROLSEX icex;
+		icex.dwSize = sizeof(icex);
+		icex.dwICC = ICC_DATE_CLASSES;
+		InitCommonControlsEx(&icex);
+		monthcal = CreateWindowEx(0, MONTHCAL_CLASS, _T(""), WS_BORDER | WS_POPUP, 0, 0, 0, 0, hDlg, NULL, NULL, NULL);
+		/* subclass month calendar, so that it hides when looses focus */
+		monthcalOriginalWndProc = (WNDPROC) SetWindowLongPtr(monthcal, GWLP_WNDPROC, (LONG_PTR) MonthCalWndProc);
+	}
+	if (IsWindowVisible(monthcal))
+		ShowWindow(monthcal, SW_HIDE);
+	else {
+		RECT rc;
+		GetWindowRect(GetDlgItem(hDlg, IDC_PICKDATE), &rc);
+		int x = rc.left;
+		int y = rc.bottom;
+		MonthCal_GetMinReqRect(monthcal, &rc);
+		SetWindowPos(monthcal, NULL, x, y, rc.right, rc.bottom, SWP_SHOWWINDOW | SWP_NOZORDER);
+		y = ASAPInfo_GetYear(edited_info);
+		if (y > 0) {
+			SYSTEMTIME st;
+			st.wYear = y;
+			int month = ASAPInfo_GetMonth(edited_info);
+			DWORD view;
+			if (month > 0) {
+				int day = ASAPInfo_GetDayOfMonth(edited_info);
+				st.wMonth = month;
+				if (day > 0) {
+					st.wDay = day;
+					view = MCMV_MONTH;
+				}
+				else {
+					st.wDay = 1;
+					view = MCMV_YEAR;
+				}
+			}
+			else {
+				st.wMonth = 1;
+				st.wDay = 1;
+				view = MCMV_DECADE;
+			}
+			(void) MonthCal_SetCurSel(monthcal, &st);
+			(void) MonthCal_SetCurrentView(monthcal, view);
+		}
+		SetFocus(monthcal);
+	}
+}
+
+static bool doSaveFile(LPCTSTR filename, bool tag)
+{
+	ASAPWriter *writer = ASAPWriter_New();
+	if (writer == NULL)
+		return false;
+	byte output[ASAPInfo_MAX_MODULE_LENGTH];
+	ASAPWriter_SetOutput(writer, output, 0, sizeof(output));
+	int output_len = ASAPWriter_Write(writer, filename, edited_info, saved_module, saved_module_len, tag);
+	ASAPWriter_Delete(writer);
+	if (output_len < 0)
+		return false;
+
+	FILE *fp = _tfopen(filename, _T("wb"));
+	if (fp == NULL)
+		return false;
+	if (fwrite(output, output_len, 1, fp) != 1) {
+		fclose(fp);
+		DeleteFile(filename);
+		return false;
+	}
+	if (fclose(fp) != 0) {
+		DeleteFile(filename);
+		return false;
+	}
+	return true;
+}
+
+static bool saveFile(LPCTSTR filename, bool tag)
+{
+	bool isSap = isExt(filename, _T(".sap"));
+	if (isSap) {
+		int song = ASAPInfo_GetSongs(edited_info);
+		while (--song >= 0 && ASAPInfo_GetDuration(edited_info, song) < 0);
+		while (--song >= 0) {
+			if (ASAPInfo_GetDuration(edited_info, song) < 0) {
+				MessageBox(infoDialog, _T("Cannot save file because time not set for all songs"), _T("Error"), MB_OK | MB_ICONERROR);
+				return false;
+			}
+		}
+	}
+	if (!doSaveFile(filename, tag)) {
+		MessageBox(infoDialog, _T("Cannot save file"), _T("Error"), MB_OK | MB_ICONERROR);
+		// FIXME: delete file
+		return false;
+	}
+	if (isSap) {
+		setSaved();
+		EnableWindow(GetDlgItem(infoDialog, IDC_SAVE), false);
+	}
+	return true;
+}
+
+static bool saveInfo(void)
+{
+	_TCHAR filename[MAX_PATH];
+	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_GETTEXT, MAX_PATH, (LPARAM) filename);
+	return saveFile(filename, false);
+}
+
+static void setSaveFilters(LPTSTR p)
+{
+	const char *exts[ASAPWriter_MAX_SAVE_EXTS];
+	int exts_len = ASAPWriter_GetSaveExts(exts, edited_info, saved_module, saved_module_len);
+	for (int i = 0; i < exts_len; i++) {
+		const char *ext = exts[i];
+		p += _stprintf(p, _T("%s (*.%s)"), ASAPInfo_GetExtDescription(ext), ext) + 1;
+		p += _stprintf(p, _T("*.%s"), ext) + 1;
+	}
+	*p = '\0';
+}
+
+static bool saveInfoAs(void)
+{
+	_TCHAR filename[MAX_PATH];
+	_TCHAR filter[1024];
+	OPENFILENAME ofn = {
+		sizeof(OPENFILENAME),
+		infoDialog,
+		0,
+		filter,
+		NULL,
+		0,
+		1,
+		filename,
+		MAX_PATH,
+		NULL,
+		0,
+		NULL,
+		_T("Select output file"),
+		OFN_ENABLESIZING | OFN_EXPLORER | OFN_OVERWRITEPROMPT,
+		0,
+		0,
+		NULL,
+		0,
+		NULL,
+		NULL
+	};
+	bool tag = false;
+	setSaveFilters(filter);
+	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_GETTEXT, MAX_PATH, (LPARAM) filename);
+	LPTSTR ext = _tcsrchr(filename, '.');
+	if (ext != NULL) {
+		*ext = '\0';
+		ofn.lpstrDefExt = ext + 1;
+	}
+	if (!GetSaveFileName(&ofn))
+		return false;
+	if (isExt(filename, _T(".xex"))) {
+		switch (MessageBox(infoDialog, _T("Do you want to display information during playback?"), _T("ASAP"), MB_YESNOCANCEL | MB_ICONQUESTION)) {
+		case IDYES:
+			tag = true;
+			break;
+		case IDCANCEL:
+			return false;
+		default:
+			break;
+		}
+	}
+	return saveFile(filename, tag);
+}
+
+static void closeInfoDialog(void)
+{
+	DestroyWindow(infoDialog);
+	infoDialog = NULL;
+	ASAPInfo_Delete(edited_info);
+	edited_info = NULL;
+	ASTIL_Delete(astil);
+	astil = NULL;
+}
+
+static INT_PTR CALLBACK infoDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg) {
+	case WM_INITDIALOG:
+#ifdef PLAYING_INFO
+		CheckDlgButton(hDlg, IDC_PLAYING, playing_info ? BST_CHECKED : BST_UNCHECKED);
+#endif
+		SendDlgItemMessage(hDlg, IDC_AUTHOR, EM_LIMITTEXT, ASAPInfo_MAX_TEXT_LENGTH, 0);
+		SendDlgItemMessage(hDlg, IDC_NAME, EM_LIMITTEXT, ASAPInfo_MAX_TEXT_LENGTH, 0);
+		SendDlgItemMessage(hDlg, IDC_DATE, EM_LIMITTEXT, ASAPInfo_MAX_TEXT_LENGTH, 0);
+		SendDlgItemMessage(hDlg, IDC_TIME, EM_LIMITTEXT, ASAPWriter_MAX_DURATION_LENGTH, 0);
+		return TRUE;
+	case WM_COMMAND:
+		switch (wParam) {
+#ifdef PLAYING_INFO
+		case MAKEWPARAM(IDC_PLAYING, BN_CLICKED):
+			playing_info = (IsDlgButtonChecked(hDlg, IDC_PLAYING) == BST_CHECKED);
+			if (playing_info && playing_filename[0] != '\0')
+				updateInfoDialog(playing_filename, playing_song);
+			onUpdatePlayingInfo();
+			return TRUE;
+#endif
+		case MAKEWPARAM(IDC_AUTHOR, EN_CHANGE):
+			updateInfoString(hDlg, IDC_AUTHOR, INVALID_FIELD_AUTHOR, ASAPInfo_SetAuthor);
+			return TRUE;
+		case MAKEWPARAM(IDC_NAME, EN_CHANGE):
+			updateInfoString(hDlg, IDC_NAME, INVALID_FIELD_NAME, ASAPInfo_SetTitle);
+			return TRUE;
+		case MAKEWPARAM(IDC_DATE, EN_CHANGE):
+			updateInfoString(hDlg, IDC_DATE, INVALID_FIELD_DATE, ASAPInfo_SetDate);
+			return TRUE;
+		case MAKEWPARAM(IDC_PICKDATE, BN_CLICKED):
+			toggleCalendar(hDlg);
+			return TRUE;
+		case MAKEWPARAM(IDC_TIME, EN_CHANGE):
+			{
+				char str[ASAPWriter_MAX_DURATION_LENGTH + 1];
+				SendDlgItemMessage(hDlg, IDC_TIME, WM_GETTEXT, ASAPWriter_MAX_DURATION_LENGTH + 1, (LPARAM) str);
+				int duration = ASAPInfo_ParseDuration(str);
+				ASAPInfo_SetDuration(edited_info, edited_song, duration);
+				EnableWindow(GetDlgItem(infoDialog, IDC_LOOP), str[0] != '\0');
+				updateSaveButtons(INVALID_FIELD_TIME | INVALID_FIELD_TIME_SHOW, duration >=0 || str[0] == '\0');
+			}
+			return TRUE;
+		case MAKEWPARAM(IDC_TIME, EN_KILLFOCUS):
+			if ((invalid_fields & INVALID_FIELD_TIME_SHOW) != 0) {
+				invalid_fields &= ~INVALID_FIELD_TIME_SHOW;
+				showEditTip(IDC_TIME, _T("Invalid format"), _T("Please type MM:SS.mmm"));
+			}
+			return TRUE;
+		case MAKEWPARAM(IDC_LOOP, BN_CLICKED):
+			ASAPInfo_SetLoop(edited_info, edited_song, IsDlgButtonChecked(hDlg, IDC_LOOP) == BST_CHECKED);
+			updateSaveButtons(0, true);
+			return TRUE;
+		case MAKEWPARAM(IDC_SONGNO, CBN_SELCHANGE):
+			setEditedSong((int) SendDlgItemMessage(hDlg, IDC_SONGNO, CB_GETCURSEL, 0, 0));
+			updateSaveButtons(INVALID_FIELD_TIME | INVALID_FIELD_TIME_SHOW, true);
+			return TRUE;
+		case MAKEWPARAM(IDC_SAVE, BN_CLICKED):
+			saveInfo();
+			return TRUE;
+		case MAKEWPARAM(IDC_SAVEAS, BN_CLICKED):
+			saveInfoAs();
+			return TRUE;
+		case MAKEWPARAM(IDCANCEL, BN_CLICKED):
+			if (invalid_fields == 0 && infoChanged()) {
+				switch (MessageBox(hDlg, _T("Save changes?"), _T("ASAP"), MB_YESNOCANCEL | MB_ICONQUESTION)) {
+				case IDYES:
+					if (!saveInfoAs())
+						return TRUE;
+					break;
+				case IDCANCEL:
+					return TRUE;
+				default:
+					break;
+				}
+			}
+			closeInfoDialog();
+			return TRUE;
+		}
+		break;
+	case WM_NOTIFY: {
+			LPNMSELCHANGE psc = (LPNMSELCHANGE) lParam;
+			if (psc->nmhdr.hwndFrom == monthcal && psc->nmhdr.code == MCN_SELECT) {
+				ShowWindow(monthcal, SW_HIDE);
+				_TCHAR str[32];
+				_stprintf(str, _T("%02d/%02d/%d"), psc->stSelStart.wDay, psc->stSelStart.wMonth, psc->stSelStart.wYear);
+				SetDlgItemText(hDlg, IDC_DATE, str);
+				ASAPInfo_SetDate(edited_info, str);
+				updateSaveButtons(INVALID_FIELD_DATE, true);
+			}
+		}
+		break;
+	case WM_DESTROY:
+		if (monthcal != NULL) {
+			DestroyWindow(monthcal);
+			monthcal = NULL;
+		}
+		return 0;
+	default:
+		break;
+	}
+	return FALSE;
+}
+
+void showInfoDialog(HINSTANCE hInstance, HWND hwndParent, LPCTSTR filename, int song)
+{
+	if (infoDialog == NULL)
+		infoDialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_INFO), hwndParent, infoDialogProc);
+	if (playing_info || filename == NULL)
+		updateInfoDialog(playing_filename, playing_song);
+	else
+		updateInfoDialog(filename, song);
+}
+
+void updateInfoDialog(LPCTSTR filename, int song)
+{
+	if (infoDialog == NULL)
+		return;
+	if (edited_info == NULL) {
+		edited_info = ASAPInfo_New();
+		if (astil == NULL)
+			astil = ASTIL_New();
+		if (edited_info == NULL || astil == NULL) {
+			closeInfoDialog();
+			return;
+		}
+	}
+	else if (infoChanged())
+		return;
+	if (!loadModule(filename, saved_module, &saved_module_len)
+	 || !ASAPInfo_Load(edited_info, filename, saved_module, saved_module_len)) {
+		closeInfoDialog();
+		return;
+	}
+	setSaved();
+	can_save = isExt(filename, _T(".sap"));
+	invalid_fields = 0;
+	SendDlgItemMessage(infoDialog, IDC_FILENAME, WM_SETTEXT, 0, (LPARAM) filename);
+	SendDlgItemMessage(infoDialog, IDC_AUTHOR, WM_SETTEXT, 0, (LPARAM) saved_author);
+	SendDlgItemMessage(infoDialog, IDC_NAME, WM_SETTEXT, 0, (LPARAM) saved_title);
+	SendDlgItemMessage(infoDialog, IDC_DATE, WM_SETTEXT, 0, (LPARAM) saved_date);
+	SendDlgItemMessage(infoDialog, IDC_SONGNO, CB_RESETCONTENT, 0, 0);
+	int songs = ASAPInfo_GetSongs(edited_info);
+	EnableWindow(GetDlgItem(infoDialog, IDC_SONGNO), songs > 1);
+	for (int i = 1; i <= songs; i++) {
+		_TCHAR str[16];
+		_stprintf(str, _T("%d"), i);
+		SendDlgItemMessage(infoDialog, IDC_SONGNO, CB_ADDSTRING, 0, (LPARAM) str);
+	}
+	if (song < 0)
+		song = ASAPInfo_GetDefaultSong(edited_info);
+	SendDlgItemMessage(infoDialog, IDC_SONGNO, CB_SETCURSEL, song, 0);
+	setEditedSong(song);
+	EnableWindow(GetDlgItem(infoDialog, IDC_SAVE), FALSE);
+	updateTech();
+}
+
+void setPlayingSong(LPCTSTR filename, int song)
+{
+	if (filename != NULL && _tcslen(filename) < MAX_PATH - 1)
+		_tcscpy(playing_filename, filename);
+	playing_song = song;
+	if (playing_info)
+		updateInfoDialog(playing_filename, song);
+}
+
+const ASTIL *getPlayingASTIL(void)
+{
+	if (astil == NULL)
+		astil = ASTIL_New();
+	ASTIL_Load(astil, playing_filename, playing_song);
+	return astil;
+}
+
+#endif /* _UNICODE */
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/info_dlg.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/info_dlg.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/info_dlg.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/info_dlg.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+ * info_dlg.h - file information dialog box
+ *
+ * Copyright (C) 2007-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IDD_INFO       300
+#define IDC_PLAYING    301
+#define IDC_FILENAME   302
+#define IDC_AUTHOR     303
+#define IDC_NAME       304
+#define IDC_DATE       305
+#define IDC_PICKDATE   306
+#define IDC_SONGNO     307
+#define IDC_TIME       308
+#define IDC_LOOP       309
+#define IDC_TECHINFO   310
+#define IDC_STILFILE   311
+#define IDC_STILINFO   312
+#define IDC_SAVE       313
+#define IDC_SAVEAS     314
+
+#define IDD_PROGRESS   500
+#define IDC_PROGRESS   501
+
+void combineFilenameExt(LPTSTR dest, LPCTSTR filename, LPCTSTR ext);
+bool loadModule(LPCTSTR filename, BYTE *module, int *module_len);
+
+extern HWND infoDialog;
+void showInfoDialog(HINSTANCE hInstance, HWND hwndParent, LPCTSTR filename, int song);
+void updateInfoDialog(LPCTSTR filename, int song);
+void setPlayingSong(LPCTSTR filename, int song);
+#ifdef XMPLAY
+const ASTIL *getPlayingASTIL(void);
+#endif
+#if defined(WINAMP) || defined(FOOBAR2000) || defined(XMPLAY)
+#define PLAYING_INFO
+extern bool playing_info;
+void onUpdatePlayingInfo(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/rmt/apokeysnd_dll.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/rmt/apokeysnd_dll.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/rmt/apokeysnd_dll.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/rmt/apokeysnd_dll.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ * apokeysnd_dll.c - POKEY sound emulator for Raster Music Tracker
+ *
+ * Copyright (C) 2008-2020  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stddef.h>
+#include "pokey.h"
+
+static PokeyPair *pokeys = NULL;
+
+__declspec(dllexport) void APokeySound_Initialize(bool stereo)
+{
+	PokeyPair_Delete(pokeys);
+	pokeys = PokeyPair_New();
+	PokeyPair_Initialize(pokeys, false, stereo);
+	PokeyPair_StartFrame(pokeys);
+}
+
+__declspec(dllexport) void APokeySound_PutByte(int addr, int data)
+{
+	PokeyPair_Poke(pokeys, addr, data, 0);
+}
+
+__declspec(dllexport) int APokeySound_GetRandom(int addr, int cycle)
+{
+	return PokeyPair_Peek(pokeys, addr, cycle);
+}
+
+__declspec(dllexport) int APokeySound_Generate(int cycles, unsigned char *buffer, int depth)
+{
+	int len = PokeyPair_EndFrame(pokeys, cycles);
+	len = PokeyPair_Generate(pokeys, buffer, 0, len, depth == 16 ? ASAPSampleFormat_S16_L_E : ASAPSampleFormat_U8);
+	PokeyPair_StartFrame(pokeys);
+	return len;
+}
+
+__declspec(dllexport) void APokeySound_About(const char **name, const char **author, const char **description)
+{
+	*name = "Another POKEY Sound Emulator, v5.0.1";
+	*author = "Piotr Fusik, (C) 2007-2020";
+	*description = "Part of ASAP, http://asap.sourceforge.net";
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/settings_dlg.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/settings_dlg.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/settings_dlg.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/settings_dlg.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,202 @@
+/*
+ * settings_dlg.c - settings dialog box
+ *
+ * Copyright (C) 2007-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <windows.h>
+#include <tchar.h>
+
+#include "asap.h"
+#include "settings_dlg.h"
+
+void enableTimeInput(HWND hDlg, bool enable)
+{
+	EnableWindow(GetDlgItem(hDlg, IDC_MINUTES), enable);
+	EnableWindow(GetDlgItem(hDlg, IDC_SECONDS), enable);
+}
+
+void setFocusAndSelect(HWND hDlg, int nID)
+{
+	HWND hWnd = GetDlgItem(hDlg, nID);
+	SetFocus(hWnd);
+	SendMessage(hWnd, EM_SETSEL, 0, -1);
+}
+
+void settingsDialogSet(HWND hDlg, int song_length, int silence_seconds, bool play_loops, int mute_mask)
+{
+	if (song_length <= 0) {
+		CheckRadioButton(hDlg, IDC_UNLIMITED, IDC_LIMITED, IDC_UNLIMITED);
+		SetDlgItemInt(hDlg, IDC_MINUTES, DEFAULT_SONG_LENGTH / 60, FALSE);
+		SetDlgItemInt(hDlg, IDC_SECONDS, DEFAULT_SONG_LENGTH % 60, FALSE);
+		enableTimeInput(hDlg, FALSE);
+	}
+	else {
+		CheckRadioButton(hDlg, IDC_UNLIMITED, IDC_LIMITED, IDC_LIMITED);
+		SetDlgItemInt(hDlg, IDC_MINUTES, (UINT) song_length / 60, FALSE);
+		SetDlgItemInt(hDlg, IDC_SECONDS, (UINT) song_length % 60, FALSE);
+		enableTimeInput(hDlg, TRUE);
+	}
+	if (silence_seconds <= 0) {
+		CheckDlgButton(hDlg, IDC_SILENCE, BST_UNCHECKED);
+		SetDlgItemInt(hDlg, IDC_SILSECONDS, DEFAULT_SILENCE_SECONDS, FALSE);
+		EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), FALSE);
+	}
+	else {
+		CheckDlgButton(hDlg, IDC_SILENCE, BST_CHECKED);
+		SetDlgItemInt(hDlg, IDC_SILSECONDS, (UINT) silence_seconds, FALSE);
+		EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), TRUE);
+	}
+	CheckRadioButton(hDlg, IDC_LOOPS, IDC_NOLOOPS, play_loops ? IDC_LOOPS : IDC_NOLOOPS);
+	for (int i = 0; i < 8; i++)
+		CheckDlgButton(hDlg, IDC_MUTE1 + i, ((mute_mask >> i) & 1) != 0 ? BST_CHECKED : BST_UNCHECKED);
+}
+
+#ifndef FOOBAR2000
+
+int song_length = -1;
+int silence_seconds = -1;
+bool play_loops = false;
+int mute_mask = 0;
+static int saved_mute_mask;
+
+static bool getDlgInt(HWND hDlg, int nID, int *result)
+{
+	BOOL translated;
+	UINT r = GetDlgItemInt(hDlg, nID, &translated, FALSE);
+	if (!translated) {
+		MessageBox(hDlg, _T("Invalid number"), _T("Error"), MB_OK | MB_ICONERROR);
+		return false;
+	}
+	*result = (int) r;
+	return true;
+}
+
+static INT_PTR CALLBACK settingsDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg) {
+	case WM_INITDIALOG:
+		saved_mute_mask = mute_mask;
+		settingsDialogSet(hDlg, song_length, silence_seconds, play_loops, mute_mask);
+		return TRUE;
+	case WM_COMMAND:
+		if (HIWORD(wParam) == BN_CLICKED) {
+			WORD wCtrl = LOWORD(wParam);
+			switch (wCtrl) {
+			case IDC_UNLIMITED:
+				enableTimeInput(hDlg, FALSE);
+				return TRUE;
+			case IDC_LIMITED:
+				enableTimeInput(hDlg, TRUE);
+				setFocusAndSelect(hDlg, IDC_MINUTES);
+				return TRUE;
+			case IDC_SILENCE:
+				if (IsDlgButtonChecked(hDlg, IDC_SILENCE) == BST_CHECKED) {
+					EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), true);
+					setFocusAndSelect(hDlg, IDC_SILSECONDS);
+				}
+				else
+					EnableWindow(GetDlgItem(hDlg, IDC_SILSECONDS), false);
+				return TRUE;
+			case IDC_LOOPS:
+			case IDC_NOLOOPS:
+				return TRUE;
+			case IDC_MUTE1:
+			case IDC_MUTE1 + 1:
+			case IDC_MUTE1 + 2:
+			case IDC_MUTE1 + 3:
+			case IDC_MUTE1 + 4:
+			case IDC_MUTE1 + 5:
+			case IDC_MUTE1 + 6:
+			case IDC_MUTE1 + 7:
+			{
+				int mask = 1 << (wCtrl - IDC_MUTE1);
+				if (IsDlgButtonChecked(hDlg, wCtrl) == BST_CHECKED)
+					mute_mask |= mask;
+				else
+					mute_mask &= ~mask;
+				ASAP_MutePokeyChannels(asap, mute_mask);
+				return TRUE;
+			}
+			case IDOK:
+			{
+				int new_song_length;
+				if (IsDlgButtonChecked(hDlg, IDC_UNLIMITED) == BST_CHECKED)
+					new_song_length = -1;
+				else {
+					int minutes;
+					int seconds;
+					if (!getDlgInt(hDlg, IDC_MINUTES, &minutes)
+					 || !getDlgInt(hDlg, IDC_SECONDS, &seconds))
+						return TRUE;
+					new_song_length = 60 * minutes + seconds;
+				}
+				if (IsDlgButtonChecked(hDlg, IDC_SILENCE) != BST_CHECKED)
+					silence_seconds = -1;
+				else if (!getDlgInt(hDlg, IDC_SILSECONDS, &silence_seconds))
+					return TRUE;
+				song_length = new_song_length;
+				play_loops = (IsDlgButtonChecked(hDlg, IDC_LOOPS) == BST_CHECKED);
+				EndDialog(hDlg, IDOK);
+				return TRUE;
+			}
+			case IDCANCEL:
+				mute_mask = saved_mute_mask;
+				ASAP_MutePokeyChannels(asap, mute_mask);
+				EndDialog(hDlg, IDCANCEL);
+				return TRUE;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+	return FALSE;
+}
+
+bool settingsDialog(HINSTANCE hInstance, HWND hwndParent)
+{
+	return DialogBox(hInstance, MAKEINTRESOURCE(IDD_SETTINGS), hwndParent, settingsDialogProc) == IDOK;
+}
+
+int getSongDurationInternal(const ASAPInfo *info, int song, ASAP *asap)
+{
+	int duration = ASAPInfo_GetDuration(info, song);
+	if (duration < 0) {
+		if (asap != NULL)
+			ASAP_DetectSilence(asap, silence_seconds);
+		return 1000 * song_length;
+	}
+	if (asap != NULL)
+		ASAP_DetectSilence(asap, 0);
+	if (play_loops && ASAPInfo_GetLoop(info, song))
+		return 1000 * song_length;
+	return duration;
+}
+
+int playSong(int song)
+{
+	int duration = getSongDurationInternal(ASAP_GetInfo(asap), song, asap);
+	ASAP_PlaySong(asap, song, duration); /* FIXME: check errors */
+	ASAP_MutePokeyChannels(asap, mute_mask);
+	return duration;
+}
+
+#endif /* FOOBAR2000 */
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/settings_dlg.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/settings_dlg.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/settings_dlg.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/settings_dlg.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * settings_dlg.h - settings dialog box
+ *
+ * Copyright (C) 2007-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <windows.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DEFAULT_SONG_LENGTH      180
+#define DEFAULT_SILENCE_SECONDS  2
+
+#define IDD_SETTINGS   400
+#define IDC_UNLIMITED  401
+#define IDC_LIMITED    402
+#define IDC_MINUTES    403
+#define IDC_SECONDS    404
+#define IDC_SILENCE    405
+#define IDC_SILSECONDS 406
+#define IDC_LOOPS      407
+#define IDC_NOLOOPS    408
+#define IDC_MUTE1      411
+
+#ifdef FOOBAR2000
+void enableTimeInput(HWND hDlg, bool enable);
+void setFocusAndSelect(HWND hDlg, int nID);
+void settingsDialogSet(HWND hDlg, int song_length, int silence_seconds, bool play_loops, int mute_mask);
+#else
+extern ASAP *asap;
+extern int song_length;
+extern int silence_seconds;
+extern bool play_loops;
+extern int mute_mask;
+bool settingsDialog(HINSTANCE hInstance, HWND hwndParent);
+int getSongDurationInternal(const ASAPInfo *module_info, int song, ASAP *asap);
+#define getSongDuration(module_info, song)  getSongDurationInternal(module_info, song, NULL)
+int playSong(int song);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/asap-banner.jpg and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/asap-banner.jpg differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/asap-dialog.jpg and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/asap-dialog.jpg differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/asap.wxs kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/asap.wxs
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/asap.wxs	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/asap.wxs	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,512 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<?if $(sys.BUILDARCH) = x86?>
+		<?define WIN64=no?>
+		<?define PLATFORM_SUFFIX=""?>
+		<?define PLATFORM_BITS=32-bit?>
+		<?define UPGRADE_GUID=4250B3CB-D4A1-4486-828C-AC26A84D00D9?>
+		<?define PROGRAM_FILES_FOLDER=ProgramFilesFolder?>
+		<?define SRC_DIR=""?>
+		<?define SHELL_EX_LEVEL=9?>
+	<?elseif $(sys.BUILDARCH) = x64?>
+		<?define WIN64=yes?>
+		<?define PLATFORM_SUFFIX=" (64-bit)"?>
+		<?define PLATFORM_BITS=64-bit?>
+		<?define UPGRADE_GUID=205ADAB1-56A1-42B9-9789-FD20FCD1DF9B?>
+		<?define PROGRAM_FILES_FOLDER=ProgramFiles64Folder?>
+		<?define SRC_DIR=x64\?>
+		<?define SHELL_EX_LEVEL=1?>
+	<?endif?>
+
+	<Product Id="*" Name="ASAP - Another Slight Atari Player $(var.VERSION)$(var.PLATFORM_SUFFIX)" Language="1033"
+		Version="$(var.VERSION)" Manufacturer="Piotr Fusik" UpgradeCode="$(var.UPGRADE_GUID)">
+
+		<Package Description="ASAP - Another Slight Atari Player" Manufacturer="Piotr Fusik"
+			InstallerVersion="200" Platform="$(sys.BUILDARCH)" Compressed="yes" />
+		<MajorUpgrade DowngradeErrorMessage="Newer version of ASAP is already installed!" MigrateFeatures="yes" />
+		<Media Id="1" Cabinet="asap.cab" EmbedCab="yes" CompressionLevel="high" />
+
+		<?define EXT_FILTER=*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc?>
+		<?define NATIVE_EXTS=cmc;cm3;cmr;cms;dmc;dlt;mpt;mpd;rmt;tmc;tm8;tm2;fc?>
+		<?define ASAP_EXTS=sap;$(var.NATIVE_EXTS)?>
+		<?define DOUBLECLICK=Double-click SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2 or FC file in Windows Explorer to play it in?>
+
+		<Icon Id="wasap.ico" SourceFile="wasap/wasap.ico" />
+		<Property Id="ARPHELPLINK" Value="http://asap.sourceforge.net/" />
+		<Property Id="ARPPRODUCTICON" Value="wasap.ico" />
+		<WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
+		<WixVariable Id="WixUIDialogBmp" Value="asap-dialog.jpg" />
+		<WixVariable Id="WixUIBannerBmp" Value="asap-banner.jpg" />
+
+		<UI Id="MyWixUI_FeatureTree">
+			<!-- customized WixUI_FeatureTree from Wix 3.0 - my changes commented -->
+			<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+			<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+			<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+			<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+			<Property Id="WixUI_Mode" Value="FeatureTree" />
+
+			<DialogRef Id="ErrorDlg" />
+			<DialogRef Id="FatalError" />
+			<DialogRef Id="FilesInUse" />
+			<DialogRef Id="MsiRMFilesInUse" />
+			<DialogRef Id="PrepareDlg" />
+			<DialogRef Id="ProgressDlg" />
+			<DialogRef Id="ResumeDlg" />
+			<DialogRef Id="UserExit" />
+
+			<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+			<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="MyLicenseAgreementDlg">1</Publish>
+
+			<Publish Dialog="MyLicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+			<Publish Dialog="MyLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="MyCustomizeDlg">1</Publish>
+
+			<Publish Dialog="MyCustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish>
+			<Publish Dialog="MyCustomizeDlg" Control="Back" Event="NewDialog" Value="MyLicenseAgreementDlg" Order="2">NOT Installed</Publish>
+			<Publish Dialog="MyCustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MyCustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
+			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish>
+
+			<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+			<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="MyCustomizeDlg">1</Publish>
+			<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+			<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+			<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+			<Dialog Id="MyLicenseAgreementDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
+				<!-- removed the checkbox and replaced the "Next" button with "I Accept" -->
+				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="I &amp;Accept">
+					<!-- sf bug #3294936
+					<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
+					-->
+				</Control>
+				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+					<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+				</Control>
+				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
+				<!-- higher license box because of the removed checkbox -->
+				<Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="155" Sunken="yes" TabSkip="no">
+					<Text SourceFile="!(wix.WixUILicenseRtf)" />
+				</Control>
+				<!-- removed the "Print" button -->
+				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+				<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
+				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
+			</Dialog>
+
+			<Dialog Id="MyCustomizeDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
+				<!-- wider and higher selection tree -->
+				<Control Id="Tree" Type="SelectionTree" X="10" Y="75" Width="190" Height="125" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
+				<Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
+					<Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
+					<Condition Action="hide">Installed</Condition>
+					<Condition Action="disable">Installed</Condition>
+				</Control>
+				<!-- removed the "Reset" and "Disk Cost" buttons, moved the "Back" and "Next" buttons to their position in other dialogs -->
+				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+					<Subscribe Event="SelectionNoItems" Attribute="Enabled" />
+				</Control>
+				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+					<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+				</Control>
+				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
+				<Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
+				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+				<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
+				<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
+				<Control Id="Box" Type="GroupBox" X="210" Y="71" Width="150" Height="128" />
+				<Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)">
+					<Subscribe Event="SelectionDescription" Attribute="Text" />
+				</Control>
+				<Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)">
+					<Subscribe Event="SelectionSize" Attribute="Text" />
+				</Control>
+				<Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)">
+					<Subscribe Event="SelectionPath" Attribute="Text" />
+					<Subscribe Event="SelectionPathOn" Attribute="Visible" />
+					<Condition Action="hide">Installed</Condition>
+				</Control>
+				<Control Id="LocationLabel" Type="Text" X="25" Y="210" Width="65" Height="10" Text="!(loc.CustomizeDlgLocationLabel)">
+					<Subscribe Event="SelectionPathOn" Attribute="Visible" />
+					<Condition Action="hide">Installed</Condition>
+				</Control>
+			</Dialog>
+
+			<?if $(sys.BUILDARCH) = x86?>
+			<!-- handle mutually exclusive file associations, conditions generated with wix_mutex.pl -->
+			<?foreach MUTEXCOND in (($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3) OR $foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)));
+(($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3) OR $aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
+(($wasap.ext=3 OR ($wasap.ext=-1 AND ?wasap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
+(($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)) AND ($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3) OR $xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)));
+(($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)) AND ($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
+(($in_asap.ext=3 OR ($in_asap.ext=-1 AND ?in_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
+(($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)) AND ($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3) OR $aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
+(($foo_asap.ext=3 OR ($foo_asap.ext=-1 AND ?foo_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
+(($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)) AND ($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)));
+(($xmp_asap.ext=3 OR ($xmp_asap.ext=-1 AND ?xmp_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)));
+(($aimp_asap.ext=3 OR ($aimp_asap.ext=-1 AND ?aimp_asap.ext=3)) AND ($libasap_plugin.ext=3 OR ($libasap_plugin.ext=-1 AND ?libasap_plugin.ext=3)))?>
+				<Publish Dialog="MyCustomizeDlg" Control="Next" Event="SpawnDialog" Value="MyManyAssociationsDlg" Order="3">
+					$(var.MUTEXCOND)
+				</Publish>
+			<?endforeach?>
+			<Dialog Id="MyManyAssociationsDlg" Width="270" Height="85" Title="!(loc.ErrorDlg_Title)">
+				<Control Id="ErrorText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" Text="You have selected &quot;Associate file types&quot; for many players. You may associate files with only one player." />
+				<Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" />
+				<Control Id="O" Type="PushButton" X="100" Y="60" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)">
+					<Publish Event="EndDialog" Value="Return">1</Publish>
+				</Control>
+			</Dialog>
+			<?endif?>
+		</UI>
+		<UIRef Id="WixUI_Common" />
+
+		<?if $(sys.BUILDARCH) = x86?>
+		<Property Id="TSVN.VER">
+			<RegistrySearch Id="tsvn.ver" Root="HKCU" Key="SOFTWARE\TortoiseSVN" Name="CurrentVersion" Type="raw" />
+		</Property>
+		<Property Id="TGIT.VER">
+			<RegistrySearch Id="tgit.ver" Root="HKCU" Key="SOFTWARE\TortoiseGit" Name="CurrentVersion" Type="raw" />
+		</Property>
+		<Property Id="FOO.DIR">
+			<RegistrySearch Id="foo.installdir" Root="HKLM" Key="SOFTWARE\foobar2000" Name="InstallDir" Type="directory" />
+		</Property>
+		<Property Id="FOO.EXE">
+			<RegistrySearch Id="foo.exe" Root="HKLM" Key="SOFTWARE\foobar2000" Name="InstallDir" Type="directory">
+				<FileSearch Name="foobar2000.exe" />
+			</RegistrySearch>
+		</Property>
+		<Property Id="XMPLAY.DIR">
+			<RegistrySearch Id="xmplay.installdir" Root="HKCR" Key="XMPlay\shell\Open\command" Type="file" />
+		</Property>
+		<Property Id="XMPLAY.EXE">
+			<RegistrySearch Id="xmplay.exe" Root="HKCR" Key="XMPlay\shell\Open\command" Type="file">
+				<FileSearch Name="xmplay.exe" />
+			</RegistrySearch>
+		</Property>
+		<Property Id="AIMP.DIR">
+			<RegistrySearch Id="aimp.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\AIMP" Name="InstallPath" Type="directory" />
+		</Property>
+		<Property Id="AIMP.EXE">
+			<DirectorySearch Id="aimp.exe" Path="[AIMP.DIR]">
+				<FileSearch Name="AIMP.exe" />
+			</DirectorySearch>
+		</Property>
+		<Property Id="WINAMP.DIR">
+			<RegistrySearch Id="winamp.installdir" Root="HKCU" Key="SOFTWARE\Winamp" Type="directory" />
+		</Property>
+		<Property Id="WINAMP.EXE">
+			<RegistrySearch Id="winamp.exe" Root="HKCU" Key="SOFTWARE\Winamp" Type="directory">
+				<FileSearch Name="winamp.exe" />
+			</RegistrySearch>
+		</Property>
+		<?endif?>
+		<Property Id="VLC.DIR">
+			<RegistrySearch Id="vlc.installdir" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VLC media player" Name="InstallLocation" Type="directory" />
+		</Property>
+		<Property Id="VLC.EXE">
+			<RegistrySearch Id="vlc.exe" Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VLC media player" Name="InstallLocation" Type="directory">
+				<FileSearch Name="vlc.exe" />
+			</RegistrySearch>
+		</Property>
+
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="$(var.PROGRAM_FILES_FOLDER)">
+				<Directory Id="ASAP.DIR" Name="ASAP">
+					<?if $(sys.BUILDARCH) = x86?>
+					<Component Id="wasap.exe">
+						<File Name="wasap.exe" Source="wasap.exe" Checksum="yes" KeyPath="yes" />
+					</Component>
+					<Component Id="wasap.ext">
+						<RegistryValue Root="HKCR" Key="asap.file" Name="wasap" Type="integer" Value="1" KeyPath="yes" />
+						<ProgId Id="asap.file">
+							<Extension Id="sap">
+								<!-- nothing special about "sap", just Verb needs to be defined only once per ProgId -->
+								<Verb Id="open" TargetFile="wasap.exe" Argument='"%1"' />
+							</Extension>
+							<?foreach EXT in $(var.NATIVE_EXTS)?>
+								<Extension Id="$(var.EXT)" />
+							<?endforeach?>
+						</ProgId>
+					</Component>
+
+					<Component Id="asapconv.exe">
+						<File Name="asapconv.exe" Source="asapconv.exe" Checksum="yes" KeyPath="yes" />
+					</Component>
+					<Component Id="path" Guid="D7247D41-0B9A-42D3-9847-06C37F88E2ED">
+						<Environment Id="path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[ASAP.DIR]" />
+						<CreateFolder />
+					</Component>
+					<?endif?>
+
+					<Component Id="ASAPShellEx.dll" Win64="$(var.WIN64)">
+						<File Name="ASAPShellEx.dll" Source="$(var.SRC_DIR)ASAPShellEx.dll" Checksum="yes" KeyPath="yes">
+							<Class Id="{5AE26367-B5CF-444D-B163-2CBC99B41287}" Context="InprocServer32" Description="ASAP Metadata Handler" ThreadingModel="both" />
+						</File>
+						<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{5AE26367-B5CF-444D-B163-2CBC99B41287}" Value="ASAP Metadata Handler" Type="string" />
+					</Component>
+					<Component Id="ASAPShellEx.propdesc" Win64="$(var.WIN64)">
+						<Condition>VersionNT &gt;= 600</Condition>
+						<File Name="ASAPShellEx.propdesc" Source="shellex\ASAPShellEx.propdesc" KeyPath="yes" />
+					</Component>
+					<Component Id="ASAPShellExXP.reg" Win64="$(var.WIN64)">
+						<Condition>VersionNT &lt; 600</Condition>
+						<RegistryValue Root="HKCR" Key="Folder\shellex\ColumnHandlers\{5AE26367-B5CF-444D-B163-2CBC99B41287}" Value="ASAP Column Handler" Type="string" KeyPath="yes" />
+					</Component>
+					<Component Id="ASAPShellExVista.reg" Win64="$(var.WIN64)">
+						<Condition>VersionNT &gt;= 600</Condition>
+						<?foreach EXT in $(var.ASAP_EXTS)?>
+							<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.$(var.EXT)" Value="{5AE26367-B5CF-444D-B163-2CBC99B41287}" Type="string" />
+							<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Explorer\KindMap" Name=".$(var.EXT)" Value="music" Type="string" />
+							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="InfoTip" Value="prop:System.ItemType;System.Size;System.Media.Duration" Type="string" />
+							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="ExtendedTileInfo" Value="prop:System.ItemType;System.Size;System.Media.Duration" Type="string" />
+							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="PreviewDetails" Value="prop:*System.Title;*System.Media.Duration;*System.Size;*System.Author;*System.Media.Year" Type="string" />
+							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="PerceivedType" Value="audio" Type="string" />
+						<?endforeach?>
+						<?define FULLDETAILS_COMMON=System.PropGroup.Audio;System.Media.Duration;System.Audio.ChannelCount;ASAP.Subsongs;ASAP.PALNTSC;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes?>
+						<RegistryValue Root="HKCR" Key=".sap" Name="FullDetails" Value="prop:System.PropGroup.Description;System.Author;System.Title;System.Media.Year;$(var.FULLDETAILS_COMMON)" Type="string" />
+						<?foreach EXT in rmt;tmc;tm8;tm2?>
+							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="FullDetails" Value="prop:System.PropGroup.Description;System.Title;$(var.FULLDETAILS_COMMON)" Type="string" />
+						<?endforeach?>
+						<?foreach EXT in cmc;cm3;cmr;cms;dmc;dlt;mpt;mpd;fc?>
+							<RegistryValue Root="HKCR" Key=".$(var.EXT)" Name="FullDetails" Value="prop:$(var.FULLDETAILS_COMMON)" Type="string" />
+						<?endforeach?>
+					</Component>
+
+					<?if $(sys.BUILDARCH) = x86?>
+					<Component Id="sap2txt.exe">
+						<File Name="sap2txt.exe" Source="sap2txt.exe" Checksum="yes" KeyPath="yes" />
+					</Component>
+					<Component Id="diff_sap.js">
+						<File Name="diff-sap.js" Source="diff-sap.js" KeyPath="yes" />
+					</Component>
+					<Component Id="diff_sap_tsvn.reg">
+						<RegistryValue Root="HKCU" Key="Software\TortoiseSVN\DiffTools" Name=".sap" Value="wscript.exe &quot;[#diff_sap.js]&quot; %base %mine %bname %yname //E:javascript" Type="string" KeyPath="yes" />
+					</Component>
+					<Component Id="diff_sap_tgit.reg">
+						<RegistryValue Root="HKCU" Key="Software\TortoiseGit\DiffTools" Name=".sap" Value="wscript.exe &quot;[#diff_sap.js]&quot; %base %mine %bname %yname //E:javascript" Type="string" KeyPath="yes" />
+					</Component>
+					<?endif?>
+				</Directory>
+
+				<Directory Id="VIDEOLAN.DIR" Name="VideoLAN">
+					<Directory Id="VLC.DIR" Name="VLC">
+						<Directory Id="VLCPLUGINS.DIR" Name="plugins">
+							<Directory Id="VLCDEMUX.DIR" Name="demux">
+								<Component Id="libasap_plugin.dll" Win64="$(var.WIN64)">
+									<File Name="libasap_plugin.dll" Source="$(var.SRC_DIR)libasap_plugin.dll" Checksum="yes" KeyPath="yes" />
+								</Component>
+								<Component Id="libasap_plugin.ext" Win64="$(var.WIN64)">
+									<RegistryValue Root="HKCR" Key="asap.file" Name="vlc" Type="integer" Value="1" KeyPath="yes" />
+									<ProgId Id="VLC.sap">
+										<Extension Id="sap">
+											<Verb Id="open" TargetProperty="VLC.EXE" Argument='--started-from-file "%1"' />
+										</Extension>
+										<Extension Id="fc" />
+										<Extension Id="rmt" />
+									</ProgId>
+								</Component>
+							</Directory>
+						</Directory>
+					</Directory>
+				</Directory>
+
+				<?if $(sys.BUILDARCH) = x86?>
+				<Directory Id="FOO.DIR" Name="foobar2000">
+					<Directory Id="FOOCOMP.DIR" Name="components">
+						<Component Id="foo_asap.dll">
+							<File Name="foo_asap.dll" Source="foo_asap.dll" Checksum="yes" KeyPath="yes" />
+						</Component>
+						<Component Id="foo_asap.ext">
+							<RegistryValue Root="HKCR" Key="asap.file" Name="foo_asap" Type="integer" Value="1" KeyPath="yes" />
+							<?foreach EXT in $(var.NATIVE_EXTS)?>
+								<ProgId Id="foobar2000.$(var.EXT)">
+									<Extension Id="$(var.EXT)">
+										<Verb Id="open" TargetProperty="FOO.EXE" Argument='"%1"' />
+									</Extension>
+								</ProgId>
+							<?endforeach?>
+						</Component>
+					</Directory>
+				</Directory>
+				<Directory Id="XMPLAY.DIR" Name="XMPlay">
+					<Component Id="xmp_asap.dll">
+						<File Name="xmp-asap.dll" Source="xmp-asap.dll" Checksum="yes" KeyPath="yes" />
+					</Component>
+					<Component Id="xmp_asap.ext">
+						<RegistryValue Root="HKCR" Key="asap.file" Name="xmp_asap" Type="integer" Value="1" KeyPath="yes" />
+						<ProgId Id="XMPlay">
+							<Extension Id="sap">
+								<Verb Id="open" Command="&amp;Open with XMPlay" TargetProperty="XMPLAY.EXE" />
+							</Extension>
+							<?foreach EXT in $(var.NATIVE_EXTS)?>
+								<Extension Id="$(var.EXT)" />
+							<?endforeach?>
+						</ProgId>
+					</Component>
+				</Directory>
+				<Directory Id="AIMP.DIR" Name="AIMP">
+					<Directory Id="AIMPPLUG.DIR" Name="Plugins">
+						<Directory Id="AIMPASAP.DIR" Name="bass_asap">
+							<Component Id="bass_asap.dll">
+								<File Name="bass_asap.dll" Source="bass_asap.dll" Checksum="yes" KeyPath="yes" />
+							</Component>
+							<Component Id="aimp_asap.ext">
+								<RegistryValue Root="HKCR" Key="asap.file" Name="aimp" Type="integer" Value="1" KeyPath="yes" />
+								<ProgId Id="AIMP.ASAP">
+									<Extension Id="sap">
+										<Verb Id="open" Command="Open with AIMP" TargetProperty="AIMP.EXE" Argument='"%1"' />
+									</Extension>
+									<?foreach EXT in $(var.NATIVE_EXTS)?>
+										<Extension Id="$(var.EXT)" />
+									<?endforeach?>
+								</ProgId>
+							</Component>
+						</Directory>
+					</Directory>
+				</Directory>
+				<Directory Id="WINAMP.DIR" Name="Winamp">
+					<Directory Id="WINAMPPLUG.DIR" Name="Plugins">
+						<Component Id="in_asap.dll">
+							<File Name="in_asap.dll" Source="in_asap.dll" Checksum="yes" KeyPath="yes" />
+						</Component>
+						<Component Id="in_asap.ext">
+							<RegistryValue Root="HKCR" Key="Winamp.File" Name="in_asap" Type="integer" Value="1" KeyPath="yes" />
+							<ProgId Id="Winamp.File">
+								<Extension Id="sap">
+									<Verb Id="open" TargetProperty="WINAMP.EXE" Argument='"%1"' />
+								</Extension>
+								<?foreach EXT in $(var.NATIVE_EXTS)?>
+									<Extension Id="$(var.EXT)" />
+								<?endforeach?>
+							</ProgId>
+						</Component>
+					</Directory>
+				</Directory>
+				<Directory Id="RMT.DIR" Name="RMT">
+					<Component Id="apokeysnd.dll">
+						<File Name="apokeysnd.dll" Source="apokeysnd.dll" Checksum="yes" KeyPath="yes" />
+					</Component>
+				</Directory>
+				<?endif?>
+			</Directory>
+
+			<?if $(sys.BUILDARCH) = x86?>
+			<Directory Id="ProgramMenuFolder" Name="Programs">
+				<Component Id="WASAP.lnk">
+					<RegistryValue Root="HKCU" Key="Software\ASAP" Name="ProgramsMenuWASAP" Type="integer" Value="1" KeyPath="yes" />
+					<Shortcut Id="WASAP.lnk" Name="WASAP" Target="[#wasap.exe]" />
+				</Component>
+			</Directory>
+			<Directory Id="DesktopFolder" Name="Desktop">
+				<Component Id="WASAP.desktop">
+					<RegistryValue Root="HKCU" Key="Software\ASAP" Name="DesktopWASAP" Type="integer" Value="1" KeyPath="yes" />
+					<Shortcut Id="WASAP.desktop" Name="WASAP" Target="[#wasap.exe]" />
+				</Component>
+			</Directory>
+			<?endif?>
+		</Directory>
+
+		<?if $(sys.BUILDARCH) = x86?>
+		<Feature Id="foo_asap" Title="foobar2000 plugin" Level="9" ConfigurableDirectory="FOOCOMP.DIR" Description="Plugin for foobar2000." AllowAdvertise="no">
+			<Condition Level="1">FOO.DIR</Condition>
+			<ComponentRef Id="foo_asap.dll" />
+			<Feature Id="foo_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) foobar2000." AllowAdvertise="no">
+				<Condition Level="9">FOO.EXE</Condition>
+				<ComponentRef Id="foo_asap.ext" />
+			</Feature>
+		</Feature>
+		<Feature Id="xmp_asap" Title="XMPlay plugin" Level="9" ConfigurableDirectory="XMPLAY.DIR" Description="Plugin for XMPlay." AllowAdvertise="no">
+			<Condition Level="1">XMPLAY.DIR</Condition>
+			<ComponentRef Id="xmp_asap.dll" />
+			<Feature Id="xmp_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) XMPlay." AllowAdvertise="no">
+				<Condition Level="9">XMPLAY.EXE</Condition>
+				<ComponentRef Id="xmp_asap.ext" />
+			</Feature>
+		</Feature>
+		<Feature Id="aimp_asap" Title="AIMP plugin" Level="9" ConfigurableDirectory="AIMPASAP.DIR" Description="Plugin for AIMP." AllowAdvertise="no">
+			<Condition Level="1">AIMP.DIR</Condition>
+			<ComponentRef Id="bass_asap.dll" />
+			<Feature Id="aimp_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) AIMP." AllowAdvertise="no">
+				<Condition Level="9">AIMP.EXE</Condition>
+				<ComponentRef Id="aimp_asap.ext" />
+			</Feature>
+		</Feature>
+		<Feature Id="in_asap" Title="Winamp plugin" Level="9" ConfigurableDirectory="WINAMPPLUG.DIR" Description="Plugin for Winamp." AllowAdvertise="no">
+			<Condition Level="1">WINAMP.DIR</Condition>
+			<ComponentRef Id="in_asap.dll" />
+			<Feature Id="in_asap.ext" Title="Associate file types" Level="0" Description="$(var.DOUBLECLICK) Winamp." AllowAdvertise="no">
+				<Condition Level="9">WINAMP.EXE</Condition>
+				<ComponentRef Id="in_asap.ext" />
+			</Feature>
+		</Feature>
+		<Feature Id="apokeysnd" Title="RMT sound emulator" Level="9" ConfigurableDirectory="RMT.DIR" Description="POKEY sound emulation engine for Raster Music Tracker." AllowAdvertise="no">
+			<ComponentRef Id="apokeysnd.dll" />
+		</Feature>
+		<?endif?>
+
+		<Feature Id="libasap_plugin" Title="VLC $(var.PLATFORM_BITS) plugin" Level="9" ConfigurableDirectory="VLC.DIR" Description="Plugin for $(var.PLATFORM_BITS) VLC 3 (SAP and FC formats only)." AllowAdvertise="no">
+			<Condition Level="1">VLC.DIR</Condition>
+			<ComponentRef Id="libasap_plugin.dll" />
+			<Feature Id="libasap_plugin.ext" Title="Associate file types" Level="0" Description="Double-click SAP file in Windows Explorer to play it in VLC." AllowAdvertise="no">
+				<Condition Level="9">VLC.EXE</Condition>
+				<ComponentRef Id="libasap_plugin.ext" />
+			</Feature>
+		</Feature>
+		<Feature Id="ASAPShellEx" Title="Windows Explorer $(var.PLATFORM_BITS) extension" Level="$(var.SHELL_EX_LEVEL)" ConfigurableDirectory="ASAP.DIR" Description="Shows metadata (title, author, year, duration, subsongs) in $(var.PLATFORM_BITS) Windows Explorer." AllowAdvertise="no">
+			<ComponentRef Id="ASAPShellEx.dll" />
+			<ComponentRef Id="ASAPShellEx.propdesc" />
+			<ComponentRef Id="ASAPShellExXP.reg" />
+			<ComponentRef Id="ASAPShellExVista.reg" />
+		</Feature>
+
+		<?if $(sys.BUILDARCH) = x86?>
+		<Feature Id="wasap" Title="WASAP" Level="1" ConfigurableDirectory="ASAP.DIR" Description="Tiny player controlled by a tray icon." AllowAdvertise="no">
+			<ComponentRef Id="wasap.exe" />
+			<Feature Id="wasap.lnk" Title="Start menu shortcut" Level="1" Description="Adds WASAP to the Programs menu." AllowAdvertise="no">
+				<ComponentRef Id="WASAP.lnk" />
+			</Feature>
+			<Feature Id="wasap.desktop" Title="Desktop shortcut" Level="9" Description="Adds WASAP to the desktop." AllowAdvertise="no">
+				<ComponentRef Id="WASAP.desktop" />
+			</Feature>
+			<Feature Id="wasap.ext" Title="Associate file types" Level="9" Description="$(var.DOUBLECLICK) WASAP." AllowAdvertise="no">
+				<ComponentRef Id="wasap.ext" />
+			</Feature>
+		</Feature>
+		<Feature Id="asapconv" Title="asapconv" Level="1" ConfigurableDirectory="ASAP.DIR" Description="Command-line converter." AllowAdvertise="no">
+			<ComponentRef Id="asapconv.exe" />
+			<Feature Id="path" Title="Add to Path" Level="1" Description="Add the directory to the Path environment variable so that you don't have to type the location of asapconv at the command prompt." AllowAdvertise="no">
+				<ComponentRef Id="path" />
+			</Feature>
+		</Feature>
+		<Feature Id="diff_sap_tsvn" Title="TortoiseSVN diff viewer" Level="0" Description="Compare changes in SAP files." AllowAdvertise="no">
+			<Condition Level="1">TSVN.VER</Condition>
+			<ComponentRef Id="sap2txt.exe" />
+			<ComponentRef Id="diff_sap.js" />
+			<ComponentRef Id="diff_sap_tsvn.reg" />
+		</Feature>
+		<Feature Id="diff_sap_tgit" Title="TortoiseGit diff viewer" Level="0" Description="Compare changes in SAP files." AllowAdvertise="no">
+			<Condition Level="1">TGIT.VER</Condition>
+			<ComponentRef Id="sap2txt.exe" />
+			<ComponentRef Id="diff_sap.js" />
+			<ComponentRef Id="diff_sap_tgit.reg" />
+		</Feature>
+		<?endif?>
+
+		<CustomAction Id="InstallPropertySchema" DllEntry="InstallPropertySchema" FileKey="ASAPShellEx.dll" Execute="deferred" Impersonate="no" />
+		<CustomAction Id="UninstallPropertySchema" DllEntry="UninstallPropertySchema" FileKey="ASAPShellEx.dll" Execute="deferred" Impersonate="no" />
+
+		<InstallExecuteSequence>
+			<Custom Action="UninstallPropertySchema" After="SelfUnregModules">$ASAPShellEx.propdesc = 2</Custom>
+			<Custom Action="InstallPropertySchema" After="SelfRegModules">$ASAPShellEx.propdesc = 3</Custom>
+		</InstallExecuteSequence>
+
+	</Product>
+</Wix>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/license.rtf kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/license.rtf
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/license.rtf	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/license.rtf	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,48 @@
+{\rtf1\ansi\ansicpg1252
+{\fonttbl {\f0\fswiss\fcharset0 Arial;}}
+\f0\sa100\fs18\lang1033
+
+Copyright (C) 2005-2020 - Piotr Fusik
+
+\par\ql
+ASAP is free. You don't have to pay for it, and you can use it 
+any way you want. It is developed as an Open Source project under the 
+GNU General Public License (GPL). That means you have full access to 
+the source code of this program. You can find it on our website at 
+http://asap.sourceforge.net/
+
+\par
+Should you wish to modify or redistribute this program, or any part of it, 
+you should read the full terms and conditions set out in the license 
+agreement before doing so. A copy of the license is in the COPYING file 
+attached to the source code.
+
+\par
+If you simply wish to install and use this software, you need only be aware of 
+the disclaimer conditions in the license, which are set out below.
+
+\par\b
+NO WARRANTY
+
+\par\b0
+Because the program is licensed free of charge, there is no warranty 
+for the program, to the extent permitted by applicable law.  Except when 
+otherwise stated in writing the copyright holders and/or other parties 
+provide the program "as is" without warranty of any kind, either expressed 
+or implied, including, but not limited to, the implied warranties of 
+merchantability and fitness for a particular purpose.  The entire risk as 
+to the quality and performance of the program is with you.  Should the 
+program prove defective, you assume the cost of all necessary servicing, 
+repair or correction.
+
+\par
+In no event unless required by applicable law or agreed to in writing 
+will any copyright holder, or any other party who may modify and/or 
+redistribute the program as permitted above, be liable to you for damages, 
+including any general, special, incidental or consequential damages arising 
+out of the use or inability to use the program (including but not limited 
+to loss of data or data being rendered inaccurate or losses sustained by 
+you or third parties or a failure of the program to operate with any other 
+programs), even if such holder or other party has been advised of the 
+possibility of such damages.
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/wix_mutex.pl kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/wix_mutex.pl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/setup/wix_mutex.pl	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/setup/wix_mutex.pl	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,18 @@
+# Generate mutual exclusion conditions
+use strict;
+my @c = qw(wasap.ext in_asap.ext foo_asap.ext xmp_asap.ext aimp_asap.ext libasap_plugin.ext);
+my @a = map "\$$_=3 OR (\$$_=-1 AND ?$_=3)", @c; # action is install or (action is nothing and already installed)
+my $i = 0;
+for my $a (@a[0 .. $#a - 1]) {
+	my @b = @a[++$i .. $#a];
+	while (@b) {
+		$_ = "(($a) AND (" . shift @b;
+		while (@b) {
+			my $t = "$_ OR $b[0]";
+			last if length($t) > 198;
+			$_ = $t;
+			shift @b;
+		}
+		print "$_));\n";
+	}
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/shellex/ASAPShellEx.cpp kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/shellex/ASAPShellEx.cpp
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/shellex/ASAPShellEx.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/shellex/ASAPShellEx.cpp	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,761 @@
+/*
+ * ASAPShellEx.cpp - ASAP Column Handler and Property Handler shell extensions
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* There are two separate implementations for different Windows versions:
+   Column Handler (IColumnProvider) works in Windows XP and 2003 (probably 2000 too and maybe 98).
+   Property Handler (IInitializeWithStream+IPropertyStore+IPropertyStoreCapabilities) works in Windows Vista and 7. */
+
+#include <stdio.h>
+#define _WIN32_IE 0x500
+#include <shlobj.h>
+#include <shlwapi.h>
+
+#include "asap-infowriter.hpp"
+
+static const char extensions[][5] =
+	{ ".sap", ".cmc", ".cm3", ".cmr", ".cms", ".dmc", ".dlt", ".mpt", ".mpd", ".rmt", ".tmc", ".tm8", ".tm2", ".fc" };
+
+static HINSTANCE g_hDll;
+static LONG g_cRef = 0;
+static enum { WINDOWS_OLD, WINDOWS_XP, WINDOWS_VISTA } g_windowsVer;
+
+static void DllAddRef(void)
+{
+	InterlockedIncrement(&g_cRef);
+}
+
+static void DllRelease(void)
+{
+	InterlockedDecrement(&g_cRef);
+}
+
+#define CLSID_ASAPMetadataHandler_str "{5AE26367-B5CF-444D-B163-2CBC99B41287}"
+static const GUID CLSID_ASAPMetadataHandler =
+	{ 0x5ae26367, 0xb5cf, 0x444d, { 0xb1, 0x63, 0x2c, 0xbc, 0x99, 0xb4, 0x12, 0x87 } };
+
+struct CMyPropertyDef
+{
+	const SHCOLUMNID scid;
+	const UINT cChars;
+	const DWORD csFlags;
+	const LPCWSTR wszTitle;
+
+	void CopyTo(SHCOLUMNINFO *psci) const
+	{
+		psci->scid = this->scid;
+		psci->vt = VT_LPWSTR;
+		psci->fmt = LVCFMT_LEFT;
+		psci->cChars = this->cChars;
+		psci->csFlags = this->csFlags;
+		lstrcpyW(psci->wszTitle, this->wszTitle);
+		lstrcpyW(psci->wszDescription, this->wszTitle);
+	}
+};
+
+static const CMyPropertyDef g_propertyDefs[] = {
+	{ { FMTID_SummaryInformation, PIDSI_TITLE }, 25, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Title" },
+	{ { FMTID_SummaryInformation, PIDSI_AUTHOR }, 25, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Author" },
+	{ { FMTID_MUSIC, PIDSI_ARTIST }, 25, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Artist" },
+	{ { FMTID_MUSIC, PIDSI_YEAR }, 4, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Year" },
+	{ { FMTID_AudioSummaryInformation, PIDASI_TIMELENGTH }, 8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"Duration" },
+	{ { FMTID_AudioSummaryInformation, PIDASI_CHANNEL_COUNT }, 9, SHCOLSTATE_TYPE_INT | SHCOLSTATE_SLOW, L"Channels" },
+	{ { CLSID_ASAPMetadataHandler, 1 }, 8, SHCOLSTATE_TYPE_INT | SHCOLSTATE_SLOW, L"Subsongs" },
+	{ { CLSID_ASAPMetadataHandler, 2 }, 8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_SLOW, L"PAL/NTSC" }
+};
+#define N_PROPERTYDEFS ARRAYSIZE(g_propertyDefs)
+
+class CMyLock
+{
+	const PCRITICAL_SECTION m_pLock;
+
+public:
+
+	CMyLock(PCRITICAL_SECTION pLock) : m_pLock(pLock)
+	{
+		EnterCriticalSection(pLock);
+	}
+
+	~CMyLock()
+	{
+		LeaveCriticalSection(m_pLock);
+	}
+};
+
+class CASAPMetadataHandler final : IColumnProvider, IInitializeWithStream, IPropertyStore, IPropertyStoreCapabilities
+{
+	LONG m_cRef = 1;
+	CRITICAL_SECTION m_lock;
+	WCHAR m_filename[MAX_PATH];
+	bool m_hasInfo = false;
+	IStream *m_pstream = nullptr;
+	ASAPInfo m_info;
+
+	~CASAPMetadataHandler()
+	{
+		if (m_pstream != nullptr)
+			m_pstream->Release();
+		DeleteCriticalSection(&m_lock);
+		DllRelease();
+	}
+
+	HRESULT LoadFile(LPCWSTR wszFile, IStream *pstream, DWORD grfMode)
+	{
+		m_hasInfo = false;
+		if (m_pstream != nullptr) {
+			m_pstream->Release();
+			m_pstream = nullptr;
+		}
+
+		int cbFilename = WideCharToMultiByte(CP_ACP, 0, wszFile, -1, nullptr, 0, nullptr, nullptr);
+		char filename[cbFilename];
+		if (WideCharToMultiByte(CP_ACP, 0, wszFile, -1, filename, cbFilename, nullptr, nullptr) <= 0)
+			return HRESULT_FROM_WIN32(GetLastError());
+
+		byte module[ASAPInfo::maxModuleLength];
+		int module_len;
+		if (pstream != nullptr) {
+			HRESULT hr = pstream->Read(module, ASAPInfo::maxModuleLength, reinterpret_cast<ULONG *>(&module_len));
+			if (FAILED(hr))
+				return hr;
+		}
+		else {
+			HANDLE fh = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
+			if (fh == INVALID_HANDLE_VALUE)
+				return HRESULT_FROM_WIN32(GetLastError());
+			if (!ReadFile(fh, module, ASAPInfo::maxModuleLength, reinterpret_cast<LPDWORD>(&module_len), nullptr)) {
+				HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
+				CloseHandle(fh);
+				return hr;
+			}
+			CloseHandle(fh);
+		}
+
+		try {
+			m_info.load(filename, module, module_len);
+		}
+		catch (...) {
+			return S_OK;
+		}
+
+		if ((grfMode & STGM_READWRITE) != 0) {
+			const char *ext = strrchr(filename, '.');
+			if (ext != nullptr && _stricmp(ext, ".sap") == 0) {
+				m_pstream = pstream;
+				pstream->AddRef();
+			}
+		}
+		m_hasInfo = true;
+		return S_OK;
+	}
+
+	static HRESULT GetInt(PROPVARIANT *pvarData, int i)
+	{
+		pvarData->vt = VT_UI4;
+		pvarData->ulVal = static_cast<ULONG>(i);
+		return S_OK;
+	}
+
+	static HRESULT GetString(PROPVARIANT *pvarData, const char *s)
+	{
+		pvarData->vt = VT_BSTR;
+		// pvarData->bstrVal = A2BSTR(s); - just don't want dependency on ATL
+		int cch = MultiByteToWideChar(CP_ACP, 0, s, -1, nullptr, 0);
+		pvarData->bstrVal = SysAllocStringLen(nullptr, cch - 1);
+		if (pvarData->bstrVal == nullptr)
+			return E_OUTOFMEMORY;
+		if (MultiByteToWideChar(CP_ACP, 0, s, -1, pvarData->bstrVal, cch) <= 0)
+			return HRESULT_FROM_WIN32(GetLastError());
+		return S_OK;
+	}
+
+	HRESULT GetAuthors(PROPVARIANT *pvarData, bool vista)
+	{
+		const char *author = m_info.getAuthor().data();
+		if (!vista)
+			return GetString(pvarData, author);
+		if (author[0] == '\0') {
+			pvarData->vt = VT_EMPTY;
+			return S_OK;
+		}
+		// split on " & "
+		int i;
+		const char *s = author;
+		for (i = 1; ; i++) {
+			s = strstr(s, " & ");
+			if (s == nullptr)
+				break;
+			s += 3;
+		}
+		pvarData->vt = VT_VECTOR | VT_LPSTR;
+		pvarData->calpstr.cElems = i;
+		LPSTR *pElems = static_cast<LPSTR *>(CoTaskMemAlloc(i * sizeof(LPSTR)));
+		pvarData->calpstr.pElems = pElems;
+		if (pElems == nullptr)
+			return E_OUTOFMEMORY;
+		s = author;
+		for (i = 0; ; i++) {
+			const char *e = strstr(s, " & ");
+			size_t len = e != nullptr ? e - s : strlen(s);
+			pElems[i] = static_cast<LPSTR>(CoTaskMemAlloc(len + 1));
+			if (pElems[i] == nullptr)
+				return E_OUTOFMEMORY;
+			memcpy(pElems[i], s, len);
+			pElems[i][len] = '\0';
+			if (e == nullptr)
+				break;
+			s = e + 3;
+		}
+		return S_OK;
+	}
+
+	HRESULT GetData(LPCSHCOLUMNID pscid, PROPVARIANT *pvarData, bool vista)
+	{
+		if (!m_hasInfo)
+			return S_FALSE;
+
+		if (pscid->fmtid == FMTID_SummaryInformation) {
+			if (pscid->pid == PIDSI_TITLE)
+				return GetString(pvarData, m_info.getTitle().data());
+			if (pscid->pid == PIDSI_AUTHOR)
+				return GetAuthors(pvarData, vista);
+		}
+		else if (pscid->fmtid == FMTID_MUSIC) {
+			if (pscid->pid == PIDSI_ARTIST)
+				return GetAuthors(pvarData, vista);
+			if (pscid->pid == PIDSI_YEAR) {
+				int year = m_info.getYear();
+				if (year < 0) {
+					pvarData->vt = VT_EMPTY;
+					return S_OK;
+				}
+				return GetInt(pvarData, year);
+			}
+		}
+		else if (pscid->fmtid == FMTID_AudioSummaryInformation) {
+			if (pscid->pid == PIDASI_TIMELENGTH) {
+				int duration = m_info.getDuration(m_info.getDefaultSong());
+				if (duration < 0) {
+					pvarData->vt = VT_EMPTY;
+					return S_OK;
+				}
+				if (g_windowsVer == WINDOWS_OLD) {
+					duration /= 1000;
+					char timeStr[16];
+					sprintf(timeStr, "%02d:%02d:%02d", duration / 3600, duration / 60 % 60, duration % 60);
+					return GetString(pvarData, timeStr);
+				}
+				else {
+					pvarData->vt = VT_UI8;
+					pvarData->uhVal.QuadPart = 10000ULL * duration;
+					return S_OK;
+				}
+			}
+			if (pscid->pid == PIDASI_CHANNEL_COUNT)
+				return GetInt(pvarData, m_info.getChannels());
+		}
+		else if (pscid->fmtid == CLSID_ASAPMetadataHandler) {
+			if (pscid->pid == 1)
+				return GetInt(pvarData, m_info.getSongs());
+			if (pscid->pid == 2)
+				return GetString(pvarData, m_info.isNtsc() ? "NTSC" : "PAL");
+		}
+		return S_FALSE;
+	}
+
+	static HRESULT AppendString(char *dest, int *offset, LPCWSTR wszVal)
+	{
+		int i = *offset;
+		while (*wszVal != 0) {
+			if (i >= ASAPInfo::maxTextLength) {
+				dest[i] = '\0';
+				return INPLACE_S_TRUNCATED;
+			}
+			WCHAR c = *wszVal++;
+			if (c < ' ' || c > 'z')
+				return E_FAIL;
+			dest[i++] = static_cast<char>(c);
+		}
+		dest[i] = '\0';
+		*offset = i;
+		return S_OK;
+	}
+
+	HRESULT SetString(void (ASAPInfo::*psetfunc)(std::string_view), REFPROPVARIANT propvar)
+	{
+		char s[ASAPInfo::maxTextLength + 1];
+		int offset = 0;
+		HRESULT hr = S_OK;
+		switch (propvar.vt) {
+		case VT_EMPTY:
+			s[0] = '\0';
+			break;
+		case VT_UI4:
+			if (sprintf(s, "%lu", propvar.ulVal) != 4)
+				return E_FAIL;
+			break;
+		case VT_LPWSTR:
+			hr = AppendString(s, &offset, propvar.pwszVal);
+			if (FAILED(hr))
+				return hr;
+			break;
+		case VT_VECTOR | VT_LPWSTR:
+			s[0] = '\0';
+			for (ULONG i = 0; i < propvar.calpwstr.cElems; i++) {
+				if (i > 0) {
+					hr = AppendString(s, &offset, L" & ");
+					if (FAILED(hr))
+						return hr;
+				}
+				hr = AppendString(s, &offset, propvar.calpwstr.pElems[i]);
+				if (FAILED(hr))
+					return hr;
+			}
+			break;
+		default:
+			return E_NOTIMPL;
+		}
+		try {
+			(m_info.*psetfunc)(s);
+			return hr;
+		}
+		catch (...) {
+			return E_FAIL;
+		}
+	}
+
+public:
+
+	CASAPMetadataHandler()
+	{
+		DllAddRef();
+		InitializeCriticalSection(&m_lock);
+		m_filename[0] = '\0';
+	}
+
+	STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
+	{
+		if (riid == IID_IUnknown || riid == IID_IColumnProvider) {
+			*ppv = static_cast<IColumnProvider *>(this);
+			AddRef();
+			return S_OK;
+		}
+		if (riid == IID_IInitializeWithStream) {
+			*ppv = static_cast<IInitializeWithStream *>(this);
+			AddRef();
+			return S_OK;
+		}
+		if (riid == IID_IPropertyStore) {
+			*ppv = static_cast<IPropertyStore *>(this);
+			AddRef();
+			return S_OK;
+		}
+		if (riid == IID_IPropertyStoreCapabilities) {
+			*ppv = static_cast<IPropertyStoreCapabilities *>(this);
+			AddRef();
+			return S_OK;
+		}
+		*ppv = nullptr;
+		return E_NOINTERFACE;
+	}
+
+	STDMETHODIMP_(ULONG) AddRef()
+	{
+		return InterlockedIncrement(&m_cRef);
+	}
+
+	STDMETHODIMP_(ULONG) Release()
+	{
+		ULONG r = InterlockedDecrement(&m_cRef);
+		if (r == 0)
+			delete this;
+		return r;
+	}
+
+	// IColumnProvider
+
+	STDMETHODIMP Initialize(LPCSHCOLUMNINIT psci)
+	{
+		return S_OK;
+	}
+
+	STDMETHODIMP GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
+	{
+		if (dwIndex >= 0 && dwIndex < N_PROPERTYDEFS) {
+			g_propertyDefs[dwIndex].CopyTo(psci);
+			return S_OK;
+		}
+		return S_FALSE;
+	}
+
+	STDMETHODIMP GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
+	{
+		if ((pscd->dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_OFFLINE)) != 0)
+			return S_FALSE;
+		char ext[4];
+		for (int i = 0; i < 3; i++) {
+			WCHAR c = pscd->pwszExt[1 + i];
+			if (c <= ' ' || c > 'z')
+				return S_FALSE;
+			ext[i] = static_cast<char>(c);
+		}
+		if (pscd->pwszExt[5] != '\0')
+			return S_FALSE;
+		ext[3] = '\0';
+		if (!ASAPInfo::isOurExt(ext))
+			return S_FALSE;
+
+		CMyLock lck(&m_lock);
+		if ((pscd->dwFlags & SHCDF_UPDATEITEM) != 0 || lstrcmpW(m_filename, pscd->wszFile) != 0) {
+			lstrcpyW(m_filename, pscd->wszFile);
+			HRESULT hr = LoadFile(pscd->wszFile, nullptr, STGM_READ);
+			if (FAILED(hr))
+				return hr;
+		}
+		return GetData(pscid, reinterpret_cast<PROPVARIANT *>(pvarData), false);
+	}
+
+	// IInitializeWithStream
+
+	STDMETHODIMP Initialize(IStream *pstream, DWORD grfMode)
+	{
+		STATSTG statstg;
+		HRESULT hr = pstream->Stat(&statstg, STATFLAG_DEFAULT);
+		if (FAILED(hr))
+			return hr;
+		CMyLock lck(&m_lock);
+		hr = LoadFile(statstg.pwcsName, pstream, grfMode);
+		CoTaskMemFree(statstg.pwcsName);
+		return hr;
+	}
+
+	// IPropertyStore
+
+	STDMETHODIMP GetCount(DWORD *cProps)
+	{
+		CMyLock lck(&m_lock);
+		return m_hasInfo ? N_PROPERTYDEFS : 0;
+	}
+
+	STDMETHODIMP GetAt(DWORD iProp, PROPERTYKEY *pkey)
+	{
+		CMyLock lck(&m_lock);
+		if (m_hasInfo && iProp >= 0 && iProp < N_PROPERTYDEFS) {
+			*pkey = g_propertyDefs[iProp].scid;
+			return S_OK;
+		}
+		return E_INVALIDARG;
+	}
+
+	STDMETHODIMP GetValue(REFPROPERTYKEY key, PROPVARIANT *pv)
+	{
+		CMyLock lck(&m_lock);
+		HRESULT hr = GetData(&key, pv, true);
+		if (hr == S_FALSE) {
+			pv->vt = VT_EMPTY;
+			return S_OK;
+		}
+		return hr;
+	}
+
+	STDMETHODIMP SetValue(REFPROPERTYKEY key, REFPROPVARIANT propvar)
+	{
+		CMyLock lck(&m_lock);
+		if (m_pstream == nullptr)
+			return STG_E_ACCESSDENIED;
+		if (key.fmtid == FMTID_SummaryInformation) {
+			if (key.pid == PIDSI_TITLE)
+				return SetString(ASAPInfo::setTitle, propvar);
+			if (key.pid == PIDSI_AUTHOR)
+				return SetString(ASAPInfo::setAuthor, propvar);
+		}
+		else if (key.fmtid == FMTID_MUSIC) {
+			if (key.pid == PIDSI_ARTIST)
+				return SetString(ASAPInfo::setAuthor, propvar);
+			if (key.pid == PIDSI_YEAR)
+				return SetString(ASAPInfo::setDate, propvar);
+		}
+		return E_FAIL;
+	}
+
+	STDMETHODIMP Commit(void)
+	{
+		CMyLock lck(&m_lock);
+		if (m_pstream == nullptr)
+			return STG_E_ACCESSDENIED;
+		LARGE_INTEGER liZero;
+		liZero.LowPart = 0;
+		liZero.HighPart = 0;
+		HRESULT hr = m_pstream->Seek(liZero, STREAM_SEEK_SET, nullptr);
+		if (SUCCEEDED(hr)) {
+			byte module[ASAPInfo::maxModuleLength];
+			int module_len;
+			hr = m_pstream->Read(module, ASAPInfo::maxModuleLength, reinterpret_cast<ULONG *>(&module_len));
+			if (SUCCEEDED(hr)) {
+				byte output[ASAPInfo::maxModuleLength];
+				{
+					ASAPWriter writer;
+					writer.setOutput(output, 0, sizeof(output));
+					module_len = writer.write("dummy.sap", &m_info, module, module_len, false);
+				}
+				if (module_len < 0)
+					hr = E_FAIL;
+				else {
+					hr = m_pstream->Seek(liZero, STREAM_SEEK_SET, nullptr);
+					if (SUCCEEDED(hr)) {
+						ULARGE_INTEGER liSize;
+						liSize.LowPart = module_len;
+						liSize.HighPart = 0;
+						hr = m_pstream->SetSize(liSize);
+						if (SUCCEEDED(hr)) {
+							hr = m_pstream->Write(output, module_len, nullptr);
+							if (SUCCEEDED(hr))
+								hr = m_pstream->Commit(STGC_DEFAULT);
+						}
+					}
+				}
+			}
+		}
+		m_pstream->Release();
+		m_pstream = nullptr;
+		return hr;
+	}
+
+	// IPropertyStoreCapabilities
+
+	STDMETHODIMP IsPropertyWritable(REFPROPERTYKEY key)
+	{
+		if (key.fmtid == FMTID_SummaryInformation) {
+			if (key.pid == PIDSI_TITLE || key.pid == PIDSI_AUTHOR)
+				return S_OK;
+		}
+		else if (key.fmtid == FMTID_MUSIC) {
+			if (key.pid == PIDSI_ARTIST || key.pid == PIDSI_YEAR)
+				return S_OK;
+		}
+		return S_FALSE;
+	}
+};
+
+class CASAPMetadataHandlerFactory : public IClassFactory
+{
+public:
+
+	STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
+	{
+		if (riid == IID_IUnknown || riid == IID_IClassFactory) {
+			*ppv = static_cast<IClassFactory *>(this);
+			DllAddRef();
+			return S_OK;
+		}
+		*ppv = nullptr;
+		return E_NOINTERFACE;
+	}
+
+	STDMETHODIMP_(ULONG) AddRef()
+	{
+		DllAddRef();
+		return 2;
+	}
+
+	STDMETHODIMP_(ULONG) Release()
+	{
+		DllRelease();
+		return 1;
+	}
+
+	STDMETHODIMP CreateInstance(LPUNKNOWN punkOuter, REFIID riid, void **ppv)
+	{
+		*ppv = nullptr;
+		if (punkOuter != nullptr)
+			return CLASS_E_NOAGGREGATION;
+		CASAPMetadataHandler *punk = new CASAPMetadataHandler;
+		if (punk == nullptr)
+			return E_OUTOFMEMORY;
+		HRESULT hr = punk->QueryInterface(riid, ppv);
+		punk->Release();
+		return hr;
+	}
+
+	STDMETHODIMP LockServer(BOOL fLock)
+	{
+		if (fLock)
+			DllAddRef();
+		else
+			DllRelease();
+		return S_OK;
+	};
+};
+
+STDAPI_(BOOL) __declspec(dllexport) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+{
+	if (dwReason == DLL_PROCESS_ATTACH) {
+		g_hDll = hInstance;
+		OSVERSIONINFO osvi;
+		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+		GetVersionEx(&osvi);
+		g_windowsVer = WINDOWS_OLD;
+		if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+			if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion >= 1)
+				g_windowsVer = WINDOWS_XP;
+			else if (osvi.dwMajorVersion >= 6)
+				g_windowsVer = WINDOWS_VISTA;
+		}
+	}
+	return TRUE;
+}
+
+static LSTATUS RegSetString(HKEY hKey, LPCSTR lpValueName, LPCSTR lpStr)
+{
+	return RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<const BYTE *>(lpStr), strlen(lpStr) + 1);
+}
+
+STDAPI __declspec(dllexport) DllRegisterServer(void)
+{
+	HKEY hk1;
+	if (RegCreateKeyEx(HKEY_CLASSES_ROOT, "CLSID\\" CLSID_ASAPMetadataHandler_str, 0, nullptr, 0, KEY_WRITE, nullptr, &hk1, nullptr) != ERROR_SUCCESS)
+		return E_FAIL;
+	HKEY hk2;
+	if (RegCreateKeyEx(hk1, "InProcServer32", 0, nullptr, 0, KEY_WRITE, nullptr, &hk2, nullptr) != ERROR_SUCCESS) {
+		RegCloseKey(hk1);
+		return E_FAIL;
+	}
+	char szModulePath[MAX_PATH];
+	if (GetModuleFileName(g_hDll, szModulePath, MAX_PATH) == 0
+	 || RegSetString(hk2, nullptr, szModulePath) != ERROR_SUCCESS
+	 || RegSetString(hk2, "ThreadingModel", "Both") != ERROR_SUCCESS) {
+		RegCloseKey(hk2);
+		RegCloseKey(hk1);
+		return E_FAIL;
+	}
+	RegCloseKey(hk2);
+	RegCloseKey(hk1);
+
+	if (g_windowsVer == WINDOWS_VISTA) {
+		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\PropertySystem\\PropertyHandlers", 0, KEY_WRITE, &hk1) != ERROR_SUCCESS)
+			return E_FAIL;
+		for (LPCSTR ext : extensions) {
+			if (RegCreateKeyEx(hk1, ext, 0, nullptr, 0, KEY_WRITE, nullptr, &hk2, nullptr) != ERROR_SUCCESS) {
+				RegCloseKey(hk1);
+				return E_FAIL;
+			}
+			if (RegSetString(hk2, nullptr, CLSID_ASAPMetadataHandler_str) != ERROR_SUCCESS) {
+				RegCloseKey(hk2);
+				RegCloseKey(hk1);
+				return E_FAIL;
+			}
+			RegCloseKey(hk2);
+		}
+		RegCloseKey(hk1);
+	}
+	else {
+		if (RegCreateKeyEx(HKEY_CLASSES_ROOT, "Folder\\shellex\\ColumnHandlers\\" CLSID_ASAPMetadataHandler_str, 0, nullptr, 0, KEY_WRITE, nullptr, &hk1, nullptr) != ERROR_SUCCESS)
+			return E_FAIL;
+		RegCloseKey(hk1);
+	}
+
+	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", 0, KEY_SET_VALUE, &hk1) != ERROR_SUCCESS)
+		return E_FAIL;
+	if (RegSetString(hk1, CLSID_ASAPMetadataHandler_str, "ASAP Metadata Handler") != ERROR_SUCCESS) {
+		RegCloseKey(hk1);
+		return E_FAIL;
+	}
+	RegCloseKey(hk1);
+	return S_OK;
+}
+
+STDAPI __declspec(dllexport) DllUnregisterServer(void)
+{
+	HKEY hk1;
+	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", 0, KEY_SET_VALUE, &hk1) == ERROR_SUCCESS) {
+		RegDeleteValue(hk1, CLSID_ASAPMetadataHandler_str);
+		RegCloseKey(hk1);
+	}
+	if (g_windowsVer == WINDOWS_VISTA) {
+		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\PropertySystem\\PropertyHandlers", 0, DELETE, &hk1) == ERROR_SUCCESS) {
+			for (LPCSTR ext : extensions)
+				RegDeleteKey(hk1, ext);
+			RegCloseKey(hk1);
+		}
+	}
+	else
+		RegDeleteKey(HKEY_CLASSES_ROOT, "Folder\\shellex\\ColumnHandlers\\" CLSID_ASAPMetadataHandler_str);
+	RegDeleteKey(HKEY_CLASSES_ROOT, "CLSID\\" CLSID_ASAPMetadataHandler_str "\\InProcServer32");
+	RegDeleteKey(HKEY_CLASSES_ROOT, "CLSID\\" CLSID_ASAPMetadataHandler_str);
+	return S_OK;
+}
+
+STDAPI __declspec(dllexport) DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+	if (ppv == nullptr)
+		return E_INVALIDARG;
+	if (rclsid == CLSID_ASAPMetadataHandler) {
+		static CASAPMetadataHandlerFactory g_ClassFactory;
+		return g_ClassFactory.QueryInterface(riid, ppv);
+	}
+	*ppv = nullptr;
+	return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+STDAPI __declspec(dllexport) DllCanUnloadNow(void)
+{
+	return g_cRef == 0 ? S_OK : S_FALSE;
+}
+
+static HRESULT DoPropertySchema(LPCSTR funcName)
+{
+	HRESULT hr = CoInitialize(nullptr);
+	if (SUCCEEDED(hr)) {
+		WCHAR szSchemaPath[MAX_PATH];
+		hr = E_FAIL;
+		if (GetModuleFileNameW(g_hDll, szSchemaPath, MAX_PATH)
+		 && PathRemoveFileSpecW(szSchemaPath)
+		 && PathAppendW(szSchemaPath, L"ASAPShellEx.propdesc")) {
+			HMODULE propsysDll = LoadLibrary("propsys.dll");
+			if (propsysDll != nullptr) {
+				typedef HRESULT (__stdcall *FuncType)(PCWSTR);
+				FuncType func = reinterpret_cast<FuncType>(GetProcAddress(propsysDll, funcName));
+				if (func != nullptr) {
+					hr = func(szSchemaPath);
+					if (hr == INPLACE_S_TRUNCATED) // returned on Windows 10, no idea why
+						hr = S_OK;
+				}
+				FreeLibrary(propsysDll);
+			}
+		}
+		CoUninitialize();
+	}
+	return hr;
+}
+
+STDAPI __declspec(dllexport) InstallPropertySchema(void)
+{
+	HRESULT hr = DoPropertySchema("PSRegisterPropertySchema");
+	if (SUCCEEDED(hr))
+		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+	return hr;
+}
+
+STDAPI __declspec(dllexport) UninstallPropertySchema(void)
+{
+	return DoPropertySchema("PSUnregisterPropertySchema");
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/shellex/ASAPShellEx.propdesc kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/shellex/ASAPShellEx.propdesc
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/shellex/ASAPShellEx.propdesc	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/shellex/ASAPShellEx.propdesc	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,21 @@
+<schema xmlns="http://schemas.microsoft.com/windows/2006/propertydescription" schemaVersion="1.0">
+	<propertyDescriptionList publisher="Piotr Fusik" product="ASAP">
+		<propertyDescription name="ASAP.Subsongs" formatID="{5AE26367-B5CF-444D-B163-2CBC99B41287}" propID="1">
+			<description>Number of songs in the file.</description>
+			<typeInfo type="UInt32" isViewable="true" />
+			<labelInfo label="Subsongs" />
+		</propertyDescription>
+		<propertyDescription name="ASAP.PALNTSC" formatID="{5AE26367-B5CF-444D-B163-2CBC99B41287}" propID="2">
+			<description>PAL/NTSC system.</description>
+			<typeInfo type="String" isViewable="true" />
+			<labelInfo label="PAL/NTSC" />
+			<displayInfo displayType="Enumerated">
+				<editControl control="DropList"/>
+				<enumeratedList>
+					<enum value="PAL" text="PAL" />
+					<enum value="NTSC" text="NTSC" />
+				</enumeratedList>
+			</displayInfo>
+		</propertyDescription>
+	</propertyDescriptionList>
+</schema>
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/play.ico and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/play.ico differ
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/stop.ico and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/stop.ico differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/wasap.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/wasap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/wasap.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/wasap.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,640 @@
+/*
+ * wasap.c - Another Slight Atari Player for Win32 systems
+ *
+ * Copyright (C) 2005-2018  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <windows.h>
+#include <commctrl.h>
+#include <stdio.h>
+#include <shellapi.h>
+#include <tchar.h>
+
+#include "asap.h"
+#include "info_dlg.h"
+#include "wasap.h"
+
+#define APP_TITLE        _T("WASAP")
+#define WND_CLASS_NAME   _T("WASAP")
+#define OPEN_TITLE       _T("Select Atari 8-bit music")
+#define BITS_PER_SAMPLE  16
+#define BUFFERS          2
+#define BUFFERED_BLOCKS  4096
+
+static ASAP *asap;
+static int songs = 0;
+static _TCHAR current_filename[MAX_PATH] = _T("");
+static int current_song;
+
+static HWND hWnd;
+
+
+/* WaveOut ---------------------------------------------------------------- */
+
+static HANDLE waveEvent = NULL;
+static HWAVEOUT hwo = INVALID_HANDLE_VALUE;
+/* double-buffering, *2 for 16-bit, *2 for stereo */
+static char buffer[BUFFERS][BUFFERED_BLOCKS * 2 * 2];
+static WAVEHDR wh[BUFFERS];
+static HANDLE waveThread = NULL;
+static BOOL playing = FALSE;
+
+static BOOL WaveOut_Write(LPWAVEHDR pwh)
+{
+	int len = ASAP_Generate(asap, (PBYTE) pwh->lpData, pwh->dwBufferLength, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
+	if (len <= 0)
+		return FALSE;
+	pwh->dwBufferLength = len;
+	pwh->dwFlags &= ~WHDR_DONE;
+	return waveOutWrite(hwo, pwh, sizeof(WAVEHDR)) == MMSYSERR_NOERROR;
+}
+
+static DWORD WINAPI WaveOut_Thread(LPVOID lpParameter)
+{
+	while (playing) {
+		BOOL finished = TRUE;
+		int i;
+		for (i = 0; i < BUFFERS; i++) {
+			if ((wh[i].dwFlags & WHDR_DONE) == 0 || WaveOut_Write(&wh[i]))
+				finished = FALSE;
+		}
+		if (finished) {
+			PostMessage(hWnd, WM_COMMAND, IDM_STOP, 0);
+			break;
+		}
+		WaitForSingleObject(waveEvent, 200);
+	}
+	return 0;
+}
+
+static void WaveOut_Close(void)
+{
+	if (waveEvent != NULL) {
+		if (hwo != INVALID_HANDLE_VALUE) {
+			int i;
+			playing = FALSE;
+			if (waveThread != NULL) {
+				SetEvent(waveEvent);
+				WaitForSingleObject(waveThread, 300);
+				CloseHandle(waveThread);
+				waveThread = NULL;
+			}
+			waveOutReset(hwo);
+			for (i = 0; i < BUFFERS; i++) {
+				if (wh[i].dwFlags & WHDR_PREPARED)
+					waveOutUnprepareHeader(hwo, &wh[i], sizeof(WAVEHDR));
+			}
+			waveOutClose(hwo);
+			hwo = INVALID_HANDLE_VALUE;
+		}
+		CloseHandle(waveEvent);
+		waveEvent = NULL;
+	}
+}
+
+static int WaveOut_Open(int channels)
+{
+	WAVEFORMATEX wfx;
+	int i;
+	DWORD waveThreadId;
+
+	waveEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+	if (waveEvent == NULL)
+		return FALSE;
+
+	wfx.wFormatTag = WAVE_FORMAT_PCM;
+	wfx.nChannels = channels;
+	wfx.nSamplesPerSec = ASAP_SAMPLE_RATE;
+	wfx.nBlockAlign = channels * (BITS_PER_SAMPLE / 8);
+	wfx.nAvgBytesPerSec = ASAP_SAMPLE_RATE * wfx.nBlockAlign;
+	wfx.wBitsPerSample = BITS_PER_SAMPLE;
+	wfx.cbSize = 0;
+	if (waveOutOpen(&hwo, WAVE_MAPPER, &wfx, (DWORD_PTR) waveEvent, 0, CALLBACK_EVENT) != MMSYSERR_NOERROR)
+		return FALSE;
+
+	ZeroMemory(&wh, sizeof(wh));
+	for (i = 0; i < BUFFERS; i++) {
+		wh[i].lpData = buffer[i];
+		wh[i].dwBufferLength = BUFFERED_BLOCKS * wfx.nBlockAlign;
+		if (waveOutPrepareHeader(hwo, &wh[i], sizeof(WAVEHDR)) != MMSYSERR_NOERROR) {
+			WaveOut_Close();
+			return FALSE;
+		}
+		wh[i].dwFlags |= WHDR_DONE;
+	}
+
+	playing = TRUE;
+	waveThread = CreateThread(NULL, 0, WaveOut_Thread, NULL, 0, &waveThreadId);
+	if (waveThread == NULL) {
+		WaveOut_Close();
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+
+/* Tray ------------------------------------------------------------------- */
+
+#define MYWM_NOTIFYICON  (WM_APP + 1)
+static NOTIFYICONDATA nid = {
+	sizeof(NOTIFYICONDATA),
+	NULL,
+	15, /* wince: "Values from 0 to 12 are reserved and should not be used." */
+	NIF_ICON | NIF_MESSAGE | NIF_TIP,
+	MYWM_NOTIFYICON,
+	NULL,
+	APP_TITLE
+};
+static UINT taskbarCreatedMessage;
+
+static void Tray_Modify(HICON hIcon)
+{
+	nid.hIcon = hIcon;
+	if (songs > 0) {
+		LPCTSTR pb;
+		LPCTSTR pe;
+		int len;
+		for (pb = pe = current_filename; *pe != '\0'; pe++) {
+			if (*pe == '\\' || *pe == '/')
+				pb = pe + 1;
+		}
+		/* we need to be careful because szTip is only 64 characters */
+		/* 5 + 2 + max 33 */
+		len = _stprintf(nid.szTip, pe - pb <= 33 ? APP_TITLE ": %s" : APP_TITLE ": %.30s...", pb);
+		if (songs > 1) {
+			/* 7 + max 3 + 4 + max 3 + 1*/
+			_stprintf(nid.szTip + len, _T(" (song %d of %d)"), current_song + 1, songs);
+		}
+	}
+	else
+		_tcscpy(nid.szTip, APP_TITLE);
+	Shell_NotifyIcon(NIM_MODIFY, &nid);
+}
+
+
+/* GUI -------------------------------------------------------------------- */
+
+static int popupShown = FALSE;
+static BOOL errorShown = FALSE;
+static HINSTANCE hInst;
+static HICON hStopIcon;
+static HICON hPlayIcon;
+static HMENU hTrayMenu;
+static HMENU hSongMenu;
+
+static void ShowError(LPCTSTR message)
+{
+	errorShown = TRUE;
+	MessageBox(hWnd, message, APP_TITLE, MB_OK | MB_ICONERROR);
+	errorShown = FALSE;
+}
+
+static void ShowAbout(void)
+{
+	MSGBOXPARAMS mbp = {
+		sizeof(MSGBOXPARAMS),
+		hWnd,
+		hInst,
+		_T(ASAPInfo_CREDITS
+		"WASAP icons (C) 2005 Lukasz Sychowicz\n\n"
+		ASAPInfo_COPYRIGHT),
+		APP_TITLE " " ASAPInfo_VERSION,
+		MB_OK | MB_USERICON,
+		MAKEINTRESOURCE(IDI_APP),
+		0,
+		NULL,
+		LANG_NEUTRAL
+	};
+	popupShown = TRUE;
+	MessageBoxIndirect(&mbp);
+	popupShown = FALSE;
+}
+
+static void SetSongsMenu(int n)
+{
+	int i = GetMenuItemCount(hSongMenu);
+	while (i > n)
+		DeleteMenu(hSongMenu, --i, MF_BYPOSITION);
+	while (++i <= n) {
+		_TCHAR str[3];
+		str[0] = i <= 9 ? '&' : '0' + i / 10;
+		str[1] = '0' + i % 10;
+		str[2] = '\0';
+		AppendMenu(hSongMenu, MF_ENABLED | MF_STRING, IDM_SONG1 + i - 1, str);
+	}
+}
+
+static void OpenMenu(HWND hWnd, HMENU hMenu)
+{
+	POINT pt;
+	GetCursorPos(&pt);
+	SetForegroundWindow(hWnd);
+	TrackPopupMenu(hMenu, TPM_RIGHTALIGN | TPM_BOTTOMALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hWnd, NULL);
+	PostMessage(hWnd, WM_NULL, 0, 0);
+}
+
+static void StopPlayback(void)
+{
+	WaveOut_Close();
+	Tray_Modify(hStopIcon);
+	EnableMenuItem(hTrayMenu, IDM_STOP, MF_BYCOMMAND | MF_GRAYED);
+}
+
+static BOOL DoLoad(ASAP *asap, BYTE *module, int module_len)
+{
+#ifdef _UNICODE
+	static char ansi_filename[MAX_PATH];
+	if (WideCharToMultiByte(CP_ACP, 0, current_filename, -1, ansi_filename, MAX_PATH, NULL, NULL) <= 0) {
+		ShowError(_T("Invalid characters in filename"));
+		return FALSE;
+	}
+#else
+#define ansi_filename current_filename
+#endif
+	if (!ASAP_Load(asap, ansi_filename, module, module_len)) {
+		ShowError(_T("Unsupported file format"));
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static void LoadAndPlay(int song)
+{
+	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len;
+	const ASAPInfo *info;
+	int duration;
+	if (!loadModule(current_filename, module, &module_len))
+		return;
+	if (songs > 0) {
+		songs = 0;
+		StopPlayback();
+		EnableMenuItem(hTrayMenu, 1, MF_BYPOSITION | MF_GRAYED); /* songs */
+		EnableMenuItem(hTrayMenu, IDM_FILE_INFO, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(hTrayMenu, IDM_SAVE_WAV, MF_BYCOMMAND | MF_GRAYED);
+	}
+	if (!DoLoad(asap, module, module_len))
+		return;
+	info = ASAP_GetInfo(asap);
+	if (song < 0)
+		song = ASAPInfo_GetDefaultSong(info);
+	songs = ASAPInfo_GetSongs(info);
+	EnableMenuItem(hTrayMenu, 1, MF_BYPOSITION | MF_ENABLED); /* songs */
+	EnableMenuItem(hTrayMenu, IDM_FILE_INFO, MF_BYCOMMAND | MF_ENABLED);
+	EnableMenuItem(hTrayMenu, IDM_SAVE_WAV, MF_BYCOMMAND | MF_ENABLED);
+#ifndef _UNICODE /* TODO */
+	updateInfoDialog(current_filename, song);
+#endif
+	SetSongsMenu(songs);
+	CheckMenuRadioItem(hSongMenu, 0, songs - 1, song, MF_BYPOSITION);
+	current_song = song;
+	if (ASAPInfo_GetLoop(info, song))
+		duration = -1;
+	else
+		duration = ASAPInfo_GetDuration(info, song);
+	if (!ASAP_PlaySong(asap, song, duration)) {
+		ShowError(_T("This file is a bad rip!"));
+		return;
+	}
+	if (!WaveOut_Open(ASAPInfo_GetChannels(info))) {
+		ShowError(_T("Error initalizing WaveOut"));
+		return;
+	}
+	EnableMenuItem(hTrayMenu, IDM_STOP, MF_BYCOMMAND | MF_ENABLED);
+	Tray_Modify(hPlayIcon);
+}
+
+static void SelectAndLoadFile(void)
+{
+	static OPENFILENAME ofn = {
+		sizeof(OPENFILENAME),
+		NULL,
+		0,
+		_T("All supported\0"
+		"*.sap;*.cmc;*.cm3;*.cmr;*.cms;*.dmc;*.dlt;*.mpt;*.mpd;*.rmt;*.tmc;*.tm8;*.tm2;*.fc\0"
+#define ASAP_FILTER(description, masks) description " (" masks ")\0" masks "\0"
+		ASAP_FILTER("Slight Atari Player", "*.sap")
+		ASAP_FILTER("Chaos Music Composer", "*.cmc;*.cm3;*.cmr;*.cms;*.dmc")
+		ASAP_FILTER("Delta Music Composer", "*.dlt")
+		ASAP_FILTER("Music ProTracker", "*.mpt;*.mpd")
+		ASAP_FILTER("Raster Music Tracker", "*.rmt")
+		ASAP_FILTER("Theta Music Composer 1.x", "*.tmc;*.tm8")
+		ASAP_FILTER("Theta Music Composer 2.x", "*.tm2")
+		ASAP_FILTER("Future Composer", "*.fc")
+		"\0"),
+		NULL,
+		0,
+		1,
+		current_filename,
+		MAX_PATH,
+		NULL,
+		0,
+		NULL,
+		OPEN_TITLE,
+		OFN_ENABLESIZING | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST,
+		0,
+		0,
+		NULL,
+		0,
+		NULL,
+		NULL
+	};
+	popupShown = TRUE;
+	ofn.hwndOwner = hWnd;
+	if (GetOpenFileName(&ofn))
+		LoadAndPlay(-1);
+	popupShown = FALSE;
+}
+
+/* Defined so that the progress bar is responsive, but isn't updated too often and doesn't overflow (65535 limit) */
+#define WAV_PROGRESS_DURATION_SHIFT 10
+
+static int wav_progressLimit;
+static _TCHAR wav_filename[MAX_PATH];
+
+static INT_PTR CALLBACK WavProgressDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	if (uMsg == WM_INITDIALOG)
+		SendDlgItemMessage(hDlg, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, wav_progressLimit));
+	return FALSE;
+}
+
+static BOOL DoSaveWav(ASAP *asap)
+{
+	HANDLE fh;
+	BYTE buffer[8192];
+	DWORD len;
+	HWND progressWnd;
+	int progressPos;
+	int newProgressPos;
+	fh = CreateFile(wav_filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (fh == INVALID_HANDLE_VALUE)
+		return FALSE;
+	progressWnd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROGRESS), hWnd, WavProgressDialogProc);
+	progressPos = 0;
+	len = ASAP_GetWavHeader(asap, buffer, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E, FALSE);
+	while (len > 0) {
+		if (!WriteFile(fh, buffer, len, &len, NULL)) {
+			DestroyWindow(progressWnd);
+			CloseHandle(fh);
+			return FALSE;
+		}
+		newProgressPos = ASAP_GetPosition(asap) >> WAV_PROGRESS_DURATION_SHIFT;
+		if (progressPos != newProgressPos) {
+			progressPos = newProgressPos;
+			SendDlgItemMessage(progressWnd, IDC_PROGRESS, PBM_SETPOS, progressPos, 0);
+		}
+		len = ASAP_Generate(asap, buffer, sizeof(buffer), BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
+	}
+	DestroyWindow(progressWnd);
+	return CloseHandle(fh);
+}
+
+static void SaveWav(void)
+{
+	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len;
+	ASAP *asap;
+	int duration;
+	static OPENFILENAME ofn = {
+		sizeof(OPENFILENAME),
+		NULL,
+		0,
+		_T("WAV files (*.wav)\0*.wav\0\0"),
+		NULL,
+		0,
+		0,
+		wav_filename,
+		MAX_PATH,
+		NULL,
+		0,
+		NULL,
+		_T("Select output file"),
+		OFN_ENABLESIZING | OFN_EXPLORER | OFN_OVERWRITEPROMPT,
+		0,
+		0,
+		_T("wav"),
+		0,
+		NULL,
+		NULL
+	};
+	if (!loadModule(current_filename, module, &module_len))
+		return;
+	asap = ASAP_New();
+	if (asap == NULL)
+		return;
+	if (!DoLoad(asap, module, module_len))
+		return;
+	duration = ASAPInfo_GetDuration(ASAP_GetInfo(asap), current_song);
+	if (duration < 0) {
+		if (MessageBox(hWnd,
+			_T("This song has unknown duration.\n"
+			"Use \"File information\" to update the source file with the correct duration.\n"
+			"Do you want to save 3 minutes?"),
+			_T("Unknown duration"), MB_YESNO | MB_ICONWARNING) != IDYES)
+			return;
+		duration = 180000;
+	}
+	ASAP_PlaySong(asap, current_song, duration);
+	combineFilenameExt(wav_filename, current_filename, _T("wav"));
+	popupShown = TRUE;
+	ofn.hwndOwner = hWnd;
+	if (GetSaveFileName(&ofn)) {
+		wav_progressLimit = duration >> WAV_PROGRESS_DURATION_SHIFT;
+		if (!DoSaveWav(asap))
+			ShowError(_T("Cannot save file"));
+	}
+	popupShown = FALSE;
+}
+
+static LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	int idc;
+	PCOPYDATASTRUCT pcds;
+	switch (msg) {
+	case WM_COMMAND:
+		idc = LOWORD(wParam);
+		switch (idc) {
+		case IDM_OPEN:
+			SelectAndLoadFile();
+			break;
+		case IDM_STOP:
+			StopPlayback();
+			break;
+#ifndef _UNICODE /* TODO */
+		case IDM_FILE_INFO:
+			showInfoDialog(hInst, hWnd, current_filename, current_song);
+			break;
+#endif
+		case IDM_SAVE_WAV:
+			SaveWav();
+			break;
+		case IDM_ABOUT:
+			ShowAbout();
+			break;
+		case IDM_EXIT:
+			PostQuitMessage(0);
+			break;
+		default:
+			if (idc >= IDM_SONG1 && idc < IDM_SONG1 + songs)
+				LoadAndPlay(idc - IDM_SONG1);
+			break;
+		}
+		break;
+	case WM_DESTROY:
+		PostQuitMessage(0);
+		break;
+	case MYWM_NOTIFYICON:
+		if (popupShown) {
+			SetForegroundWindow(hWnd);
+			break;
+		}
+		switch (lParam) {
+		case WM_LBUTTONDOWN:
+			SelectAndLoadFile();
+			break;
+		case WM_MBUTTONDOWN:
+			if (songs > 1)
+				OpenMenu(hWnd, hSongMenu);
+			break;
+		case WM_RBUTTONUP:
+			OpenMenu(hWnd, hTrayMenu);
+			break;
+		default:
+			break;
+		}
+		break;
+	case WM_COPYDATA:
+		pcds = (PCOPYDATASTRUCT) lParam;
+		if (pcds->dwData == 'O' && pcds->cbData <= sizeof(current_filename)) {
+			if (errorShown) {
+				HWND hChild = GetLastActivePopup(hWnd);
+				if (hChild != hWnd)
+					SendMessage(hChild, WM_CLOSE, 0, 0);
+			}
+			memcpy(current_filename, pcds->lpData, pcds->cbData);
+			LoadAndPlay(-1);
+		}
+		break;
+	default:
+		if (msg == taskbarCreatedMessage)
+			Shell_NotifyIcon(NIM_ADD, &nid);
+		return DefWindowProc(hWnd, msg, wParam, lParam);
+	}
+	return 0;
+}
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
+{
+	LPTSTR pb;
+	LPTSTR pe;
+	WNDCLASS wc;
+	HMENU hMainMenu;
+	MSG msg;
+
+	for (pb = lpCmdLine; *pb == ' ' || *pb == '\t'; pb++);
+	for (pe = pb; *pe != '\0'; pe++);
+	while (--pe > pb && (*pe == ' ' || *pe == '\t'));
+	/* Now pb and pe point at respectively the first and last non-blank
+	   character in lpCmdLine. If pb > pe then the command line is blank. */
+	if (*pb == '"' && *pe == '"')
+		pb++;
+	else
+		pe++;
+	*pe = '\0';
+	/* Now pb contains the filename, if any, specified on the command line. */
+
+	hWnd = FindWindow(WND_CLASS_NAME, NULL);
+	if (hWnd != NULL) {
+		/* an instance of WASAP is already running */
+		if (*pb != '\0') {
+			/* pass the filename */
+			COPYDATASTRUCT cds = { 'O', (DWORD) (pe + 1 - pb) * sizeof(_TCHAR), pb };
+			SendMessage(hWnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) &cds);
+		}
+		else {
+			SetForegroundWindow(hWnd);
+			PostMessage(hWnd, MYWM_NOTIFYICON, 15, WM_LBUTTONDOWN);
+		}
+		return 0;
+	}
+
+	asap = ASAP_New();
+	if (asap == NULL)
+		return 1;
+
+	hInst = hInstance;
+
+	wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
+	wc.lpfnWndProc = MainWndProc;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+	wc.hInstance = hInstance;
+	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APP));
+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1);
+	wc.lpszMenuName = NULL;
+	wc.lpszClassName = WND_CLASS_NAME;
+	RegisterClass(&wc);
+
+	hWnd = CreateWindow(WND_CLASS_NAME,
+		APP_TITLE,
+		WS_OVERLAPPEDWINDOW,
+		CW_USEDEFAULT,
+		CW_USEDEFAULT,
+		CW_USEDEFAULT,
+		CW_USEDEFAULT,
+		NULL,
+		NULL,
+		hInstance,
+		NULL
+	);
+
+	hStopIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_STOP));
+	hPlayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_PLAY));
+	hMainMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_TRAYMENU));
+	hTrayMenu = GetSubMenu(hMainMenu, 0);
+	hSongMenu = GetSubMenu(hTrayMenu, 1);
+	SetMenuDefaultItem(hTrayMenu, 0, TRUE);
+	nid.hWnd = hWnd;
+	nid.hIcon = hStopIcon;
+	Shell_NotifyIcon(NIM_ADD, &nid);
+	taskbarCreatedMessage = RegisterWindowMessage(_T("TaskbarCreated"));
+
+	if (*pb != '\0') {
+		memcpy(current_filename, pb, (pe + 1 - pb) * sizeof(_TCHAR));
+		LoadAndPlay(-1);
+	}
+	else
+		SelectAndLoadFile();
+
+	while (GetMessage(&msg, NULL, 0, 0)) {
+		if (infoDialog == NULL || !IsDialogMessage(infoDialog, &msg)) {
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+	}
+
+	WaveOut_Close();
+	Shell_NotifyIcon(NIM_DELETE, &nid);
+	DestroyMenu(hMainMenu);
+	return 0;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/wasap.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/wasap.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/wasap.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/wasap.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ * wasap.c - Another Slight Atari Player for Win32 systems
+ *
+ * Copyright (C) 2005-2010  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#define IDI_APP        101
+#define IDI_STOP       102
+#define IDI_PLAY       103
+#define IDR_TRAYMENU   200
+#define IDM_OPEN       201
+#define IDM_STOP       202
+#define IDM_FILE_INFO  203
+#define IDM_SAVE_WAV   204
+#define IDM_ABOUT      205
+#define IDM_EXIT       206
+#define IDM_SONG1      211
Binary files /tmp/tmpyaM5l1/AUpGL9bywb/kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/wasap/wasap.ico and /tmp/tmpyaM5l1/KBGCC02aAO/kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/wasap/wasap.ico differ
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/win32.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/win32.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/win32.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/win32.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,262 @@
+# MinGW for most ports
+WIN32_CC = $(DO)i686-w64-mingw32-gcc $(WIN32_CARGS) $(filter-out %.h,$^)
+WIN32_CXX = $(DO)i686-w64-mingw32-g++ $(WIN32_CARGS) -std=c++17 $(filter-out %.h %.hpp,$^)
+WIN32_WINDRES = $(DO)i686-w64-mingw32-windres -o $@ $<
+VLC_INCLUDE = ../vlc/include
+VLC_LIB32 = "C:/Program Files (x86)/VideoLAN/VLC"
+VLC_LIB64 = "C:/Program Files/VideoLAN/VLC"
+
+# Microsoft compiler for foobar2000
+FOOBAR2000_SDK_DIR = ../foobar2000_SDK
+WIN32_CL = $(WIN32_CLDO)cl -GR- -GS- -wd4996 -DNDEBUG $(WIN32_CLARGS) $(filter-out %.h,$^)
+WIN32_LINKOPT = -link -release
+WIN32_MKLIB = $(DO)lib -nologo -ltcg -out:$@ $^
+
+# MinGW x64
+WIN64_CC = $(DO)x86_64-w64-mingw32-gcc $(WIN32_CARGS) $(filter-out %.h,$^)
+WIN64_CXX = $(DO)x86_64-w64-mingw32-g++ $(WIN32_CARGS) -std=c++17 $(filter-out %.h %.hpp,$^)
+WIN64_WINDRES = $(DO)x86_64-w64-mingw32-windres -o $@ $<
+
+# Windows Installer XML
+CANDLE = $(DO)candle -nologo -o $@
+LIGHT = $(DO)light -nologo -o $@ -spdb
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "win32.mk")
+endif
+
+comma = ,
+WIN32_CARGS = -O2 -Wall -Wl,--nxcompat -o $@ $(if $(filter %.dll,$@),-shared -Wl$(comma)-subsystem$(comma)windows) $(INCLUDEOPTS) -static -s
+WIN32_CLDO = $(DO)$(if $(filter-out %.obj,$@),mkdir -p win32/obj/$@ && )
+WIN32_CLARGS = -nologo -O2 -GL -W3 $(if $(filter %.obj,$@),-c -Fo$@,-Fe$@ -Fowin32/obj/$@/) $(if $(filter %.dll,$@),-LD) $(INCLUDEOPTS)
+
+mingw: $(addprefix win32/,asapconv.exe libasap.a asapscan.exe wasap.exe bass_asap.dll in_asap.dll xmp-asap.dll apokeysnd.dll ASAPShellEx.dll)
+.PHONY: mingw
+
+# asapconv
+
+win32/asapconv.exe: $(call src,asapconv.c asap.[ch])
+	$(WIN32_CC) -DHAVE_LIBMP3LAME -DHAVE_LIBMP3LAME_DLL
+CLEAN += win32/asapconv.exe
+
+win32/asapconv-static-lame.exe: $(call src,asapconv.c asap.[ch])
+	$(WIN32_CC) -DHAVE_LIBMP3LAME -lmp3lame
+CLEAN += win32/asapconv-static-lame.exe
+
+win32/asapconv-no-lame.exe: $(call src,asapconv.c asap.[ch])
+	$(WIN32_CC)
+CLEAN += win32/asapconv-no-lame.exe
+
+win32/msvc/asapconv.exe: $(call src,asapconv.c asap.[ch])
+	$(WIN32_CL) -DHAVE_LIBMP3LAME -DHAVE_LIBMP3LAME_DLL
+CLEAN += win32/msvc/asapconv.exe
+
+win32/x64/asapconv.exe: $(call src,asapconv.c asap.[ch])
+	$(WIN64_CC)
+CLEAN += win32/x64/asapconv.exe
+
+# lib
+
+win32/libasap.a: win32/asap.o
+	$(DO_AR)
+CLEAN += win32/libasap.a
+
+win32/asap.o: $(call src,asap.[ch])
+	$(WIN32_CC) -c
+CLEAN += win32/asap.o
+
+win32/asap.lib: win32/asap.obj
+	$(WIN32_MKLIB)
+CLEAN += win32/asap.lib
+
+win32/asap.obj: $(call src,asap.[ch])
+	$(WIN32_CL)
+CLEAN += win32/asap.obj
+
+# SDL
+
+win32/asap-sdl.exe: $(call src,asap-sdl.c asap.[ch])
+	$(WIN32_CC) -lmingw32 -lSDLmain -lSDL
+CLEAN += win32/asap-sdl.exe
+
+# asapscan
+
+win32/asapscan.exe: $(srcdir)asapscan.c asap-asapscan.h
+	$(WIN32_CC)
+CLEAN += win32/asapscan.exe
+
+# sap2txt
+
+win32/sap2txt.exe: $(srcdir)sap2txt.c
+	$(WIN32_CC) -static -lz
+CLEAN += win32/sap2txt.exe
+
+# sap2ntsc
+
+win32/sap2ntsc.exe: $(call src,sap2ntsc.c asap.h) # FIXME: also asap.c, but we #include it and not link
+	$(WIN32_CC)
+CLEAN += win32/sap2ntsc.exe
+
+# WASAP
+
+win32/wasap.exe: $(call src,win32/wasap/wasap.[ch] asap.[ch] astil.[ch] win32/info_dlg.[ch]) win32/wasap/wasap-res.o
+	$(WIN32_CC) -Wl,-subsystem,windows -DWASAP -lcomctl32 -lcomdlg32 -lwinmm
+CLEAN += win32/wasap.exe
+
+win32/wasap/wasap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/wasap/wasap.h win32/wasap/wasap.ico win32/wasap/play.ico win32/wasap/stop.ico)
+	$(WIN32_WINDRES) -DWASAP
+CLEAN += win32/wasap/wasap-res.o
+
+win32/x64/wasap.exe: $(call src,win32/wasap/wasap.[ch] asap.[ch] astil.[ch] win32/info_dlg.[ch]) win32/x64/wasap-res.o
+	$(WIN64_CC) -Wl,-subsystem,windows -DWASAP -lcomctl32 -lcomdlg32 -lwinmm
+CLEAN += win32/x64/wasap.exe
+
+win32/x64/wasap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/wasap/wasap.h win32/wasap/wasap.ico win32/wasap/play.ico win32/wasap/stop.ico)
+	$(WIN64_WINDRES) -DWASAP
+CLEAN += win32/x64/wasap-res.o
+
+# VLC
+
+win32/libasap_plugin.dll: $(call src,vlc/libasap_plugin.c asap.[ch]) win32/libasap_plugin-res.o
+	$(WIN32_CC:-static=-static-libgcc) -I$(VLC_INCLUDE) -L$(VLC_LIB32) -lvlccore
+CLEAN += win32/libasap_plugin.dll
+
+win32/libasap_plugin-res.o: $(call src,win32/gui.rc asap.h)
+	$(WIN32_WINDRES) -DVLC
+CLEAN += win32/libasap_plugin-res.o
+
+win32/x64/libasap_plugin.dll: $(call src,vlc/libasap_plugin.c asap.[ch]) win32/x64/libasap_plugin-res.o
+	$(WIN64_CC:-static=-static-libgcc) -I$(VLC_INCLUDE) -L$(VLC_LIB64) -lvlccore
+CLEAN += win32/x64/libasap_plugin.dll
+
+win32/x64/libasap_plugin-res.o: $(call src,win32/gui.rc asap.h)
+	$(WIN64_WINDRES) -DVLC
+CLEAN += win32/x64/libasap_plugin-res.o
+
+# BASS
+
+win32/bass_asap.dll: $(call src,win32/bass/bass_asap.c asap.[ch] win32/bass/bass-addon.h win32/bass/bass.h win32/bass/bass.lib) win32/bass/bass_asap-res.o
+	$(WIN32_CC) -Wl,--kill-at -DBASS
+CLEAN += win32/bass_asap.dll
+
+win32/bass/bass_asap-res.o: $(call src,win32/gui.rc asap.h)
+	$(WIN32_WINDRES) -DBASS
+CLEAN += win32/bass/bass_asap-res.o
+
+# foobar2000
+
+FOOBAR2000_RUNTIME = win32/foobar2000/foobar2000_SDK.lib win32/foobar2000/pfc.lib $(FOOBAR2000_SDK_DIR)/foobar2000/shared/shared.lib
+
+win32/foo_asap.dll: $(call src,win32/foobar2000/foo_asap.cpp asap.[ch] astil.[ch] aatr-stdio.[ch] aatr.h win32/info_dlg.[ch] win32/settings_dlg.[ch]) win32/foobar2000/foo_asap.res $(FOOBAR2000_RUNTIME)
+	$(WIN32_CL) -DFOOBAR2000 -DWIN32 -EHsc -I$(FOOBAR2000_SDK_DIR) comctl32.lib comdlg32.lib ole32.lib shlwapi.lib user32.lib $(WIN32_LINKOPT)
+CLEAN += win32/foo_asap.dll win32/foo_asap.exp win32/foo_asap.lib
+
+win32/foobar2000/foobar2000_SDK.lib: $(patsubst %,win32/foobar2000/%.obj,component_client abort_callback audio_chunk audio_chunk_channel_config \
+	cfg_var console file_info file_info_impl file_info_merge filesystem filesystem_helper foosort guids input \
+	main_thread_callback metadb_handle metadb_handle_list playable_location playlist preferences_page replaygain_info service titleformat utility)
+	$(WIN32_MKLIB)
+CLEAN += win32/foobar2000/foobar2000_SDK.lib
+
+win32/foobar2000/component_client.obj: $(FOOBAR2000_SDK_DIR)/foobar2000/foobar2000_component_client/component_client.cpp
+	$(WIN32_CL) -DWIN32 -DUNICODE -EHsc
+
+win32/foobar2000/%.obj: $(FOOBAR2000_SDK_DIR)/foobar2000/SDK/%.cpp
+	$(WIN32_CL) -DWIN32 -DUNICODE -EHsc -D_WIN32_IE=0x550 -I$(FOOBAR2000_SDK_DIR)
+CLEAN += win32/foobar2000/*.obj
+
+win32/foobar2000/pfc.lib: $(patsubst %,win32/foobar2000/%.obj,audio_math audio_sample bit_array bsearch \
+	guid other pathUtils sort stringNew string_base string_conv threads timers utf8 win-objects)
+	$(WIN32_MKLIB)
+CLEAN += win32/foobar2000/pfc.lib
+
+win32/foobar2000/%.obj: $(FOOBAR2000_SDK_DIR)/pfc/%.cpp
+	$(WIN32_CL) -DWIN32 -DUNICODE -D_UNICODE -EHsc
+
+win32/foobar2000/foo_asap.res: $(call src,win32/gui.rc asap.h win32/settings_dlg.h)
+	$(WIN32_WINDRES) -DFOOBAR2000
+CLEAN += win32/foobar2000/foo_asap.res
+
+# Winamp
+
+win32/in_asap.dll: $(call src,win32/winamp/in_asap.c asap.[ch] astil.[ch] aatr-stdio.[ch] aatr.h win32/info_dlg.[ch] win32/settings_dlg.[ch] win32/winamp/in2.h win32/winamp/out.h win32/winamp/ipc_pe.h win32/winamp/wa_ipc.h) win32/winamp/in_asap-res.o
+	$(WIN32_CC) -DWINAMP -lcomctl32 -lcomdlg32
+CLEAN += win32/in_asap.dll
+
+win32/winamp/in_asap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/settings_dlg.h)
+	$(WIN32_WINDRES) -DWINAMP
+CLEAN += win32/winamp/in_asap-res.o
+
+# XMPlay
+
+win32/xmp-asap.dll: $(call src,win32/xmplay/xmp-asap.c asap.[ch] astil.[ch] win32/info_dlg.[ch] win32/settings_dlg.[ch] win32/xmplay/xmpin.h win32/xmplay/xmpfunc.h) win32/xmplay/xmp-asap-res.o
+	$(WIN32_CC) -Wl,--kill-at -DXMPLAY -lcomctl32 -lcomdlg32
+CLEAN += win32/xmp-asap.dll
+
+win32/xmplay/xmp-asap-res.o: $(call src,win32/gui.rc asap.h win32/info_dlg.h win32/settings_dlg.h)
+	$(WIN32_WINDRES) -DXMPLAY
+CLEAN += win32/xmplay/xmp-asap-res.o
+
+# Raster Music Tracker
+
+win32/apokeysnd.dll: $(call src,win32/rmt/apokeysnd_dll.c) win32/rmt/pokey.c win32/rmt/pokey.h win32/rmt/apokeysnd-res.o
+	$(WIN32_CC) --std=c99 -DAPOKEYSND
+CLEAN += win32/apokeysnd.dll
+
+win32/rmt/pokey.h: $(srcdir)pokey.ci | win32/rmt/pokey.c
+
+win32/rmt/pokey.c: $(srcdir)pokey.ci
+	$(CITO) -D APOKEYSND
+CLEAN += win32/rmt/pokey.c win32/rmt/pokey.h
+
+win32/rmt/apokeysnd-res.o: $(call src,win32/gui.rc asap.h)
+	$(WIN32_WINDRES) -DAPOKEYSND
+CLEAN += win32/rmt/apokeysnd-res.o
+
+# ASAPShellEx
+
+win32/ASAPShellEx.dll: $(srcdir)win32/shellex/ASAPShellEx.cpp win32/shellex/asap-infowriter.cpp win32/shellex/asap-infowriter.hpp win32/shellex/ASAPShellEx-res.o
+	$(WIN32_CXX) -Wl,--kill-at -lole32 -loleaut32 -lshlwapi -luuid
+CLEAN += win32/ASAPShellEx.dll
+
+win32/shellex/ASAPShellEx-res.o: $(call src,win32/gui.rc asap.h)
+	$(WIN32_WINDRES) -DSHELLEX
+CLEAN += win32/shellex/ASAPShellEx-res.o
+
+win32/x64/ASAPShellEx.dll: $(srcdir)win32/shellex/ASAPShellEx.cpp win32/shellex/asap-infowriter.cpp win32/shellex/asap-infowriter.hpp win32/x64/ASAPShellEx-res.o
+	$(WIN64_CXX) -Wl,--kill-at -lole32 -loleaut32 -lshlwapi -luuid
+CLEAN += win32/x64/ASAPShellEx.dll
+
+win32/x64/ASAPShellEx-res.o: $(call src,win32/gui.rc asap.h)
+	$(WIN64_WINDRES) -DSHELLEX
+CLEAN += win32/x64/ASAPShellEx-res.o
+
+win32/shellex/asap-infowriter.hpp: $(call src,asapinfo.ci asap6502.ci asapwriter.ci flashpack.ci) $(ASM6502_OBX) | win32/shellex/asap-infowriter.cpp
+
+win32/shellex/asap-infowriter.cpp: $(call src,asapinfo.ci asap6502.ci asapwriter.ci flashpack.ci) $(ASM6502_OBX)
+	$(CITO)
+CLEAN += win32/shellex/asap-infowriter.cpp win32/shellex/asap-infowriter.hpp
+
+# setups
+
+win32/setup: release/asap-$(VERSION)-win32.msi
+.PHONY: win32/setup
+
+release/asap-$(VERSION)-win32.msi: win32/setup/asap.wixobj \
+	$(call src,win32/wasap/wasap.ico win32/setup/license.rtf win32/setup/asap-banner.jpg win32/setup/asap-dialog.jpg win32/diff-sap.js win32/shellex/ASAPShellEx.propdesc) \
+	$(addprefix win32/,asapconv.exe sap2txt.exe wasap.exe in_asap.dll xmp-asap.dll bass_asap.dll apokeysnd.dll ASAPShellEx.dll foo_asap.dll libasap_plugin.dll)
+	$(LIGHT) -ext WixUIExtension -sice:ICE69 -b win32 -b release -b $(srcdir)win32/setup -b $(srcdir)win32 $<
+
+win32/setup/asap.wixobj: $(srcdir)win32/setup/asap.wxs release/release.mk
+	$(CANDLE) -dVERSION=$(VERSION) $<
+CLEAN += win32/setup/asap.wixobj
+
+release/asap-$(VERSION)-win64.msi: win32/x64/asap.wixobj \
+	$(call src,win32/wasap/wasap.ico win32/setup/license.rtf win32/setup/asap-banner.jpg win32/setup/asap-dialog.jpg win32/shellex/ASAPShellEx.propdesc) \
+	win32/x64/ASAPShellEx.dll win32/x64/libasap_plugin.dll
+	$(LIGHT) -ext WixUIExtension -sice:ICE69 -b win32 -b $(srcdir)/win32/setup -b $(srcdir)win32 $<
+
+win32/x64/asap.wixobj: $(srcdir)win32/setup/asap.wxs release/release.mk
+	$(CANDLE) -arch x64 -dVERSION=$(VERSION) $<
+CLEAN += win32/x64/asap.wixobj
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/in2.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/in2.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/in2.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/in2.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,103 @@
+#include "out.h"
+
+// note: exported symbol is now winampGetInModule2.
+
+#define IN_VER 0x100
+
+typedef struct 
+{
+	int version;				// module type (IN_VER)
+	char *description;			// description of module, with version string
+
+	HWND hMainWindow;			// winamp's main window (filled in by winamp)
+	HINSTANCE hDllInstance;		// DLL instance handle (Also filled in by winamp)
+
+	char *FileExtensions;		// "mp3\0Layer 3 MPEG\0mp2\0Layer 2 MPEG\0mpg\0Layer 1 MPEG\0"
+								// May be altered from Config, so the user can select what they want
+	
+	int is_seekable;			// is this stream seekable? 
+	int UsesOutputPlug;			// does this plug-in use the output plug-ins? (musn't ever change, ever :)
+
+	void (*Config)(HWND hwndParent); // configuration dialog
+	void (*About)(HWND hwndParent);  // about dialog
+
+	void (*Init)();				// called at program init
+	void (*Quit)();				// called at program quit
+
+	void (*GetFileInfo)(char *file, char *title, int *length_in_ms); // if file == NULL, current playing is used
+	int (*InfoBox)(char *file, HWND hwndParent);
+	
+	int (*IsOurFile)(char *fn);	// called before extension checks, to allow detection of mms://, etc
+	// playback stuff
+	int (*Play)(char *fn);		// return zero on success, -1 on file-not-found, some other value on other (stopping winamp) error
+	void (*Pause)();			// pause stream
+	void (*UnPause)();			// unpause stream
+	int (*IsPaused)();			// ispaused? return 1 if paused, 0 if not
+	void (*Stop)();				// stop (unload) stream
+
+	// time stuff
+	int (*GetLength)();			// get length in ms
+	int (*GetOutputTime)();		// returns current output time in ms. (usually returns outMod->GetOutputTime()
+	void (*SetOutputTime)(int time_in_ms);	// seeks to point in stream (in ms). Usually you signal yoru thread to seek, which seeks and calls outMod->Flush()..
+
+	// volume stuff
+	void (*SetVolume)(int volume);	// from 0 to 255.. usually just call outMod->SetVolume
+	void (*SetPan)(int pan);	// from -127 to 127.. usually just call outMod->SetPan
+	
+	// in-window builtin vis stuff
+
+	void (*SAVSAInit)(int maxlatency_in_ms, int srate);		// call once in Play(). maxlatency_in_ms should be the value returned from outMod->Open()
+	// call after opening audio device with max latency in ms and samplerate
+	void (*SAVSADeInit)();	// call in Stop()
+
+
+	// simple vis supplying mode
+	void (*SAAddPCMData)(void *PCMData, int nch, int bps, int timestamp); 
+											// sets the spec data directly from PCM data
+											// quick and easy way to get vis working :)
+											// needs at least 576 samples :)
+
+	// advanced vis supplying mode, only use if you're cool. Use SAAddPCMData for most stuff.
+	int (*SAGetMode)();		// gets csa (the current type (4=ws,2=osc,1=spec))
+							// use when calling SAAdd()
+	void (*SAAdd)(void *data, int timestamp, int csa); // sets the spec data, filled in by winamp
+
+
+	// vis stuff (plug-in)
+	// simple vis supplying mode
+	void (*VSAAddPCMData)(void *PCMData, int nch, int bps, int timestamp); // sets the vis data directly from PCM data
+											// quick and easy way to get vis working :)
+											// needs at least 576 samples :)
+
+	// advanced vis supplying mode, only use if you're cool. Use VSAAddPCMData for most stuff.
+	int (*VSAGetMode)(int *specNch, int *waveNch); // use to figure out what to give to VSAAdd
+	void (*VSAAdd)(void *data, int timestamp); // filled in by winamp, called by plug-in
+
+
+	// call this in Play() to tell the vis plug-ins the current output params. 
+	void (*VSASetInfo)(int nch, int srate);
+
+
+	// dsp plug-in processing: 
+	// (filled in by winamp, called by input plug)
+
+	// returns 1 if active (which means that the number of samples returned by dsp_dosamples
+	// could be greater than went in.. Use it to estimate if you'll have enough room in the
+	// output buffer
+	int (*dsp_isactive)(); 
+
+	// returns number of samples to output. This can be as much as twice numsamples. 
+	// be sure to allocate enough buffer for samples, then.
+	int (*dsp_dosamples)(short int *samples, int numsamples, int bps, int nch, int srate);
+
+
+	// eq stuff
+	void (*EQSet)(int on, char data[10], int preamp); // 0-64 each, 31 is +0, 0 is +12, 63 is -12. Do nothing to ignore.
+
+	// info setting (filled in by winamp)
+	void (*SetInfo)(int bitrate, int srate, int stereo, int synched); // if -1, changes ignored? :)
+
+	Out_Module *outMod; // filled in by winamp, optionally used :)
+} In_Module;
+
+
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/in_asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/in_asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/in_asap.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/in_asap.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,496 @@
+/*
+ * in_asap.c - ASAP plugin for Winamp
+ *
+ * Copyright (C) 2005-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <windows.h>
+#include <commctrl.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "in2.h"
+#include "ipc_pe.h"
+#include "wa_ipc.h"
+
+#include "aatr-stdio.h"
+#include "asap.h"
+#include "info_dlg.h"
+#include "settings_dlg.h"
+
+LPCTSTR atrFilenameHash(LPCTSTR filename);
+
+// Winamp's equalizer works only with 16-bit samples
+#define SUPPORT_EQUALIZER  1
+
+#define BITS_PER_SAMPLE    16
+// 576 is a magic number for Winamp, better do not modify it
+#define BUFFERED_BLOCKS    576
+
+static In_Module mod;
+
+// configuration
+#define INI_SECTION  "in_asap"
+static const char *ini_file;
+
+// current file
+ASAP *asap;
+static char playing_filename_with_song[MAX_PATH + 3] = "";
+static BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
+static int module_len;
+static int duration;
+
+static int playlistLength;
+
+static HANDLE thread_handle = NULL;
+static volatile bool thread_run = false;
+static bool paused = false;
+static int seek_needed;
+
+static ASAPInfo *title_info;
+static int title_song;
+
+static void writeIniInt(const char *name, int value)
+{
+	char str[16];
+	sprintf(str, "%d", value);
+	WritePrivateProfileString(INI_SECTION, name, str, ini_file);
+}
+
+void onUpdatePlayingInfo(void)
+{
+	writeIniInt("playing_info", playing_info);
+}
+
+static void config(HWND hwndParent)
+{
+	if (settingsDialog(mod.hDllInstance, hwndParent)) {
+		writeIniInt("song_length", song_length);
+		writeIniInt("silence_seconds", silence_seconds);
+		writeIniInt("play_loops", play_loops);
+		writeIniInt("mute_mask", mute_mask);
+	}
+}
+
+static void about(HWND hwndParent)
+{
+	MessageBox(hwndParent, ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT,
+		"About ASAP Winamp plugin " ASAPInfo_VERSION, MB_OK);
+}
+
+static int extractSongNumber(const char *s, char *filename)
+{
+	int i = strlen(s);
+	int song = -1;
+	if (i > 6 && s[i - 1] >= '0' && s[i - 1] <= '9') {
+		if (s[i - 2] == '#') {
+			song = s[i - 1] - '1';
+			i -= 2;
+		}
+		else if (s[i - 2] >= '0' && s[i - 2] <= '9' && s[i - 3] == '#') {
+			song = (s[i - 2] - '0') * 10 + s[i - 1] - '1';
+			i -= 3;
+		}
+	}
+	memcpy(filename, s, i);
+	filename[i] = '\0';
+	return song;
+}
+
+static BOOL isATR(const char *filename)
+{
+	size_t len = strlen(filename);
+	return len >= 4 && _stricmp(filename + len - 4, ".atr") == 0;
+}
+
+static void addFileSongs(HWND playlistWnd, fileinfo *fi, const ASAPInfo *info, int *index)
+{
+	char *p = fi->file + strlen(fi->file);
+	for (int song = 0; song < ASAPInfo_GetSongs(info); song++) {
+		sprintf(p, "#%d", song + 1);
+		fi->index = (*index)++;
+		COPYDATASTRUCT cds;
+		cds.dwData = IPC_PE_INSERTFILENAME;
+		cds.lpData = fi;
+		cds.cbData = sizeof(fileinfo);
+		SendMessage(playlistWnd, WM_COPYDATA, 0, (LPARAM) &cds);
+	}
+}
+
+static void expandFileSongs(HWND playlistWnd, int index, ASAPInfo *info)
+{
+	const char *fn = (const char *) SendMessage(mod.hMainWindow, WM_WA_IPC, index, IPC_GETPLAYLISTFILE);
+	fileinfo fi;
+	int song = extractSongNumber(fn, fi.file);
+	if (song >= 0)
+		return;
+	if (ASAPInfo_IsOurFile(fi.file)) {
+		if (loadModule(fi.file, module, &module_len)
+		 && ASAPInfo_Load(info, fi.file, module, module_len)) {
+			SendMessage(playlistWnd, WM_WA_IPC, IPC_PE_DELETEINDEX, index);
+			addFileSongs(playlistWnd, &fi, info, &index);
+		}
+	}
+	else if (isATR(fi.file)) {
+		AATR *disk = AATRStdio_New(fi.file);
+		if (disk != NULL) {
+			bool found = false;
+			AATRRecursiveLister *lister = AATRRecursiveLister_New();
+			if (lister != NULL) {
+				AATRFileStream *stream = AATRFileStream_New();
+				if (stream != NULL) {
+					size_t atr_fn_len = strlen(fi.file);
+					fi.file[atr_fn_len++] = '#';
+					AATRRecursiveLister_Open(lister, disk);
+					for (;;) {
+						const char *inside_fn = AATRRecursiveLister_NextFile(lister);
+						if (inside_fn == NULL)
+							break;
+						if (ASAPInfo_IsOurFile(inside_fn)) {
+							AATRFileStream_Open(stream, AATRRecursiveLister_GetDirectory(lister));
+							module_len = AATRFileStream_Read(stream, module, 0, sizeof(module));
+							if (ASAPInfo_Load(info, inside_fn, module, module_len)) {
+								size_t inside_fn_len = strlen(inside_fn);
+								if (atr_fn_len + inside_fn_len + 4 <= sizeof(fi.file)) {
+									memcpy(fi.file + atr_fn_len, inside_fn, inside_fn_len + 1);
+									if (!found) {
+										found = true;
+										SendMessage(playlistWnd, WM_WA_IPC, IPC_PE_DELETEINDEX, index);
+									}
+									addFileSongs(playlistWnd, &fi, info, &index);
+								}
+							}
+						}
+					}
+					AATRFileStream_Delete(stream);
+				}
+				AATRRecursiveLister_Delete(lister);
+			}
+			AATRStdio_Delete(disk);
+			/* Prevent Winamp crash:
+			   1. Play anything.
+			   2. Open an ATR with no songs.
+			   3. If the ATR deletes itself, Winamp crashes (tested with 5.581).
+			   Solution: leave the ATR on playlist. */
+			if (!found && SendMessage(mod.hMainWindow, WM_WA_IPC, 0, IPC_GETLISTLENGTH) > 1)
+				SendMessage(playlistWnd, WM_WA_IPC, IPC_PE_DELETEINDEX, index);
+		}
+	}
+}
+
+static INT_PTR CALLBACK progressDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	if (uMsg == WM_INITDIALOG)
+		SendDlgItemMessage(hDlg, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, playlistLength));
+	return FALSE;
+}
+
+static void expandPlaylistSongs(void)
+{
+	static bool processing = false;
+	if (processing)
+		return;
+	HWND playlistWnd = (HWND) SendMessage(mod.hMainWindow, WM_WA_IPC, IPC_GETWND_PE, IPC_GETWND);
+	if (playlistWnd == NULL)
+		return;
+	processing = true;
+	ASAPInfo *info = ASAPInfo_New();
+	playlistLength = SendMessage(mod.hMainWindow, WM_WA_IPC, 0, IPC_GETLISTLENGTH);
+	HWND progressWnd = CreateDialog(mod.hDllInstance, MAKEINTRESOURCE(IDD_PROGRESS), mod.hMainWindow, progressDialogProc);
+	int index = playlistLength;
+	while (--index >= 0) {
+		if ((index & 15) == 0)
+			SendDlgItemMessage(progressWnd, IDC_PROGRESS, PBM_SETPOS, playlistLength - index, 0);
+		expandFileSongs(playlistWnd, index, info);
+	}
+	DestroyWindow(progressWnd);
+	ASAPInfo_Delete(info);
+	processing = false;
+}
+
+static void init(void)
+{
+	asap = ASAP_New();
+	title_info = ASAPInfo_New();
+	ini_file = (const char *) SendMessage(mod.hMainWindow, WM_WA_IPC, 0, IPC_GETINIFILE);
+	song_length = GetPrivateProfileInt(INI_SECTION, "song_length", song_length, ini_file);
+	silence_seconds = GetPrivateProfileInt(INI_SECTION, "silence_seconds", silence_seconds, ini_file);
+	play_loops = GetPrivateProfileInt(INI_SECTION, "play_loops", play_loops, ini_file);
+	mute_mask = GetPrivateProfileInt(INI_SECTION, "mute_mask", mute_mask, ini_file);
+	playing_info = GetPrivateProfileInt(INI_SECTION, "playing_info", playing_info, ini_file);
+}
+
+static void quit(void)
+{
+	ASAP_Delete(asap);
+}
+
+static void getTitle(char *title)
+{
+	if (ASAPInfo_GetSongs(title_info) > 1)
+		sprintf(title, "%s (song %d)", ASAPInfo_GetTitleOrFilename(title_info), title_song + 1);
+	else
+		strcpy(title, ASAPInfo_GetTitleOrFilename(title_info));
+}
+
+static char *tagFunc(char *tag, void *p)
+{
+	if (stricmp(tag, "artist") == 0) {
+		const char *author = ASAPInfo_GetAuthor(title_info);
+		return author[0] != '\0' ? strdup(author) : NULL;
+	}
+	if (stricmp(tag, "title") == 0) {
+		char *title = malloc(strlen(ASAPInfo_GetTitleOrFilename(title_info)) + 11);
+		if (title != NULL)
+			getTitle(title);
+		return title;
+	}
+	return NULL;
+}
+
+static void tagFreeFunc(char *tag, void *p)
+{
+	free(tag);
+}
+
+static void getFileInfo(char *file, char *title, int *length_in_ms)
+{
+	if (file == NULL || file[0] == '\0')
+		file = playing_filename_with_song;
+	char filename[MAX_PATH];
+	title_song = extractSongNumber(file, filename);
+	if (title_song < 0)
+		expandPlaylistSongs();
+	if (!loadModule(filename, module, &module_len))
+		return;
+	const char *hash = atrFilenameHash(filename);
+	if (!ASAPInfo_Load(title_info, hash != NULL ? hash + 1 : filename, module, module_len))
+		return;
+	if (title_song < 0)
+		title_song = ASAPInfo_GetDefaultSong(title_info);
+	if (title != NULL) {
+		waFormatTitle fmt_title = {
+			NULL, NULL, title, 512, tagFunc, tagFreeFunc
+		};
+		getTitle(title); // in case IPC_FORMAT_TITLE doesn't work...
+		SendMessage(mod.hMainWindow, WM_WA_IPC, (WPARAM) &fmt_title, IPC_FORMAT_TITLE);
+	}
+	if (length_in_ms != NULL)
+		*length_in_ms = getSongDuration(title_info, title_song);
+}
+
+static int infoBox(char *file, HWND hwndParent)
+{
+	char filename[MAX_PATH];
+	int song = extractSongNumber(file, filename);
+	showInfoDialog(mod.hDllInstance, hwndParent, filename, song);
+	return 0;
+}
+
+static int isOurFile(char *fn)
+{
+	char filename[MAX_PATH];
+	extractSongNumber(fn, filename);
+	return ASAPInfo_IsOurFile(filename);
+}
+
+static DWORD WINAPI playThread(LPVOID dummy)
+{
+	int channels = ASAPInfo_GetChannels(ASAP_GetInfo(asap));
+	while (thread_run) {
+		static BYTE buffer[BUFFERED_BLOCKS * 2 * (BITS_PER_SAMPLE / 8)
+#if SUPPORT_EQUALIZER
+			* 2
+#endif
+			];
+		int buffered_bytes = BUFFERED_BLOCKS * channels * (BITS_PER_SAMPLE / 8);
+		if (seek_needed >= 0) {
+			mod.outMod->Flush(seek_needed);
+			ASAP_Seek(asap, seek_needed);
+			seek_needed = -1;
+		}
+		if (mod.outMod->CanWrite() >= buffered_bytes
+#if SUPPORT_EQUALIZER
+			<< mod.dsp_isactive()
+#endif
+		) {
+			buffered_bytes = ASAP_Generate(asap, buffer, buffered_bytes, BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
+			if (buffered_bytes <= 0) {
+				mod.outMod->CanWrite();
+				if (!mod.outMod->IsPlaying()) {
+					PostMessage(mod.hMainWindow, WM_WA_MPEG_EOF, 0, 0);
+					return 0;
+				}
+				Sleep(10);
+				continue;
+			}
+			int t = mod.outMod->GetWrittenTime();
+			mod.SAAddPCMData(buffer, channels, BITS_PER_SAMPLE, t);
+			mod.VSAAddPCMData(buffer, channels, BITS_PER_SAMPLE, t);
+#if SUPPORT_EQUALIZER
+			t = buffered_bytes / (channels * (BITS_PER_SAMPLE / 8));
+			t = mod.dsp_dosamples((short *) buffer, t, BITS_PER_SAMPLE, channels, ASAP_SAMPLE_RATE);
+			t *= channels * (BITS_PER_SAMPLE / 8);
+			mod.outMod->Write((char *) buffer, t);
+#else
+			mod.outMod->Write((char *) buffer, buffered_bytes);
+#endif
+		}
+		else
+			Sleep(20);
+	}
+	return 0;
+}
+
+static int play(char *fn)
+{
+	strcpy(playing_filename_with_song, fn);
+	char filename[MAX_PATH];
+	int song = extractSongNumber(fn, filename);
+	if (!loadModule(filename, module, &module_len))
+		return -1;
+	if (!ASAP_Load(asap, filename, module, module_len))
+		return 1;
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	if (song < 0)
+		song = ASAPInfo_GetDefaultSong(info);
+	duration = playSong(song);
+	int channels = ASAPInfo_GetChannels(info);
+	int maxlatency = mod.outMod->Open(ASAP_SAMPLE_RATE, channels, BITS_PER_SAMPLE, -1, -1);
+	if (maxlatency < 0)
+		return 1;
+	mod.SetInfo(BITS_PER_SAMPLE, ASAP_SAMPLE_RATE / 1000, channels, 1);
+	mod.SAVSAInit(maxlatency, ASAP_SAMPLE_RATE);
+	// the order of VSASetInfo's arguments in in2.h is wrong!
+	// http://forums.winamp.com/showthread.php?postid=1841035
+	mod.VSASetInfo(ASAP_SAMPLE_RATE, channels);
+	mod.outMod->SetVolume(-666);
+	seek_needed = -1;
+	thread_run = true;
+	DWORD threadId;
+	thread_handle = CreateThread(NULL, 0, playThread, NULL, 0, &threadId);
+	setPlayingSong(filename, song);
+	return thread_handle != NULL ? 0 : 1;
+}
+
+static void pause(void)
+{
+	paused = true;
+	mod.outMod->Pause(1);
+}
+
+static void unPause(void)
+{
+	paused = false;
+	mod.outMod->Pause(0);
+}
+
+static int isPaused(void)
+{
+	return paused;
+}
+
+static void stop(void)
+{
+	if (thread_handle != NULL) {
+		thread_run = false;
+		// wait max 10 seconds
+		if (WaitForSingleObject(thread_handle, 10 * 1000) == WAIT_TIMEOUT)
+			TerminateThread(thread_handle, 0);
+		CloseHandle(thread_handle);
+		thread_handle = NULL;
+	}
+	mod.outMod->Close();
+	mod.SAVSADeInit();
+}
+
+static int getLength(void)
+{
+	return duration;
+}
+
+static int getOutputTime(void)
+{
+	return mod.outMod->GetOutputTime();
+}
+
+static void setOutputTime(int time_in_ms)
+{
+	seek_needed = time_in_ms;
+}
+
+static void setVolume(int volume)
+{
+	mod.outMod->SetVolume(volume);
+}
+
+static void setPan(int pan)
+{
+	mod.outMod->SetPan(pan);
+}
+
+static void eqSet(int on, char data[10], int preamp)
+{
+}
+
+static In_Module mod = {
+	IN_VER,
+	"ASAP " ASAPInfo_VERSION,
+	0, 0, // filled by Winamp
+	"SAP\0Slight Atari Player (*.SAP)\0"
+	"CMC;CM3;CMR;CMS;DMC\0Chaos Music Composer (*.CMC;*.CM3;*.CMR;*.CMS;*.DMC)\0"
+	"DLT\0Delta Music Composer (*.DLT)\0"
+	"MPT;MPD\0Music ProTracker (*.MPT;*.MPD)\0"
+	"RMT\0Raster Music Tracker (*.RMT)\0"
+	"TMC;TM8\0Theta Music Composer 1.x (*.TMC;*.TM8)\0"
+	"TM2\0Theta Music Composer 2.x (*.TM2)\0"
+	"FC\0FutureComposer (*.FC)\0"
+	"ATR\0Atari 8-bit disk image (*.ATR)\0"
+	,
+	1,    // is_seekable
+	1,    // UsesOutputPlug
+	config,
+	about,
+	init,
+	quit,
+	getFileInfo,
+	infoBox,
+	isOurFile,
+	play,
+	pause,
+	unPause,
+	isPaused,
+	stop,
+	getLength,
+	getOutputTime,
+	setOutputTime,
+	setVolume,
+	setPan,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // filled by Winamp
+	eqSet,
+	NULL, // SetInfo
+	NULL  // filled by Winamp
+};
+
+__declspec(dllexport) In_Module *winampGetInModule2(void)
+{
+	return &mod;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/ipc_pe.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/ipc_pe.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/ipc_pe.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/ipc_pe.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef __IPC_PE_H
+#define __IPC_PE_H
+
+#define IPC_PE_GETCURINDEX        100 // returns current idx
+#define IPC_PE_GETINDEXTOTAL      101 // returns number of items 
+#define IPC_PE_GETINDEXINFO       102 // (copydata) lpData is of type callbackinfo, callback is called with copydata/fileinfo structure and msg IPC_PE_GETINDEXINFORESULT
+#define IPC_PE_GETINDEXINFORESULT 103 // callback message for IPC_PE_GETINDEXINFO
+#define IPC_PE_DELETEINDEX        104 // lParam = index
+#define IPC_PE_SWAPINDEX          105 // (lParam & 0xFFFF0000) >> 16 = from, (lParam & 0xFFFF) = to
+#define IPC_PE_INSERTFILENAME     106 // (copydata) lpData is of type fileinfo
+#define IPC_PE_GETDIRTY           107 // returns 1 if the playlist changed since the last IPC_PE_SETCLEAN
+#define IPC_PE_SETCLEAN	          108 // resets the dirty flag until next modification
+#define IPC_PE_GETIDXFROMPOINT    109 // pass a point parm, return a playlist index
+#define IPC_PE_SAVEEND            110 // pass index to save from
+#define IPC_PE_RESTOREEND         111 // no parm
+
+typedef struct {
+	char file[MAX_PATH];
+	int index;
+	} fileinfo;
+
+typedef struct {
+	HWND callback;
+	int index;
+	} callbackinfo;
+
+// the following messages are in_process ONLY
+
+#define IPC_PE_GETINDEXTITLE      200 // lParam = pointer to fileinfo2 struct
+
+typedef struct {
+  int fileindex;
+  char filetitle[256];
+  char filelength[16];
+  } fileinfo2;
+
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/out.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/out.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/out.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/out.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,52 @@
+#define OUT_VER 0x10
+
+typedef struct 
+{
+	int version;				// module version (OUT_VER)
+	char *description;			// description of module, with version string
+	int id;						// module id. each input module gets its own. non-nullsoft modules should
+								// be >= 65536. 
+
+	HWND hMainWindow;			// winamp's main window (filled in by winamp)
+	HINSTANCE hDllInstance;		// DLL instance handle (filled in by winamp)
+
+	void (*Config)(HWND hwndParent); // configuration dialog 
+	void (*About)(HWND hwndParent);  // about dialog
+
+	void (*Init)();				// called when loaded
+	void (*Quit)();				// called when unloaded
+
+	int (*Open)(int samplerate, int numchannels, int bitspersamp, int bufferlenms, int prebufferms); 
+					// returns >=0 on success, <0 on failure
+					// NOTENOTENOTE: bufferlenms and prebufferms are ignored in most if not all output plug-ins. 
+					//    ... so don't expect the max latency returned to be what you asked for.
+					// returns max latency in ms (0 for diskwriters, etc)
+					// bufferlenms and prebufferms must be in ms. 0 to use defaults. 
+					// prebufferms must be <= bufferlenms
+
+	void (*Close)();	// close the ol' output device.
+
+	int (*Write)(char *buf, int len);	
+					// 0 on success. Len == bytes to write (<= 8192 always). buf is straight audio data. 
+					// 1 returns not able to write (yet). Non-blocking, always.
+
+	int (*CanWrite)();	// returns number of bytes possible to write at a given time. 
+						// Never will decrease unless you call Write (or Close, heh)
+
+	int (*IsPlaying)(); // non0 if output is still going or if data in buffers waiting to be
+						// written (i.e. closing while IsPlaying() returns 1 would truncate the song
+
+	int (*Pause)(int pause); // returns previous pause state
+
+	void (*SetVolume)(int volume); // volume is 0-255
+	void (*SetPan)(int pan); // pan is -128 to 128
+
+	void (*Flush)(int t);	// flushes buffers and restarts output at time t (in ms) 
+							// (used for seeking)
+
+	int (*GetOutputTime)(); // returns played time in MS
+	int (*GetWrittenTime)(); // returns time written in MS (used for synching up vis stuff)
+
+} Out_Module;
+
+
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/wa_ipc.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/wa_ipc.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/winamp/wa_ipc.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/winamp/wa_ipc.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,1022 @@
+/*
+** Copyright (C) 2003 Nullsoft, Inc.
+**
+** This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held 
+** liable for any damages arising from the use of this software. 
+**
+** Permission is granted to anyone to use this software for any purpose, including commercial applications, and to 
+** alter it and redistribute it freely, subject to the following restrictions:
+**
+**   1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. 
+**      If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+**
+**   2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+**
+**   3. This notice may not be removed or altered from any source distribution.
+**
+*/
+
+#ifndef _WA_IPC_H_
+#define _WA_IPC_H_
+
+/*
+** This is the modern replacement for the classic 'frontend.h'. Most of these 
+** updates are designed for in-process use, i.e. from a plugin.
+**
+*/
+
+/* message used to sent many messages to winamp's main window. 
+** most all of the IPC_* messages involve sending the message in the form of:
+**   result = SendMessage(hwnd_winamp,WM_WA_IPC,(parameter),IPC_*);
+*/
+#define WM_WA_IPC WM_USER
+/* but some of them use WM_COPYDATA. be afraid.
+*/
+
+#define IPC_GETVERSION 0
+/* int version = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETVERSION);
+**
+** Version will be 0x20yx for winamp 2.yx. versions previous to Winamp 2.0
+** typically (but not always) use 0x1zyx for 1.zx versions. Weird, I know.
+*/
+
+#define IPC_GETREGISTEREDVERSION 770
+
+
+typedef struct {
+  char *filename;
+  char *title;
+  int length;
+} enqueueFileWithMetaStruct; // send this to a IPC_PLAYFILE in a non WM_COPYDATA, 
+// and you get the nice desired result. if title is NULL, it is treated as a "thing",
+// otherwise it's assumed to be a file (for speed)
+
+#define IPC_PLAYFILE 100  // dont be fooled, this is really the same as enqueufile
+#define IPC_ENQUEUEFILE 100 
+/* sent as a WM_COPYDATA, with IPC_PLAYFILE as the dwData, and the string to play
+** as the lpData. Just enqueues, does not clear the playlist or change the playback
+** state.
+*/
+
+
+#define IPC_DELETE 101
+#define IPC_DELETE_INT 1101 // don't use this, it's used internally by winamp when 
+                            // dealing with some lame explorer issues.
+/* SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_DELETE);
+** Use IPC_DELETE to clear Winamp's internal playlist.
+*/
+
+
+#define IPC_STARTPLAY 102   // starts playback. almost like hitting play in Winamp.
+#define IPC_STARTPLAY_INT 1102 // used internally, don't bother using it (won't be any fun)
+
+
+#define IPC_CHDIR 103
+/* sent as a WM_COPYDATA, with IPC_CHDIR as the dwData, and the directory to change to
+** as the lpData. 
+*/
+
+
+#define IPC_ISPLAYING 104
+/* int res = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_ISPLAYING);
+** If it returns 1, it is playing. if it returns 3, it is paused, 
+** if it returns 0, it is not playing.
+*/
+
+
+#define IPC_GETOUTPUTTIME 105
+/* int res = SendMessage(hwnd_winamp,WM_WA_IPC,mode,IPC_GETOUTPUTTIME);
+** returns the position in milliseconds of the current track (mode = 0), 
+** or the track length, in seconds (mode = 1). Returns -1 if not playing or error.
+*/
+
+
+#define IPC_JUMPTOTIME 106
+/* (requires Winamp 1.60+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,ms,IPC_JUMPTOTIME);
+** IPC_JUMPTOTIME sets the position in milliseconds of the 
+** current song (approximately).
+** Returns -1 if not playing, 1 on eof, or 0 if successful
+*/
+
+#define IPC_GETMODULENAME 109
+#define IPC_EX_ISRIGHTEXE 666
+/* usually shouldnt bother using these, but here goes:
+** send a WM_COPYDATA with IPC_GETMODULENAME, and an internal
+** flag gets set, which if you send a normal WM_WA_IPC message with
+** IPC_EX_ISRIGHTEXE, it returns whether or not that filename
+** matches. lame, I know.
+*/
+
+#define IPC_WRITEPLAYLIST 120
+/* (requires Winamp 1.666+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_WRITEPLAYLIST);
+**
+** IPC_WRITEPLAYLIST writes the current playlist to <winampdir>\\Winamp.m3u,
+** and returns the current playlist position.
+** Kinda obsoleted by some of the 2.x new stuff, but still good for when
+** using a front-end (instead of a plug-in)
+*/
+
+
+#define IPC_SETPLAYLISTPOS 121
+/* (requires Winamp 2.0+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,position,IPC_SETPLAYLISTPOS)
+** IPC_SETPLAYLISTPOS sets the playlist position to 'position'. It
+** does not change playback or anything, it just sets position, and
+** updates the view if necessary
+*/
+
+
+#define IPC_SETVOLUME 122
+/* (requires Winamp 2.0+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,volume,IPC_SETVOLUME);
+** IPC_SETVOLUME sets the volume of Winamp (from 0-255).
+*/
+
+
+#define IPC_SETPANNING 123
+/* (requires Winamp 2.0+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,panning,IPC_SETPANNING);
+** IPC_SETPANNING sets the panning of Winamp (from 0 (left) to 255 (right)).
+*/
+
+
+#define IPC_GETLISTLENGTH 124
+/* (requires Winamp 2.0+)
+** int length = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETLISTLENGTH);
+** IPC_GETLISTLENGTH returns the length of the current playlist, in
+** tracks.
+*/
+
+
+#define IPC_GETLISTPOS 125
+/* (requires Winamp 2.05+)
+** int pos=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETLISTPOS);
+** IPC_GETLISTPOS returns the playlist position. A lot like IPC_WRITEPLAYLIST
+** only faster since it doesn't have to write out the list. Heh, silly me.
+*/
+
+
+#define IPC_GETINFO 126
+/* (requires Winamp 2.05+)
+** int inf=SendMessage(hwnd_winamp,WM_WA_IPC,mode,IPC_GETINFO);
+** IPC_GETINFO returns info about the current playing song. The value
+** it returns depends on the value of 'mode'.
+** Mode      Meaning
+** ------------------
+** 0         Samplerate (i.e. 44100)
+** 1         Bitrate  (i.e. 128)
+** 2         Channels (i.e. 2)
+** 3 (5+)    Video LOWORD=w HIWORD=h
+** 4 (5+)    > 65536, string (video description)
+*/
+
+
+#define IPC_GETEQDATA 127
+/* (requires Winamp 2.05+)
+** int data=SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA);
+** IPC_GETEQDATA queries the status of the EQ. 
+** The value returned depends on what 'pos' is set to:
+** Value      Meaning
+** ------------------
+** 0-9        The 10 bands of EQ data. 0-63 (+20db - -20db)
+** 10         The preamp value. 0-63 (+20db - -20db)
+** 11         Enabled. zero if disabled, nonzero if enabled.
+** 12         Autoload. zero if disabled, nonzero if enabled.
+*/
+
+
+#define IPC_SETEQDATA 128
+/* (requires Winamp 2.05+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA);
+** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SETEQDATA);
+** IPC_SETEQDATA sets the value of the last position retrieved
+** by IPC_GETEQDATA. This is pretty lame, and we should provide
+** an extended version that lets you do a MAKELPARAM(pos,value).
+** someday...
+
+  new (2.92+): 
+    if the high byte is set to 0xDB, then the third byte specifies
+    which band, and the bottom word specifies the value.
+*/
+
+#define IPC_ADDBOOKMARK 129
+/* (requires Winamp 2.4+)
+** Sent as a WM_COPYDATA, using IPC_ADDBOOKMARK, adds the specified
+** file/url to the Winamp bookmark list.
+*/
+/*
+In winamp 5+, we use this as a normal WM_WA_IPC and the string:
+
+  "filename\0title\0"
+
+  to notify the library/bookmark editor that a bookmark
+was added. Note that using this message in this context does not
+actually add the bookmark.
+do not use :)
+*/
+
+
+#define IPC_INSTALLPLUGIN 130
+/* not implemented, but if it was you could do a WM_COPYDATA with 
+** a path to a .wpz, and it would install it.
+*/
+
+
+#define IPC_RESTARTWINAMP 135
+/* (requires Winamp 2.2+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_RESTARTWINAMP);
+** IPC_RESTARTWINAMP will restart Winamp (isn't that obvious ? :)
+*/
+
+
+#define IPC_ISFULLSTOP 400
+/* (requires winamp 2.7+ I think)
+** ret=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_ISFULLSTOP);
+** useful for when you're an output plugin, and you want to see
+** if the stop/close is a full stop, or just between tracks.
+** returns nonzero if it's full, zero if it's just a new track.
+*/
+
+
+#define IPC_INETAVAILABLE 242
+/* (requires Winamp 2.05+)
+** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_INETAVAILABLE);
+** IPC_INETAVAILABLE will return 1 if the Internet connection is available for Winamp.
+*/
+
+
+#define IPC_UPDTITLE 243
+/* (requires Winamp 2.2+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_UPDTITLE);
+** IPC_UPDTITLE will ask Winamp to update the informations about the current title.
+*/
+
+
+#define IPC_REFRESHPLCACHE 247
+/* (requires Winamp 2.2+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_REFRESHPLCACHE);
+** IPC_REFRESHPLCACHE will flush the playlist cache buffer.
+** (send this if you want it to go refetch titles for tracks)
+*/
+
+
+#define IPC_GET_SHUFFLE 250
+/* (requires Winamp 2.4+)
+** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GET_SHUFFLE);
+**
+** IPC_GET_SHUFFLE returns the status of the Shuffle option (1 if set)
+*/
+
+
+#define IPC_GET_REPEAT 251
+/* (requires Winamp 2.4+)
+** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GET_REPEAT);
+**
+** IPC_GET_REPEAT returns the status of the Repeat option (1 if set)
+*/
+
+
+#define IPC_SET_SHUFFLE 252
+/* (requires Winamp 2.4+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SET_SHUFFLE);
+**
+** IPC_SET_SHUFFLE sets the status of the Shuffle option (1 to turn it on)
+*/
+
+
+#define IPC_SET_REPEAT 253
+/* (requires Winamp 2.4+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SET_REPEAT);
+**
+** IPC_SET_REPEAT sets the status of the Repeat option (1 to turn it on)
+*/
+
+
+#define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable
+/* (requires Winamp 2.9+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,enable?0:0xdeadbeef,IPC_MBOPENREAL);
+** sending with 0xdeadbeef as the param disables all winamp windows, 
+** any other values will enable all winamp windows.
+*/
+
+
+#define IPC_GETWND 260
+/* (requires Winamp 2.9+)
+** HWND h=SendMessage(hwnd_winamp,WM_WA_IPC,IPC_GETWND_xxx,IPC_GETWND);
+** returns the HWND of the window specified.
+*/
+  #define IPC_GETWND_EQ 0 // use one of these for the param
+  #define IPC_GETWND_PE 1
+  #define IPC_GETWND_MB 2
+  #define IPC_GETWND_VIDEO 3
+#define IPC_ISWNDVISIBLE 261 // same param as IPC_GETWND
+
+
+
+
+/************************************************************************
+***************** in-process only (WE LOVE PLUGINS)
+************************************************************************/
+
+
+#define IPC_SETSKIN 200
+/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)"skinname",IPC_SETSKIN);
+** IPC_SETSKIN sets the current skin to "skinname". Note that skinname 
+** can be the name of a skin, a skin .zip file, with or without path. 
+** If path isn't specified, the default search path is the winamp skins 
+** directory.
+*/
+
+
+#define IPC_GETSKIN 201
+/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)skinname_buffer,IPC_GETSKIN);
+** IPC_GETSKIN puts the directory where skin bitmaps can be found 
+** into  skinname_buffer.
+** skinname_buffer must be MAX_PATH characters in length.
+** When using a .zip'd skin file, it'll return a temporary directory
+** where the ZIP was decompressed.
+*/
+
+
+#define IPC_EXECPLUG 202
+/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)"vis_file.dll",IPC_EXECPLUG);
+** IPC_EXECPLUG executes a visualization plug-in pointed to by WPARAM.
+** the format of this string can be:
+** "vis_whatever.dll"
+** "vis_whatever.dll,0" // (first mod, file in winamp plug-in dir)
+** "C:\\dir\\vis_whatever.dll,1" 
+*/
+
+
+#define IPC_GETPLAYLISTFILE 211
+/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
+** char *name=SendMessage(hwnd_winamp,WM_WA_IPC,index,IPC_GETPLAYLISTFILE);
+** IPC_GETPLAYLISTFILE gets the filename of the playlist entry [index].
+** returns a pointer to it. returns NULL on error.
+*/
+
+
+#define IPC_GETPLAYLISTTITLE 212
+/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
+** char *name=SendMessage(hwnd_winamp,WM_WA_IPC,index,IPC_GETPLAYLISTTITLE);
+**
+** IPC_GETPLAYLISTTITLE gets the title of the playlist entry [index].
+** returns a pointer to it. returns NULL on error.
+*/
+
+
+#define IPC_GETHTTPGETTER 240
+/* retrieves a function pointer to a HTTP retrieval function.
+** if this is unsupported, returns 1 or 0.
+** the function should be:
+** int (*httpRetrieveFile)(HWND hwnd, char *url, char *file, char *dlgtitle);
+** if you call this function, with a parent window, a URL, an output file, and a dialog title,
+** it will return 0 on successful download, 1 on error.
+*/
+
+
+#define IPC_MBOPEN 241
+/* (requires Winamp 2.05+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_MBOPEN);
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)url,IPC_MBOPEN);
+** IPC_MBOPEN will open a new URL in the minibrowser. if url is NULL, it will open the Minibrowser window.
+*/
+
+
+
+#define IPC_CHANGECURRENTFILE 245
+/* (requires Winamp 2.05+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)file,IPC_CHANGECURRENTFILE);
+** IPC_CHANGECURRENTFILE will set the current playlist item.
+*/
+
+
+#define IPC_GETMBURL 246
+/* (requires Winamp 2.2+)
+** char buffer[4096]; // Urls can be VERY long
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)buffer,IPC_GETMBURL);
+** IPC_GETMBURL will retrieve the current Minibrowser URL into buffer.
+** buffer must be at least 4096 bytes long.
+*/
+
+
+#define IPC_MBBLOCK 248
+/* (requires Winamp 2.4+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_MBBLOCK);
+**
+** IPC_MBBLOCK will block the Minibrowser from updates if value is set to 1
+*/
+
+#define IPC_MBOPENREAL 249
+/* (requires Winamp 2.4+)
+** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)url,IPC_MBOPENREAL);
+**
+** IPC_MBOPENREAL works the same as IPC_MBOPEN except that it will works even if 
+** IPC_MBBLOCK has been set to 1
+*/
+
+#define IPC_ADJUST_OPTIONSMENUPOS 280
+/* (requires Winamp 2.9+)
+** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_OPTIONSMENUPOS);
+** moves where winamp expects the Options menu in the main menu. Useful if you wish to insert a
+** menu item above the options/skins/vis menus.
+*/
+
+#define IPC_GET_HMENU 281
+/* (requires Winamp 2.9+)
+** HMENU hMenu=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)0,IPC_GET_HMENU);
+** values for data:
+** 0 : main popup menu 
+** 1 : main menubar file menu
+** 2 : main menubar options menu
+** 3 : main menubar windows menu
+** 4 : main menubar help menu
+** other values will return NULL.
+*/
+
+#define IPC_GET_EXTENDED_FILE_INFO 290 //pass a pointer to the following struct in wParam
+#define IPC_GET_EXTENDED_FILE_INFO_HOOKABLE 296
+/* (requires Winamp 2.9+)
+** to use, create an extendedFileInfoStruct, point the values filename and metadata to the
+** filename and metadata field you wish to query, and ret to a buffer, with retlen to the
+** length of that buffer, and then SendMessage(hwnd_winamp,WM_WA_IPC,&struct,IPC_GET_EXTENDED_FILE_INFO);
+** the results should be in the buffer pointed to by ret.
+** returns 1 if the decoder supports a getExtendedFileInfo method
+*/
+typedef struct {
+  char *filename;
+  char *metadata;
+  char *ret;
+  int retlen;
+} extendedFileInfoStruct;
+
+#define IPC_GET_BASIC_FILE_INFO 291 //pass a pointer to the following struct in wParam
+typedef struct {
+  char *filename;
+
+  int quickCheck; // set to 0 to always get, 1 for quick, 2 for default (if 2, quickCheck will be set to 0 if quick wasnot used)
+
+  // filled in by winamp
+  int length;
+  char *title;
+  int titlelen;
+} basicFileInfoStruct;
+
+#define IPC_GET_EXTLIST 292 //returns doublenull delimited. GlobalFree() it when done. if data is 0, returns raw extlist, if 1, returns something suitable for getopenfilename
+
+#define IPC_INFOBOX 293
+typedef struct {
+  HWND parent;
+  char *filename;
+} infoBoxParam;
+
+#define IPC_SET_EXTENDED_FILE_INFO 294 //pass a pointer to the a extendedFileInfoStruct in wParam
+/* (requires Winamp 2.9+)
+** to use, create an extendedFileInfoStruct, point the values filename and metadata to the
+** filename and metadata field you wish to write in ret. (retlen is not used). and then 
+** SendMessage(hwnd_winamp,WM_WA_IPC,&struct,IPC_SET_EXTENDED_FILE_INFO);
+** returns 1 if the metadata is supported
+** Call IPC_WRITE_EXTENDED_FILE_INFO once you're done setting all the metadata you want to update
+*/
+
+#define IPC_WRITE_EXTENDED_FILE_INFO 295 
+/* (requires Winamp 2.9+)
+** writes all the metadata set thru IPC_SET_EXTENDED_FILE_INFO to the file
+** returns 1 if the file has been successfully updated, 0 if error
+*/
+
+#define IPC_FORMAT_TITLE 297
+typedef struct 
+{
+  char *spec; // NULL=default winamp spec
+  void *p;
+
+  char *out;
+  int out_len;
+
+  char * (*TAGFUNC)(char * tag, void * p); //return 0 if not found
+  void (*TAGFREEFUNC)(char * tag,void * p);
+} waFormatTitle;
+
+#define IPC_GETUNCOMPRESSINTERFACE 331
+/* returns a function pointer to uncompress().
+** int (*uncompress)(unsigned char *dest, unsigned long *destLen, const unsigned char *source, unsigned long sourceLen);
+** right out of zlib, useful for decompressing zlibbed data.
+** if you pass the parm of 0x10100000, it will return a wa_inflate_struct * to an inflate API.
+*/
+
+typedef struct {
+  int (*inflateReset)(void *strm);
+  int (*inflateInit_)(void *strm,const char *version, int stream_size);
+  int (*inflate)(void *strm, int flush);
+  int (*inflateEnd)(void *strm);
+  unsigned long (*crc32)(unsigned long crc, const unsigned  char *buf, unsigned int len);
+} wa_inflate_struct;
+
+
+#define IPC_ADD_PREFS_DLG 332
+#define IPC_REMOVE_PREFS_DLG 333
+/* (requires Winamp 2.9+)
+** to use, allocate a prefsDlgRec structure (either on the heap or some global
+** data, but NOT on the stack), initialze the members:
+** hInst to the DLL instance where the resource is located
+** dlgID to the ID of the dialog,
+** proc to the window procedure for the dialog
+** name to the name of the prefs page in the prefs.
+** where to 0 (eventually we may add more options)
+** then, SendMessage(hwnd_winamp,WM_WA_IPC,&prefsRec,IPC_ADD_PREFS_DLG);
+**
+** you can also IPC_REMOVE_PREFS_DLG with the address of the same prefsRec,
+** but you shouldn't really ever have to.
+**
+*/
+#define IPC_OPENPREFSTOPAGE 380 // pass an id of a builtin page, or a &prefsDlgRec of prefs page to open
+
+typedef struct _prefsDlgRec {
+  HINSTANCE hInst;
+  int dlgID;
+  void *proc;
+
+  char *name;
+  int where; // 0 for options, 1 for plugins, 2 for skins, 3 for bookmarks, 4 for prefs
+
+
+  int _id;
+  struct _prefsDlgRec *next;
+} prefsDlgRec;
+
+
+#define IPC_GETINIFILE 334 // returns a pointer to winamp.ini
+#define IPC_GETINIDIRECTORY 335 // returns a pointer to the directory to put config files in (if you dont want to use winamp.ini)
+
+#define IPC_SPAWNBUTTONPOPUP 361 // param =
+// 0 = eject
+// 1 = previous
+// 2 = next
+// 3 = pause
+// 4 = play
+// 5 = stop
+
+#define IPC_OPENURLBOX 360 // pass a HWND to a parent, returns a HGLOBAL that needs to be freed with GlobalFree(), if successful
+#define IPC_OPENFILEBOX 362 // pass a HWND to a parent
+#define IPC_OPENDIRBOX 363 // pass a HWND to a parent
+
+// pass an HWND to a parent. call this if you take over the whole UI so that the dialogs are not appearing on the
+// bottom right of the screen since the main winamp window is at 3000x3000, call again with NULL to reset
+#define IPC_SETDIALOGBOXPARENT 364 
+
+
+
+// pass 0 for a copy of the skin HBITMAP
+// pass 1 for name of font to use for playlist editor likeness
+// pass 2 for font charset
+// pass 3 for font size
+#define IPC_GET_GENSKINBITMAP 503
+
+
+#define IPC_GET_EMBEDIF 505 // pass an embedWindowState
+// returns an HWND embedWindow(embedWindowState *); if the data is NULL, otherwise returns the HWND directly
+typedef struct
+{
+  HWND me; //hwnd of the window
+
+  int flags;
+
+  RECT r;
+
+  void *user_ptr; // for application use
+
+  int extra_data[64]; // for internal winamp use
+} embedWindowState;
+
+#define EMBED_FLAGS_NORESIZE 1 // set this bit in embedWindowState.flags to keep window from being resizable
+#define EMBED_FLAGS_NOTRANSPARENCY 2 // set this bit in embedWindowState.flags to make gen_ff turn transparency off for this wnd
+
+
+#define IPC_EMBED_ENUM 532
+typedef struct embedEnumStruct
+{
+  int (*enumProc)(embedWindowState *ws, struct embedEnumStruct *param); // return 1 to abort
+  int user_data; // or more :)
+} embedEnumStruct;
+  // pass 
+
+#define IPC_EMBED_ISVALID 533
+
+#define IPC_CONVERTFILE 506
+/* (requires Winamp 2.92+)
+** Converts a given file to a different format (PCM, MP3, etc...)
+** To use, pass a pointer to a waFileConvertStruct struct
+** This struct can be either on the heap or some global
+** data, but NOT on the stack. At least, until the conversion is done.
+**
+** eg: SendMessage(hwnd_winamp,WM_WA_IPC,&myConvertStruct,IPC_CONVERTFILE);
+**
+** Return value:
+** 0: Can't start the conversion. Look at myConvertStruct->error for details.
+** 1: Conversion started. Status messages will be sent to the specified callbackhwnd.
+**    Be sure to call IPC_CONVERTFILE_END when your callback window receives the
+**    IPC_CB_CONVERT_DONE message.
+*/
+typedef struct 
+{
+  char *sourcefile;  // "c:\\source.mp3"
+  char *destfile;    // "c:\\dest.pcm"
+  int destformat[8]; // like 'PCM ',srate,nch,bps
+  HWND callbackhwnd; // window that will receive the IPC_CB_CONVERT notification messages
+  
+  //filled in by winamp.exe
+  char *error;        //if IPC_CONVERTFILE returns 0, the reason will be here
+
+  int bytes_done;     //you can look at both of these values for speed statistics
+  int bytes_total;
+  int bytes_out;
+
+  int killswitch;     // don't set it manually, use IPC_CONVERTFILE_END
+  int extra_data[64]; // for internal winamp use
+} convertFileStruct;
+
+#define IPC_CONVERTFILE_END 507
+/* (requires Winamp 2.92+)
+** Stop/ends a convert process started from IPC_CONVERTFILE
+** You need to call this when you receive the IPC_CB_CONVERTDONE message or when you
+** want to abort a conversion process
+**
+** eg: SendMessage(hwnd_winamp,WM_WA_IPC,&myConvertStruct,IPC_CONVERTFILE_END);
+**
+** No return value
+*/
+
+typedef struct {
+  HWND hwndParent;
+  int format;
+
+  //filled in by winamp.exe
+  HWND hwndConfig;
+  int extra_data[8];
+} convertConfigStruct;
+#define IPC_CONVERT_CONFIG 508
+#define IPC_CONVERT_CONFIG_END 509
+
+typedef struct
+{
+  void (*enumProc)(int user_data, const char *desc, int fourcc);
+  int user_data;
+} converterEnumFmtStruct;
+#define IPC_CONVERT_CONFIG_ENUMFMTS 510
+/* (requires Winamp 2.92+)
+*/
+
+
+typedef struct
+{
+  char cdletter;
+  char *playlist_file;
+  HWND callback_hwnd;
+
+  //filled in by winamp.exe
+  char *error;
+} burnCDStruct;
+#define IPC_BURN_CD 511
+/* (requires Winamp 5.0+)
+*/
+
+typedef struct
+{
+  convertFileStruct *cfs;
+  int priority;
+} convertSetPriority;
+#define IPC_CONVERT_SET_PRIORITY 512
+
+typedef struct
+{
+  char *filename;
+  char *title; // 2048 bytes
+  int length;
+  int force_useformatting; // can set this to 1 if you want to force a url to use title formatting shit
+} waHookTitleStruct;
+// return TRUE if you hook this
+#define IPC_HOOK_TITLES 850
+
+#define IPC_GETSADATAFUNC 800 
+// 0: returns a char *export_sa_get() that returns 150 bytes of data
+// 1: returns a export_sa_setreq(int want);
+
+#define IPC_ISMAINWNDVISIBLE 900
+
+
+#define IPC_SETPLEDITCOLORS 920
+typedef struct
+{
+  int numElems;
+  int *elems;
+  HBITMAP bm; // set if you want to override
+} waSetPlColorsStruct;
+
+
+// the following IPC use waSpawnMenuParms as parameter
+#define IPC_SPAWNEQPRESETMENU 933
+#define IPC_SPAWNFILEMENU 934 //menubar
+#define IPC_SPAWNOPTIONSMENU 935 //menubar
+#define IPC_SPAWNWINDOWSMENU 936 //menubar
+#define IPC_SPAWNHELPMENU 937 //menubar
+#define IPC_SPAWNPLAYMENU 938 //menubar
+#define IPC_SPAWNPEFILEMENU 939 //menubar
+#define IPC_SPAWNPEPLAYLISTMENU 940 //menubar
+#define IPC_SPAWNPESORTMENU 941 //menubar
+#define IPC_SPAWNPEHELPMENU 942 //menubar
+#define IPC_SPAWNMLFILEMENU 943 //menubar
+#define IPC_SPAWNMLVIEWMENU 944 //menubar
+#define IPC_SPAWNMLHELPMENU 945 //menubar
+#define IPC_SPAWNPELISTOFPLAYLISTS 946
+
+typedef struct
+{
+  HWND wnd;
+  int xpos; // in screen coordinates
+  int ypos;
+} waSpawnMenuParms;
+
+// waSpawnMenuParms2 is used by the menubar submenus
+typedef struct
+{
+  HWND wnd;
+  int xpos; // in screen coordinates
+  int ypos;
+  int width;
+  int height;
+} waSpawnMenuParms2;
+
+
+// system tray sends this (you might want to simulate it)
+#define WM_WA_SYSTRAY WM_USER+1
+
+// input plugins send this when they are done playing back
+#define WM_WA_MPEG_EOF WM_USER+2
+
+
+
+//// video stuff
+
+#define IPC_IS_PLAYING_VIDEO 501 // returns >1 if playing, 0 if not, 1 if old version (so who knows):)
+#define IPC_GET_IVIDEOOUTPUT 500 // see below for IVideoOutput interface
+#define VIDEO_MAKETYPE(A,B,C,D) ((A) | ((B)<<8) | ((C)<<16) | ((D)<<24))
+#define VIDUSER_SET_INFOSTRING 0x1000
+#define VIDUSER_GET_VIDEOHWND  0x1001
+#define VIDUSER_SET_VFLIP      0x1002
+
+#ifndef NO_IVIDEO_DECLARE
+#ifdef __cplusplus
+
+class VideoOutput;
+class SubsItem;
+
+typedef	struct {
+	unsigned char*	baseAddr;
+	long			rowBytes;
+} YV12_PLANE;
+
+typedef	struct {
+	YV12_PLANE	y;
+	YV12_PLANE	u;
+	YV12_PLANE	v;
+} YV12_PLANES;
+
+class IVideoOutput
+{
+  public:
+    virtual ~IVideoOutput() { }
+    virtual int open(int w, int h, int vflip, double aspectratio, unsigned int fmt)=0;
+    virtual void setcallback(LRESULT (*msgcallback)(void *token, HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam), void *token) { }
+    virtual void close()=0;
+    virtual void draw(void *frame)=0;
+    virtual void drawSubtitle(SubsItem *item) { }
+    virtual void showStatusMsg(const char *text) { }
+    virtual int get_latency() { return 0; }
+    virtual void notifyBufferState(int bufferstate) { } /* 0-255*/
+
+    virtual int extended(int param1, int param2, int param3) { return 0; } // Dispatchable, eat this!
+};
+#endif //cplusplus
+#endif//NO_IVIDEO_DECLARE
+
+// these messages are callbacks that you can grab by subclassing the winamp window
+
+// wParam = 
+#define IPC_CB_WND_EQ 0 // use one of these for the param
+#define IPC_CB_WND_PE 1
+#define IPC_CB_WND_MB 2
+#define IPC_CB_WND_VIDEO 3
+#define IPC_CB_WND_MAIN 4
+
+#define IPC_CB_ONSHOWWND 600 
+#define IPC_CB_ONHIDEWND 601 
+
+#define IPC_CB_GETTOOLTIP 602
+
+#define IPC_CB_MISC 603
+    #define IPC_CB_MISC_TITLE 0
+    #define IPC_CB_MISC_VOLUME 1 // volume/pan
+    #define IPC_CB_MISC_STATUS 2
+    #define IPC_CB_MISC_EQ 3
+    #define IPC_CB_MISC_INFO 4
+    #define IPC_CB_MISC_VIDEOINFO 5
+
+#define IPC_CB_CONVERT_STATUS 604 // param value goes from 0 to 100 (percent)
+#define IPC_CB_CONVERT_DONE   605
+
+#define IPC_ADJUST_FFWINDOWSMENUPOS 606
+/* (requires Winamp 2.9+)
+** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS);
+** moves where winamp expects the freeform windows in the menubar windows main menu. Useful if you wish to insert a
+** menu item above extra freeform windows.
+*/
+
+#define IPC_ISDOUBLESIZE 608
+
+#define IPC_ADJUST_FFOPTIONSMENUPOS 609
+/* (requires Winamp 2.9+)
+** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS);
+** moves where winamp expects the freeform preferences item in the menubar windows main menu. Useful if you wish to insert a
+** menu item above preferences item.
+*/
+
+#define IPC_GETTIMEDISPLAYMODE 610 // returns 0 if displaying elapsed time or 1 if displaying remaining time
+
+#define IPC_SETVISWND 611 // param is hwnd, setting this allows you to receive ID_VIS_NEXT/PREVOUS/RANDOM/FS wm_commands
+#define ID_VIS_NEXT                     40382
+#define ID_VIS_PREV                     40383
+#define ID_VIS_RANDOM                   40384
+#define ID_VIS_FS                       40389
+#define ID_VIS_CFG                      40390
+#define ID_VIS_MENU                     40391
+
+#define IPC_GETVISWND 612 // returns the vis cmd handler hwnd
+#define IPC_ISVISRUNNING 613
+#define IPC_CB_VISRANDOM 628 // param is status of random
+
+#define IPC_SETIDEALVIDEOSIZE 614 // sent by winamp to winamp, trap it if you need it. width=HIWORD(param), height=LOWORD(param)
+
+#define IPC_GETSTOPONVIDEOCLOSE 615
+#define IPC_SETSTOPONVIDEOCLOSE 616
+
+typedef struct {
+  HWND hwnd;
+  int uMsg;
+  int wParam;
+  int lParam;
+} transAccelStruct;
+
+#define IPC_TRANSLATEACCELERATOR 617
+
+typedef struct {
+  int cmd;
+  int x;
+  int y;
+  int align;
+} windowCommand; // send this as param to an IPC_PLCMD, IPC_MBCMD, IPC_VIDCMD
+
+#define IPC_CB_ONTOGGLEAOT 618 
+
+#define IPC_GETPREFSWND 619
+
+#define IPC_SET_PE_WIDTHHEIGHT 620 // data is a pointer to a POINT structure that holds width & height
+
+#define IPC_GETLANGUAGEPACKINSTANCE 621
+
+#define IPC_CB_PEINFOTEXT 622 // data is a string, ie: "04:21/45:02"
+
+#define IPC_CB_OUTPUTCHANGED 623 // output plugin was changed in config
+
+#define IPC_GETOUTPUTPLUGIN 625
+
+#define IPC_SETDRAWBORDERS 626
+#define IPC_DISABLESKINCURSORS 627
+#define IPC_CB_RESETFONT 629
+
+#define IPC_IS_FULLSCREEN 630 // returns 1 if video or vis is in fullscreen mode
+#define IPC_SET_VIS_FS_FLAG 631 // a vis should send this message with 1/as param to notify winamp that it has gone to or has come back from fullscreen mode
+
+#define IPC_SHOW_NOTIFICATION 632
+
+#define IPC_GETSKININFO 633
+
+// >>>>>>>>>>> Next is 634
+
+#define IPC_PLCMD  1000 
+
+#define PLCMD_ADD  0
+#define PLCMD_REM  1
+#define PLCMD_SEL  2
+#define PLCMD_MISC 3
+#define PLCMD_LIST 4
+
+#define IPC_MBCMD  1001 
+
+#define MBCMD_BACK    0
+#define MBCMD_FORWARD 1
+#define MBCMD_STOP    2
+#define MBCMD_RELOAD  3
+#define MBCMD_MISC  4
+
+#define IPC_VIDCMD 1002 
+
+#define VIDCMD_FULLSCREEN 0
+#define VIDCMD_1X         1
+#define VIDCMD_2X         2
+#define VIDCMD_LIB        3
+#define VIDPOPUP_MISC     4
+
+#define IPC_MBURL       1003 //sets the URL
+#define IPC_MBGETCURURL 1004 //copies the current URL into wParam (have a 4096 buffer ready)
+#define IPC_MBGETDESC   1005 //copies the current URL description into wParam (have a 4096 buffer ready)
+#define IPC_MBCHECKLOCFILE 1006 //checks that the link file is up to date (otherwise updates it). wParam=parent HWND
+#define IPC_MBREFRESH   1007 //refreshes the "now playing" view in the library
+#define IPC_MBGETDEFURL 1008 //copies the default URL into wParam (have a 4096 buffer ready)
+
+#define IPC_STATS_LIBRARY_ITEMCNT 1300 // updates library count status
+
+// IPC 2000-3000 reserved for freeform messages, see gen_ff/ff_ipc.h
+#define IPC_FF_FIRST 2000
+#define IPC_FF_LAST  3000
+
+#define IPC_GETDROPTARGET 3001
+
+#define IPC_PLAYLIST_MODIFIED 3002 // sent to main wnd whenever the playlist is modified
+
+#define IPC_PLAYING_FILE 3003 // sent to main wnd with the file as parm whenever a file is played
+#define IPC_FILE_TAG_MAY_HAVE_UPDATED 3004 // sent to main wnd with the file as parm whenever a file tag might be updated
+
+
+#define IPC_ALLOW_PLAYTRACKING 3007
+// send nonzero to allow, zero to disallow
+
+#define IPC_HOOK_OKTOQUIT 3010 // return 0 to abort a quit, nonzero if quit is OK
+
+#define IPC_WRITECONFIG 3011 // pass 2 to write all, 1 to write playlist + common, 0 to write common+less common
+
+// pass a string to be the name to register, and returns a value > 65536, which is a unique value you can use
+// for custom WM_WA_IPC messages. 
+#define IPC_REGISTER_WINAMP_IPCMESSAGE 65536 
+
+/**************************************************************************/
+
+/*
+** Finally there are some WM_COMMAND messages that you can use to send 
+** Winamp misc commands.
+** 
+** To send these, use:
+**
+** SendMessage(hwnd_winamp, WM_COMMAND,command_name,0);
+*/
+
+#define WINAMP_OPTIONS_EQ               40036 // toggles the EQ window
+#define WINAMP_OPTIONS_PLEDIT           40040 // toggles the playlist window
+#define WINAMP_VOLUMEUP                 40058 // turns the volume up a little
+#define WINAMP_VOLUMEDOWN               40059 // turns the volume down a little
+#define WINAMP_FFWD5S                   40060 // fast forwards 5 seconds
+#define WINAMP_REW5S                    40061 // rewinds 5 seconds
+
+// the following are the five main control buttons, with optionally shift 
+// or control pressed
+// (for the exact functions of each, just try it out)
+#define WINAMP_BUTTON1                  40044
+#define WINAMP_BUTTON2                  40045
+#define WINAMP_BUTTON3                  40046
+#define WINAMP_BUTTON4                  40047
+#define WINAMP_BUTTON5                  40048
+#define WINAMP_BUTTON1_SHIFT            40144
+#define WINAMP_BUTTON2_SHIFT            40145
+#define WINAMP_BUTTON3_SHIFT            40146
+#define WINAMP_BUTTON4_SHIFT            40147
+#define WINAMP_BUTTON5_SHIFT            40148
+#define WINAMP_BUTTON1_CTRL             40154
+#define WINAMP_BUTTON2_CTRL             40155
+#define WINAMP_BUTTON3_CTRL             40156
+#define WINAMP_BUTTON4_CTRL             40157
+#define WINAMP_BUTTON5_CTRL             40158
+
+#define WINAMP_FILE_PLAY                40029 // pops up the load file(s) box
+#define WINAMP_FILE_DIR                 40187 // pops up the load directory box
+#define WINAMP_OPTIONS_PREFS            40012 // pops up the preferences
+#define WINAMP_OPTIONS_AOT              40019 // toggles always on top
+#define WINAMP_HELP_ABOUT               40041 // pops up the about box :)
+
+#define ID_MAIN_PLAY_AUDIOCD1           40323 // starts playing the audio CD in the first CD reader
+#define ID_MAIN_PLAY_AUDIOCD2           40323 // plays the 2nd
+#define ID_MAIN_PLAY_AUDIOCD3           40323 // plays the 3nd
+#define ID_MAIN_PLAY_AUDIOCD4           40323 // plays the 4nd
+
+// IDs 42000 to 45000 are reserved for gen_ff
+// IDs from 45000 to 57000 are reserved for library 
+
+#endif//_WA_IPC_H_
+
+/*
+** EOF.. Enjoy.
+*/
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/xmplay/xmp-asap.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/xmplay/xmp-asap.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/xmplay/xmp-asap.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/xmplay/xmp-asap.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,362 @@
+/*
+ * xmp-asap.c - ASAP plugin for XMPlay
+ *
+ * Copyright (C) 2010-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <stdio.h>
+
+#include "xmpin.h"
+
+#include "asap.h"
+#include "astil.h"
+#include "info_dlg.h"
+#include "settings_dlg.h"
+
+#define BITS_PER_SAMPLE  16
+
+static HINSTANCE hInst;
+static const XMPFUNC_MISC *xmpfmisc;
+static const XMPFUNC_REGISTRY *xmpfreg;
+static const XMPFUNC_FILE *xmpffile;
+static const XMPFUNC_IN *xmpfin;
+
+static BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
+static int module_len;
+ASAP *asap;
+
+static void GetBool(const char *key, bool *value)
+{
+	int i =*value;
+	xmpfreg->GetInt("ASAP", key, &i);
+	*value = i != 0;
+}
+
+static void SetBool(const char *key, bool value)
+{
+	int i = value;
+	xmpfreg->SetInt("ASAP", key, &i);
+}
+
+void onUpdatePlayingInfo(void)
+{
+	SetBool("PlayingInfo", playing_info);
+}
+
+static void WINAPI ASAP_ShowInfo()
+{
+	showInfoDialog(hInst, xmpfmisc->GetWindow(), NULL, -1);
+}
+
+static void WINAPI ASAP_About(HWND win)
+{
+	MessageBox(win, ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT,
+		"About ASAP XMPlay plugin " ASAPInfo_VERSION, MB_OK);
+}
+
+static void WINAPI ASAP_Config(HWND win)
+{
+	if (settingsDialog(hInst, win)) {
+		xmpfreg->SetInt("ASAP", "SongLength", &song_length);
+		xmpfreg->SetInt("ASAP", "SilenceSeconds", &silence_seconds);
+		SetBool("PlayLoops", play_loops);
+		xmpfreg->SetInt("ASAP", "MuteMask", &mute_mask);
+	}
+}
+
+static BOOL WINAPI ASAP_CheckFile(const char *filename, XMPFILE file)
+{
+	return ASAPInfo_IsOurFile(filename);
+}
+
+static void GetTag(const char *src, char **dest)
+{
+	if (src[0] == '\0')
+		return;
+	int len = strlen(src) + 1;
+	*dest = xmpfmisc->Alloc(len);
+	memcpy(*dest, src, len);
+}
+
+static void GetTags(const ASAPInfo *info, char *tags[8])
+{
+	GetTag(ASAPInfo_GetTitle(info), tags);
+	GetTag(ASAPInfo_GetAuthor(info), tags + 1);
+	GetTag(ASAPInfo_GetDate(info), tags + 3);
+	GetTag("ASAP", tags + 7);
+}
+
+static void GetTotalLength(const ASAPInfo *info, float *length)
+{
+	int total_duration = 0;
+	for (int song = 0; song < ASAPInfo_GetSongs(info); song++) {
+		int duration = getSongDuration(info, song);
+		if (duration < 0) {
+			*length = 0;
+			return;
+		}
+		total_duration += duration;
+	}
+	*length = total_duration / 1000.0;
+}
+
+static void PlaySong(int song)
+{
+	int duration = playSong(song);
+	if (duration >= 0)
+		xmpfin->SetLength(duration / 1000.0, TRUE);
+	setPlayingSong(NULL, song);
+}
+
+static BOOL WINAPI ASAP_GetFileInfo(const char *filename, XMPFILE file, float *length, char *tags[8])
+{
+	BYTE module[ASAPInfo_MAX_MODULE_LENGTH];
+	int module_len = xmpffile->Read(file, module, sizeof(module));
+	ASAPInfo *info = ASAPInfo_New();
+	if (info == NULL)
+		return FALSE;
+	if (!ASAPInfo_Load(info, filename, module, module_len)) {
+		ASAPInfo_Delete(info);
+		return FALSE;
+	}
+	if (length != NULL)
+		GetTotalLength(info, length);
+	GetTags(info, tags);
+	ASAPInfo_Delete(info);
+	return TRUE;
+}
+
+static DWORD WINAPI ASAP_Open(const char *filename, XMPFILE file)
+{
+	module_len = xmpffile->Read(file, module, sizeof(module));
+	if (!ASAP_Load(asap, filename, module, module_len))
+		return 0;
+	setPlayingSong(filename, 0);
+	PlaySong(0);
+	return 2; /* close file */
+}
+
+static void WINAPI ASAP_Close()
+{
+}
+
+static void WINAPI ASAP_SetFormat(XMPFORMAT *form)
+{
+	form->rate = ASAP_SAMPLE_RATE;
+	form->chan = ASAPInfo_GetChannels(ASAP_GetInfo(asap));
+	form->res = BITS_PER_SAMPLE / 8;
+}
+
+static BOOL WINAPI ASAP_GetTags(char *tags[8])
+{
+	GetTags(ASAP_GetInfo(asap), tags);
+	return TRUE;
+}
+
+static void WINAPI ASAP_GetInfoText(char *format, char *length)
+{
+	if (format != NULL)
+		strcpy(format, "ASAP");
+}
+
+static void WINAPI ASAP_GetGeneralInfo(char *buf)
+{
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	const char *s = ASAPInfo_GetDate(info);
+	if (s[0] != '\0')
+		buf += sprintf(buf, "Date\t%s\r", s);
+	s = ASAPInfo_GetOriginalModuleExt(info, module, module_len);
+	if (s != NULL)
+		buf += sprintf(buf, "Composed in\t%s\r", ASAPInfo_GetExtDescription(s));
+	*buf = '\0';
+}
+
+static char *appendStilString(char *p, const char *s)
+{
+	for (;;) {
+		char c = *s++;
+		switch (c) {
+		case '\0':
+			return p;
+		case '\n':
+			*p++ = '\r';
+			*p++ = '\n';
+			*p++ = '\t';
+			break;
+		default:
+			*p++ = c;
+			break;
+		}
+	}
+}
+
+static char *appendStil(char *p, const char *prefix, const char *value)
+{
+	if (value[0] != '\0') {
+		p = appendStilString(p, prefix);
+		*p++ = '\t';
+		p = appendStilString(p, value);
+		*p++ = '\r';
+		*p++ = '\n';
+	}
+	return p;
+}
+
+static void WINAPI ASAP_GetMessage(char *buf)
+{
+	const ASTIL *astil = getPlayingASTIL();
+	char *p = buf;
+	p = appendStil(p, "STIL file", ASTIL_GetStilFilename(astil));
+	p = appendStil(p, "Title", ASTIL_GetTitle(astil));
+	p = appendStil(p, "Author", ASTIL_GetAuthor(astil));
+	p = appendStil(p, "Directory comment", ASTIL_GetDirectoryComment(astil));
+	p = appendStil(p, "File comment", ASTIL_GetFileComment(astil));
+	p = appendStil(p, "Song comment", ASTIL_GetSongComment(astil));
+	for (int i = 0; ; i++) {
+		const ASTILCover *cover = ASTIL_GetCover(astil, i);
+		if (cover == NULL)
+			break;
+		int startSeconds = ASTILCover_GetStartSeconds(cover);
+		if (startSeconds >= 0) {
+			int endSeconds = ASTILCover_GetEndSeconds(cover);
+			if (endSeconds >= 0)
+				p += sprintf(p, "At %d:%02d-%d:%02d c", startSeconds / 60, startSeconds % 60, endSeconds / 60, endSeconds % 60);
+			else
+				p += sprintf(p, "At %d:%02d c", startSeconds / 60, startSeconds % 60);
+		}
+		else
+			*p++ = 'C';
+		const char *s = ASTILCover_GetTitleAndSource(cover);
+		p = appendStil(p, "overs", s[0] != '\0' ? s : "<?>");
+		p = appendStil(p, "by", ASTILCover_GetArtist(cover));
+		p = appendStil(p, "Comment", ASTILCover_GetComment(cover));
+	}
+	if (p > buf)
+		p[-2] = '\0'; /* chomp trailing \r\n */
+}
+
+static double WINAPI ASAP_SetPosition(DWORD pos)
+{
+	int song = pos - XMPIN_POS_SUBSONG;
+	if (song >= 0 && song < ASAPInfo_GetSongs(ASAP_GetInfo(asap))) {
+		PlaySong(song);
+		return 0;
+	}
+	// TODO: XMPIN_POS
+	ASAP_Seek(asap, pos);
+	return pos / 1000.0;
+}
+
+static double WINAPI ASAP_GetGranularity()
+{
+	return 0.001;
+}
+
+static DWORD WINAPI ASAP_Process(float *buf, DWORD count)
+{
+	/* Quick and dirty hack... Need to support floats directly... */
+	short *buf2 = (short *) buf;
+	DWORD n = ASAP_Generate(asap, (unsigned char *) buf2, count * sizeof(short), ASAPSampleFormat_S16_L_E) >> 1;
+	for (int i = n; --i >= 0; )
+		buf[i] = buf2[i] / 32767.0;
+	return n;
+}
+
+static void WINAPI ASAP_GetSamples(char *buf)
+{
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	int offset = ASAPInfo_GetInstrumentNamesOffset(info, module, module_len);
+	if (offset > 0) {
+		int i = 0;
+		buf += sprintf(buf, "instrument list:\r\n");
+		do {
+			const char *s = (const char *) module + offset;
+			buf += sprintf(buf, "%03d\t%s\r\n", i, s);
+			offset += strnlen(s, module_len - offset) + 1;
+		} while (offset < module_len);
+		buf[-2] = '\0'; /* chomp trailing \r\n */
+	}
+}
+
+static DWORD WINAPI ASAP_GetSubSongs(float *length)
+{
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	GetTotalLength(info, length);
+	return ASAPInfo_GetSongs(info);
+}
+
+__declspec(dllexport) XMPIN *WINAPI XMPIN_GetInterface(DWORD face, InterfaceProc faceproc)
+{
+	static XMPIN xmpin = {
+		0,
+		"ASAP",
+		"ASAP\0sap/cmc/cm3/cmr/cms/dmc/dlt/mpt/mpd/rmt/tmc/tm8/tm2/fc",
+		ASAP_About,
+		ASAP_Config,
+		ASAP_CheckFile,
+		ASAP_GetFileInfo,
+		ASAP_Open,
+		ASAP_Close,
+		NULL,
+		ASAP_SetFormat,
+		ASAP_GetTags,
+		ASAP_GetInfoText,
+		ASAP_GetGeneralInfo,
+		ASAP_GetMessage,
+		ASAP_SetPosition,
+		ASAP_GetGranularity,
+		NULL,
+		ASAP_Process,
+		NULL,
+		ASAP_GetSamples,
+		ASAP_GetSubSongs,
+		NULL,
+		NULL,
+		NULL, NULL, NULL, NULL, NULL, NULL, NULL
+	};
+	static const XMPSHORTCUT info_shortcut = {
+		0x10000, "ASAP - File information", ASAP_ShowInfo
+	};
+
+	if (face != XMPIN_FACE)
+		return NULL;
+
+	xmpfmisc = (const XMPFUNC_MISC *) faceproc(XMPFUNC_MISC_FACE);
+	xmpfreg = (const XMPFUNC_REGISTRY *) faceproc(XMPFUNC_REGISTRY_FACE);
+	xmpffile = (const XMPFUNC_FILE *) faceproc(XMPFUNC_FILE_FACE);
+	xmpfin = (const XMPFUNC_IN *) faceproc(XMPFUNC_IN_FACE);
+
+	asap = ASAP_New();
+
+	xmpfmisc->RegisterShortcut(&info_shortcut);
+	xmpfreg->GetInt("ASAP", "SongLength", &song_length);
+	xmpfreg->GetInt("ASAP", "SilenceSeconds", &silence_seconds);
+	GetBool("PlayLoops", &play_loops);
+	xmpfreg->GetInt("ASAP", "MuteMask", &mute_mask);
+	GetBool("PlayingInfo", &playing_info);
+	return &xmpin;
+}
+
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+{
+	if (dwReason == DLL_PROCESS_ATTACH)
+		hInst = hInstance;
+	return TRUE;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/xmplay/xmpfunc.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/xmplay/xmpfunc.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/xmplay/xmpfunc.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/xmplay/xmpfunc.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,134 @@
+// XMPlay plugin functions header (c) 2004-2007 Ian Luck
+
+#pragma once
+
+#include <wtypes.h>
+
+typedef unsigned __int64 QWORD;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Note all texts are UTF-8 on WinNT based systems, and ANSI on Win9x
+#define Utf2Uni(src,slen,dst,dlen) MultiByteToWideChar(CP_UTF8,0,src,slen,dst,dlen) // convert UTF-8 to Unicode
+
+typedef void *(WINAPI *InterfaceProc)(DWORD face); // XMPlay interface retrieval function received by plugin
+
+#define XMPFUNC_MISC_FACE		0 // miscellaneous functions (XMPFUNC_MISC)
+#define XMPFUNC_REGISTRY_FACE	1 // registry functions (XMPFUNC_REGISTRY)
+#define XMPFUNC_FILE_FACE		2 // file functions (XMPFUNC_FILE)
+#define XMPFUNC_TEXT_FACE		3 // text functions (XMPFUNC_TEXT)
+#define XMPFUNC_STATUS_FACE		4 // playback status functions (XMPFUNC_STATUS)
+
+#define XMPCONFIG_NET_BUFFER	0
+#define XMPCONFIG_NET_RESTRICT	1
+#define XMPCONFIG_NET_RECONNECT	2
+#define XMPCONFIG_NET_PROXY		3
+#define XMPCONFIG_NET_PROXYCONF	4
+#define XMPCONFIG_NET_TIMEOUT	5
+#define XMPCONFIG_NET_PREBUF	6
+
+#define XMPINFO_TEXT_GENERAL	0 // General info text
+#define XMPINFO_TEXT_MESSAGE	1 // Message info text
+#define XMPINFO_TEXT_SAMPLES	2 // Samples info text
+
+#define XMPINFO_REFRESH_MAIN	1 // main window info area
+#define XMPINFO_REFRESH_GENERAL	2 // General info window
+#define XMPINFO_REFRESH_MESSAGE	4 // Message info window
+#define XMPINFO_REFRESH_SAMPLES	8 // Samples info window
+
+typedef void *XMPFILE;
+
+#define XMPFILE_TYPE_MEMORY		0 // file in memory
+#define XMPFILE_TYPE_FILE		1 // local file
+#define XMPFILE_TYPE_NETFILE	2 // file on the 'net
+#define XMPFILE_TYPE_NETSTREAM	3 // 'net stream (unknown length)
+
+typedef struct {
+	DWORD id;				// must be unique and >=0x10000
+	const char *text;		// description
+	void (WINAPI *proc)();	// handler
+} XMPSHORTCUT;
+
+typedef struct {
+	DWORD rate;		// sample rate
+	DWORD chan;		// channels
+	DWORD res;		// bytes per sample (1=8-bit,2=16-bit,3=24-bit,4=float,0=undefined)
+} XMPFORMAT;
+
+typedef struct {
+	float time;		// cue position
+	const char *title;
+	const char *performer;
+} XMPCUE;
+
+typedef struct { // miscellaneous functions
+	DWORD (WINAPI *GetVersion)(); // get XMPlay version (eg. 0x03040001 = 3.4.0.1)
+	HWND (WINAPI *GetWindow)(); // get XMPlay window handle
+	void *(WINAPI *Alloc)(DWORD len); // allocate memory
+	void *(WINAPI *ReAlloc)(void *mem, DWORD len); // re-allocate memory
+	void (WINAPI *Free)(void *mem); // free allocated memory/text
+	BOOL (WINAPI *CheckCancel)(); // user wants to cancel?
+	DWORD (WINAPI *GetConfig)(DWORD option); // get a config (XMPCONFIG_xxx) value
+	const char *(WINAPI *GetSkinConfig)(const char *name); // get a skinconfig value
+	void (WINAPI *ShowBubble)(const char *text, DWORD time); // show a help bubble (time in ms, 0=default)
+	void (WINAPI *RefreshInfo)(DWORD mode); // refresh info displays (XMPINFO_REFRESH_xxx flags)
+	char *(WINAPI *GetInfoText)(DWORD mode); // get info window text (XMPINFO_TEXT_xxx)
+	char *(WINAPI *FormatInfoText)(char *buf, const char *name, const char *value); // format text for info window (tabs & new-lines)
+	char *(WINAPI *GetTag)(int tag); // get a current track's tag
+		//tags: 0=title,1=artist,2=album,3=year,4=track,5=genre,6=comment,7=filetype, -1=formatted title,-2=filename,-3=track/cue title
+	BOOL (WINAPI *RegisterShortcut)(const XMPSHORTCUT *cut); // add a shortcut
+	BOOL (WINAPI *PerformShortcut)(DWORD id); // perform a shortcut action
+// version 3.4.0.14
+	const XMPCUE *(WINAPI *GetCue)(DWORD cue); // get a cue entry (0=image, 1=1st track)
+} XMPFUNC_MISC;
+
+typedef struct { // "registry" functions
+	DWORD (WINAPI *Get)(const char *section, const char *key, void *data, DWORD size); // if data=NULL, required size is returned
+	DWORD (WINAPI *GetString)(const char *section, const char *key, char *data, DWORD size); // if data=NULL, required size is returned
+	BOOL (WINAPI *GetInt)(const char *section, const char *key, int *data);
+	BOOL (WINAPI *Set)(const char *section, const char *key, const void *data, DWORD size); // data=NULL = delete key
+	BOOL (WINAPI *SetString)(const char *section, const char *key, const char *data);
+	BOOL (WINAPI *SetInt)(const char *section, const char *key, const int *data);
+} XMPFUNC_REGISTRY;
+
+typedef struct { // file functions
+	XMPFILE (WINAPI *Open)(const char *filename); // open a file
+	XMPFILE (WINAPI *OpenMemory)(const void *buf, DWORD len); // open a file from memory
+	void (WINAPI *Close)(XMPFILE file); // close an opened file
+	DWORD (WINAPI *GetType)(XMPFILE file); // return XMPFILE_TYPE_xxx
+	DWORD (WINAPI *GetSize)(XMPFILE file); // file size
+	const char *(WINAPI *GetFilename)(XMPFILE file); // filename
+	const void *(WINAPI *GetMemory)(XMPFILE file); // memory location (XMPFILE_TYPE_MEMORY)
+	DWORD (WINAPI *Read)(XMPFILE file, void *buf, DWORD len); // read from file
+	BOOL (WINAPI *Seek)(XMPFILE file, DWORD pos); // seek in file
+	DWORD (WINAPI *Tell)(XMPFILE file); // get current file pos
+	// net-only stuff
+	void (WINAPI *NetSetRate)(XMPFILE file, DWORD rate); // set bitrate in bytes/sec (decides buffer size)
+	BOOL (WINAPI *NetIsActive)(XMPFILE file); // connection is still up?
+	BOOL (WINAPI *NetPreBuf)(XMPFILE file); // pre-buffer data
+	DWORD (WINAPI *NetAvailable)(XMPFILE file); // get amount of data ready to go
+
+	char *(WINAPI *ArchiveList)(XMPFILE file); // get archive contents (series of NULL-terminated entries)
+	XMPFILE (WINAPI *ArchiveExtract)(XMPFILE file, const char *entry, DWORD len); // decompress file from archive
+} XMPFUNC_FILE;
+
+typedef struct { // text functions - return new string in native form (UTF-8/ANSI)
+	char *(WINAPI *Ansi)(const char *text, int len); // ANSI string (len=-1=null terminated)
+	char *(WINAPI *Unicode)(const WCHAR *text, int len); // Unicode string
+	char *(WINAPI *Utf8)(const char *text, int len); // UTF-8 string
+} XMPFUNC_TEXT;
+
+typedef struct { // playback status functions
+	BOOL (WINAPI *IsPlaying)(); // playing?
+	double (WINAPI *GetTime)(); // track position in seconds
+	QWORD (WINAPI *GetWritten)(); // samples written to output
+	DWORD (WINAPI *GetLatency)(); // samples in output buffer
+	const XMPFORMAT *(WINAPI *GetFormat)(BOOL in); // get input/output sample format
+} XMPFUNC_STATUS;
+
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/xmplay/xmpin.h kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/xmplay/xmpin.h
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/win32/xmplay/xmpin.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/win32/xmplay/xmpin.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,86 @@
+// XMPlay input plugin header (c) 2004-2007 Ian Luck
+// new plugins can be submitted to plugins@xmplay.com
+
+#pragma once
+
+#include "xmpfunc.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef XMPIN_FACE
+#define XMPIN_FACE 3 // "face"
+#endif
+
+#define XMPIN_FLAG_CANSTREAM	1 // can stream files (play while downloading from the 'net)
+#define XMPIN_FLAG_OWNFILE		2 // can process files without "XMPFILE" routines
+#define XMPIN_FLAG_NOXMPFILE	4 // never use "XMPFILE" routines (implies XMPIN_FLAG_OWNFILE)
+#define XMPIN_FLAG_LOOP			8 // custom looping
+#define XMPIN_FLAG_TAIL			16 // output tail (decay/fadeout)
+
+// SetPosition special positions
+#define XMPIN_POS_LOOP			-1 // loop
+#define XMPIN_POS_AUTOLOOP		-2 // auto-loop
+#define XMPIN_POS_TAIL			-3 // output tail (decay/fadeout)
+#define XMPIN_POS_SUBSONG		0x80000000 // subsong (LOWORD=subsong)
+
+// VisRender/DC flags
+#define XMPIN_VIS_INIT			1 // DC/buffer is uninitialized
+#define XMPIN_VIS_FULL			2 // fullscreen
+
+typedef struct {
+	DWORD flags; // XMPIN_FLAG_xxx
+	const char *name; // plugin name
+	const char *exts; // supported file extensions (description\0ext1/ext2/etc...)
+
+	void (WINAPI *About)(HWND win); // (OPTIONAL)
+	void (WINAPI *Config)(HWND win); // present config options to user (OPTIONAL)
+	BOOL (WINAPI *CheckFile)(const char *filename, XMPFILE file); // verify file
+	BOOL (WINAPI *GetFileInfo)(const char *filename, XMPFILE file, float *length, char *tags[8]); // get track info
+		//tags: 0=title,1=artist,2=album,3=year,4=track,5=genre,6=comment,7=filetype
+
+	// playback stuff
+	DWORD (WINAPI *Open)(const char *filename, XMPFILE file); // open a file
+	void (WINAPI *Close)(); // close file
+	void *reserved;
+	void (WINAPI *SetFormat)(XMPFORMAT *form); // set sample format
+
+	BOOL (WINAPI *GetTags)(char *tags[8]); // get title elements, return TRUE to delay (OPTIONAL)
+	void (WINAPI *GetInfoText)(char *format, char *length); // get main panel info text
+	void (WINAPI *GetGeneralInfo)(char *buf); // get General info window text (buf is ~40K)
+	void (WINAPI *GetMessage)(char *buf); // get Message info text (OPTIONAL)
+	double (WINAPI *SetPosition)(DWORD pos); // seek
+	double (WINAPI *GetGranularity)(); // seeking granularity
+	DWORD (WINAPI *GetBuffering)(); // get buffering progress (OPTIONAL)
+	DWORD (WINAPI *Process)(float *buf, DWORD count); // decode some sample data
+	BOOL (WINAPI *WriteFile)(const char *filename); // write file to disk (OPTIONAL)
+
+	void (WINAPI *GetSamples)(char *buf); // get Samples info text (OPTIONAL)
+	DWORD (WINAPI *GetSubSongs)(float *length); // get number (and total length) of sub-songs (OPTIONAL)
+	char *(WINAPI *GetCues)(); // get CUE sheet (OPTIONAL)
+
+	float (WINAPI *GetDownloaded)(); // get download progress (OPTIONAL)
+
+	// vis stuff (all OPTIONAL)
+	const char *visname; // visualisation name
+	BOOL (WINAPI *VisOpen)(DWORD colors[3]); // initialize vis
+	void (WINAPI *VisClose)(); // close vis
+	void (WINAPI *VisSize)(HDC dc, SIZE *size); // get ideal vis dimensions
+	BOOL (WINAPI *VisRender)(DWORD *buf, SIZE size, DWORD flags); // render vis
+	BOOL (WINAPI *VisRenderDC)(HDC dc, SIZE size, DWORD flags); // render vis
+	void (WINAPI *VisButton)(DWORD x, DWORD y); // mouse click in vis
+} XMPIN;
+
+#define XMPFUNC_IN_FACE		11
+
+typedef struct {
+	void (WINAPI *SetLength)(float length, BOOL seekable); // set track length (-1=unchanged) and if it's seekable
+	void (WINAPI *SetGain)(DWORD mode, float gain); // set replaygain (mode 0=track, 1=album)
+	BOOL (WINAPI *UpdateTitle)(const char *track); // set track title (NULL=refresh tags/title)
+} XMPFUNC_IN;
+
+
+#ifdef __cplusplus
+}
+#endif
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/android.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/android.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/android.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/android.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,13 @@
+<page title="Android">
+	<img src="android.png" alt="Android application" style="float: right; margin-left: 3em;" />
+	<h2>Android application</h2>
+	<p>Download <download prefix="asap-" suffix="-android.apk" /> and install it manually.</p>
+	<p>The application has the <a href="http://asma.atari.org">ASMA</a> archive bundled.
+	On start it shows the whole archive contents, so you probably want to use the search button.
+	The navigation is to be improved in future releases!</p>
+	<p>Use the open button to play files from your device (memory card not supported yet, sorry).
+	ZIP archives and ATR disk images are supported.
+	M3U playlists are supported, but must be prepared on a computer
+	and transferred to the Android device.</p>
+	<div style="clear: right;" />
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/contact.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/contact.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/contact.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/contact.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,63 @@
+<page title="Contact">
+	<authors>
+		<author name="Piotr Fusik" email="fox@scene.pl" href="http://fusik.info/piotr/">Creator and lead developer.</author>
+		<author name="Atari800 Emulator Developers" href="https://atari800.github.io/">6502 and POKEY emulation used in 0.x.y versions of ASAP.</author>
+		<author name="Zdenek Eisenhammer" email="pg@pinknet.cz">Testing.</author>
+		<author name="Maciej Grzybek" email="grzybson@pigwa.net">Fixed an overflow in the Silverlight port.</author>
+		<author name="Jakub Husak" email="jakub.husak@gmail.com" href="http://husak.pl/">SAP fingerprint calculation. asapscan fixes.</author>
+		<author name="Henryk Karpowicz" email="henkar@poczta.tygrys.net">CMC routine modified for the CM3 format.</author>
+		<author name="Maciek Konecki" email="maciusk1@wp.pl">Porting to C#.</author>
+		<author name="Marek Konopka" email="konop11@poczta.onet.pl">6502 routine for playing DLT.</author>
+		<author name="Daniel Koźminski" email="daniel.kozminski@gmail.com">Ideas.</author>
+		<author name="Jerzy Kut" email="mono@atari.pl" href="http://mono.atari.pl/">FC format.</author>
+		<author name="Marcin Lewandowski" email="jaskier@atari8.info" href="http://jaskier.atari8.info/">6502 routines for playing CMC, MPT, TMC and TM2.</author>
+		<author name="Ian Luck" email="il@un4seen.com">Guided development of XMPlay and BASS plugins.</author>
+		<author name="MarOk" email="marok7@os.pl">CMS routine fix.</author>
+		<author name="Adrian Matoga" email="epi@atari8.info">COVOX information and test files. Testing. Porting to D.</author>
+		<author name="Perry McFarlane" email="perry_m@fastmail.fm">POKEY reverse-engineering.</author>
+		<author name="Kostas Nakos" email="knakos@gmail.com">Windows CE testing.</author>
+		<author name="Petri Pyy" email="laskipeto@gmail.com">macOS releases.</author>
+		<author name="Mariusz Rozwadowski" rip="true">Suggested CMS, CM3, DLT and STIL format support.</author>
+		<author name="Sławomir Śledz" email="slaves@scene.pl">Windows Mobile setup. Thorough testing.</author>
+		<author name="David Spilka">6502 routine for playing CMS.</author>
+		<author name="Radek Štěrba" rip="true">6502 routine for playing RMT. Testing.</author>
+		<author name="Łukasz Sychowicz" email="xray@scene.pl">Windows icons. Testing.</author>
+		<author name="Paweł Szewczyk" email="ripek@op.pl">Windows setup graphics.</author>
+		<author name="Michał Szpilowski" email="miker@atari.pl">Testing.</author>
+		<author name="Piotr Wiszowaty" email="piotr.wiszowaty@onet.pl">VLC 3 compatibility.</author>
+		<author name="Grzegorz Żyła" email="gsunr@poczta.onet.pl">XBMC plugin testing.</author>
+	</authors>
+
+	<h2>Feedback</h2>
+	<p>If you are interested in the ASAP project, please subscribe its
+	<a href="https://lists.sourceforge.net/lists/listinfo/asap-users">mailing list</a>.
+	This list is for users and developers.
+	Once you subscribe, you can post comments, ideas and questions about ASAP.
+	They will be answered ASAP. ;-)</p>
+	<p>Use <a href="http://sourceforge.net/p/asap/_list/tickets">tracker</a>
+	to submit bug reports, feature request and small code patches.</p>
+
+	<h2>For software developers</h2>
+	<p>Download the latest source release: <download prefix="asap-" suffix=".tar.gz" />
+	or <a href="https://sourceforge.net/p/asap/code/ci/master/tree/">browse Git repository</a>.</p>
+	<p>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 <a href="https://github.com/pfusik/cito">Ć</a>,
+	it is also available as pure C++, Java, C# and JavaScript.</p>
+
+	<h2>Third-party projects using ASAP</h2>
+	<p>The following projects already use ASAP:</p>
+	<ul>
+		<li><a href="http://mmsap.sourceforge.net/">mmSAP</a> - standalone player for GNU/Linux and Windows with GTK+ user interface</li>
+		<li><a href="http://www.rockbox.org/">Rockbox</a> - open source firmware for MP3 players</li>
+		<li><a href="http://bzrplayer.blazer.nu/">BZR Player</a> - player for Windows</li>
+		<li>Game Music Gear MX - player for PlayStation Portable</li>
+		<li><a href="http://yoyofr.blogspot.com/p/modizer.html">Modizer</a> - player for iPhone, iPod and iPad</li>
+		<li><a href="http://www.chipamp.org/">Chipamp</a> - bundle of plugins for Winamp</li>
+		<li><a href="http://atari-sounds.fatmagnus.ppa.pl/">Atari Sounds For The Masses</a> - GUI frontend to asapconv for macOS</li>
+		<li><a href="http://dangerousprototypes.com/forum/viewtopic.php?t=3944">Atari POKEY 8-bit Computer Sound on PIC32</a> - ASAP on a microcontroller</li>
+		<li><a href="http://mxplay.atari.org/">mxPlay</a> - audio player for Atari Falcon</li>
+		<li><a href="https://github.com/epi/enotracker">enotracker</a> - POKEY music editor for PC</li>
+		<li><a href="http://www.wothke.ch/webasap/">WebAsap</a> - HTML5/WebAudio port</li>
+	</ul>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/index.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/index.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/index.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/index.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,76 @@
+<page title="Home">
+	<p>ASAP is a player of <a href="http://en.wikipedia.org/wiki/Atari_8-bit_family">Atari 8-bit</a>
+	<a href="https://en.wikipedia.org/wiki/Chiptune">chiptunes</a> for modern computers and mobile devices.
+	It emulates the <a href="http://en.wikipedia.org/wiki/POKEY">POKEY sound chip</a>
+	and the <a href="http://en.wikipedia.org/wiki/6502">6502 processor</a>.
+	The project was initially based on the routines from the
+	<a href="https://atari800.github.io/">Atari800 emulator</a>,
+	but the current version has an original emulation core.</p>
+
+	<p>ASAP is available on <a href="android.html">Android</a>,
+	<a href="windows.html">Windows</a>, <a href="macos.html">macOS</a>,
+	<a href="linux.html">Linux</a> and <a href="web.html">modern web browsers</a>.</p>
+
+	<h2>Input formats</h2>
+	<p>ASAP supports the following file formats:</p>
+	<dl>
+		<dt>SAP (Slight Atari Player)</dt>
+		<dd>Designed for playing Atari 8-bit music on PCs.
+		All other formats can be converted to SAP.
+		<a href="http://asma.atari.org/">Atari SAP Music Archive (ASMA)</a>
+		is a single collection of over 5000 SAP files with over 200 hours of playback time.
+		For technical details of the format, see <a href="sap-format.html">SAP specification</a>.</dd>
+
+		<dt>CMC (Chaos Music Composer)</dt>
+		<dd>Atari music editor from early 1990s.</dd>
+
+		<dt>CM3 (CMC "3/4")</dt>
+		<dd>CMC with modified pattern length.</dd>
+
+		<dt>CMR (CMC "Rzog")</dt>
+		<dd>CMC with modified bass sounds.</dd>
+
+		<dt>CMS (Stereo Double CMC)</dt>
+		<dd>Stereo CMC.</dd>
+
+		<dt>DMC (DoublePlay CMC)</dt>
+		<dd>CMC with 6502 routine executed at double rate of the original CMC.</dd>
+
+		<dt>DLT (Delta Music Composer)</dt>
+		<dd>Atari music editor from 1990s.</dd>
+
+		<dt>FC (Future Composer)</dt>
+		<dd>Atari music editor from 1990s.</dd>
+
+		<dt>MPT (Music ProTracker)</dt>
+		<dd>Atari music editor from 1990s.</dd>
+
+		<dt>MPD (MPT DoublePlay)</dt>
+		<dd>MPT with 6502 routine executed at double rate of the original MPT.</dd>
+
+		<dt>RMT (<a href="http://raster.infos.cz/atari/rmt/rmt.htm">Raster Music Tracker</a>)</dt>
+		<dd>Modern Atari music editor running on Windows.</dd>
+
+		<dt>TMC, TM8 (<a href="http://jaskier.atari8.info/">Theta Music Composer</a> 1.x)</dt>
+		<dd>Atari music editor from late 1990s.
+		The two file extensions are treated identically and played in stereo.
+		TM8 means it's stereo (8-channel) music while TMC can be either mono or stereo.</dd>
+
+		<dt>TM2 (<a href="http://jaskier.atari8.info/">Theta Music Composer</a> 2.x)</dt>
+		<dd>Modern Atari music editor.</dd>
+
+		<dt>STIL (SAP Tune Information List)</dt>
+		<dd>This isn't a music format.
+		It's a text file that contains cover information and comments for many music files.
+		This format is identical to <a href="http://www.hvsc.de/download/C64Music/DOCUMENTS/STIL.faq">C64 STIL</a>.
+		<code>STIL.txt</code> is distributed with ASMA (see above).</dd>
+	</dl>
+
+	<p>You can find some test files in <a href="http://asap.sourceforge.net/examples.zip">examples.zip</a>.</p>
+
+	<p>For viewing Atari pictures, check out my other project <a href="http://recoil.sourceforge.net/">RECOIL</a>.</p>
+
+	<h2>License</h2>
+	<p>ASAP is free software, you can redistribute it and/or modify it under the terms
+	of the <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU General Public License</a>.</p>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/linux.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/linux.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/linux.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/linux.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,33 @@
+<page title="Linux">
+	<h2>VLC</h2>
+	<p>On Ubuntu, install <a href="http://www.videolan.org/vlc/">VLC</a>
+	via <code>apt</code>, not <code>snap</code>.
+	Then install the ASAP plugin: <download prefix="asap-vlc_" suffix="-1_amd64.deb" />.</p>
+	<p>On Fedora, <a href="https://www.videolan.org/vlc/download-fedora.html">install VLC from RPM Fusion</a>,
+	then install the 64-bit ASAP plugin: <download prefix="asap-vlc-" suffix="-1.x86_64.rpm" />
+	or the 32-bit plugin: <download prefix="asap-vlc-" suffix="-1.i686.rpm" />.</p>
+	<img src="vlc-ubuntu.png" alt="VLC on Ubuntu 18.04" />
+
+	<h2>XMMS</h2>
+	<p><a href="http://www.xmms.org/">XMMS</a> is included in Fedora.
+	Install the 64-bit ASAP plugin: <download prefix="asap-xmms-" suffix="-1.x86_64.rpm" />
+	or the 32-bit one: <download prefix="asap-xmms-" suffix="-1.i686.rpm" />.</p>
+	<img src="xmms-fedora.png" alt="XMMS on Fedora 29" />
+
+	<h2>Command-line converter</h2>
+	<p>For command-line conversions (e.g. to WAV or between SAP and the tracker formats)
+	and editing the metadata, install asapconv:</p>
+	<ul>
+		<li>on Ubuntu 64-bit: <download prefix="asap_" suffix="-1_amd64.deb" /></li>
+		<li>on Fedora 64-bit: <download prefix="asap-" suffix="-1.x86_64.rpm" /></li>
+		<li>on Fedora 32-bit: <download prefix="asap-" suffix="-1.i686.rpm" /></li>
+	</ul>
+	<p>Run <code>asapconv</code> from the shell to see the syntax.
+	The <code>-o/--output</code> option selects the output format and is mandatory.</p>
+
+	<h2>Other distros</h2>
+	<p>Download the source code <download prefix="asap-" suffix=".tar.gz" />.
+	Inside you will find instructions on how to build a VLC plugin,
+	a <a href="http://moc.daper.net/">MOC</a> plugin, an XMMS plugin
+	and a command-line converter asapconv.</p>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/macos.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/macos.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/macos.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/macos.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,22 @@
+<page title="macOS">
+	<h2>macOS</h2>
+	<p>Download <download prefix="asap-" suffix="-macos.dmg" />.</p>
+
+	<h2>VLC</h2>
+	<p><a href="http://www.videolan.org/vlc/">VLC</a> is a popular video player that plays audio as well.
+	It provides limited support for the SAP file format out of the box (no digitized sounds, buggy emulation).
+	For best experience, install the ASAP plugin as follows:</p>
+	<ol>
+		<li>Install VLC first.</li>
+		<li>Open <code>asap-<version />-macos.dmg</code>.</li>
+		<li>Drag <code>libasap_plugin.dylib</code> to <code>plugins</code>.</li>
+	</ol>
+	<p>Due to limitations of the VLC plugin interface, the VLC plugin only supports SAP and FC formats.</p>
+
+	<h2>asapconv</h2>
+	<p>For command-line conversions (e.g. to WAV or between SAP and the tracker formats)
+	and editing the metadata, install asapconv: open <code>asap-<version />-macos.dmg</code>
+	then drag <code>asapconv</code> to <code>bin</code>.</p>
+	<p>Run the program from the command prompt to see the syntax.
+	The <code>-o/--output</code> option selects the output format and is mandatory.</p>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/news.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/news.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/news.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/news.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,363 @@
+<page title="News">
+	<release version="5.0.1" date="2020-01-19">
+		<ul>
+			<li>Android: search by author.</li>
+			<li>Windows: some 5.0.0 plugins required <code>libgcc_s_dw2-1.dll</code> - fixed.</li>
+		</ul>
+	</release>
+
+	<release version="5.0.0" date="2019-11-21">
+		<ul>
+			<li>Upgraded the <a href="https://github.com/pfusik/cito">Ć programming language</a>.</li>
+			<li>Upgraded C code to C99.</li>
+		</ul>
+		<ul title="Android">
+			<li>Fixed app crashes.</li>
+			<li>Pause playback when another app plays.</li>
+			<li>No longer require phone state permission.</li>
+			<li>Request file permissions only when browsing files.</li>
+			<li>Ability to adjust volume before playback.</li>
+		</ul>
+	</release>
+
+	<release version="4.0.0" date="2019-01-10">
+		<ul>
+			<li>Removed ports: Windows 8, Windows Mobile, Windows Media Player, Java ME, Java applet, Silverlight, Flash Player, Adobe AIR, gstreamer, Audacious, XBMC, GSPlayer, Apollo.</li>
+			<li>Updated to AIMP 4, VLC 3, MOC 2.5.</li>
+			<li>Bundled ASMA in the Android app.</li>
+			<li>Fixed the file selector on new Androids.</li>
+			<li>Support MyDOS directories in ATRs.</li>
+			<li>Emulate interrupts of the extra POKEY.</li>
+			<li>Support high resolutions on Windows.</li>
+			<li>foobar2000 plays non-ASAP files (e.g. MOD) from ATRs.</li>
+			<li>asapconv released on macOS.</li>
+			<li>Extract from SAP and relocate a native module in one go.</li>
+			<li>Fixed a buffer overflow while extracting FC from SAP.</li>
+		</ul>
+	</release>
+
+	<release version="3.2.0" date="2014-06-23">
+		<ul>
+			<li>Reduced amplitude by a half to avoid clipping loud tunes.</li>
+			<li>Fixed silence detection for GTIA and COVOX sounds.</li>
+			<li>asapconv supports conversion to one WAV/RAW/MP3/XEX file per subsong.</li>
+			<li>File Information window in the foobar2000 plugin.</li>
+			<li>Updated the XBMC plugin for the new XBMC.</li>
+			<li>The VLC plugin no longer requires OS X 10.8.</li>
+		</ul>
+
+		<ul title="Android changes">
+			<li>Android 4.4 can now read the memory card.</li>
+			<li>Switch to the next song when the current one ends.</li>
+			<li>Fixed playback not resuming after a while of pause.</li>
+			<li>Search files using on-screen keyboard.</li>
+			<li>Removed HTTP playback.</li>
+			<li>Files with duplicate titles were lost in the details view.</li>
+		</ul>
+	</release>
+
+	<release version="3.1.6" date="2014-01-15">
+		<ul title="Android">
+			<li>Given access to the whole filesystem by always starting in the root directory.</li>
+			<li>Play files from ATR disk images.</li>
+			<li>Display the path in the file selector.</li>
+			<li>Dimmed the background wallpaper.</li>
+			<li>Modified file associations for compatibility with some file managers.</li>
+			<li>An option to move the installed application to a memory card.</li>
+		</ul>
+
+		<ul title="Other ports">
+			<li>foobar2000: fixed parallel conversion.</li>
+			<li>ATR: added support for MyDOS disk images larger than 256k.</li>
+			<li>Silverlight: fixed playback of songs longer than 3:34 (by Maciej "Grzybson" Grzybek).</li>
+			<li>CMS: fixed playback of blank patterns (by MarOk).</li>
+		</ul>
+	</release>
+
+	<release version="3.1.5" date="2013-08-17">
+		<ul>
+			<li>Android: fixed playback on Android 4.1+, disconnecting a headset pauses the playback,
+			update position and avoid "process not responding" during seek,
+			start in root directory if there's no memory card.</li>
+			<li>GStreamer plugin gets autoplugged (read: SAPs play in GStreamer-based players).</li>
+			<li>WASAP plays the music to its very end.</li>
+			<li>Fixed crash on malformed RMT files.</li>
+			<li>Restored Audacious 2.x compatibility.</li>
+			<li>DEB packages.</li>
+			<li>foobar2000 <code>*.fb2k-component</code> package.</li>
+		</ul>
+	</release>
+
+	<release version="3.1.4" date="2013-04-29">
+		<ul>
+			<li>Android: plays in background, can switch to the next/previous/random file,
+			opens M3U playlists, file selector can display metadata, "back" returns to parent directory.</li>
+			<li>WASAP fixed to avoid occasional deadlock when opening files during playback.</li>
+			<li>The VLC plugin compiled for OS X.</li>
+			<li>64-bit RPMs.</li>
+			<li>Fixed time detection for CMS.</li>
+			<li>Windows Explorer displays titles for RMT, TMC, TM2.</li>
+			<li>"Show information about the currently playing file" restored after Winamp/XMPlay restart.</li>
+			<li>TortoiseSVN and TortoiseGit plugins don't depend on libz-1.dll.</li>
+			<li>asapscan calculates SAP fingerprints (contributed by Jakub Husak).</li>
+			<li>Experimental ASAP2WAV in Perl.</li>
+		</ul>
+	</release>
+
+	<release version="3.1.3" date="2012-12-04">
+		<ul>
+			<li>The foobar2000 plugin plays files inside ATR disk images.</li>
+			<li>The VLC and AIMP 3 plugins support RMT and FC in addition to SAP.</li>
+			<li>The Audacious plugin can edit AUTHOR, NAME and year, upgraded to Audacious 3.3.</li>
+			<li>The GStreamer plugin handles TIME, AUTHOR, NAME, DATE and seek, compiled for Windows.</li>
+			<li>Fixed the JAD file for the Java midlet.</li>
+			<li>Created RPMs for VLC and GStreamer.</li>
+			<li>Experimental Windows 8 port.</li>
+		</ul>
+	</release>
+
+	<release version="3.1.2" date="2012-06-25">
+		<ul>
+			<li>Created a VLC plugin (SAP format only).</li>
+			<li>The JavaScript player now works in Chrome, Firefox, Internet Explorer 9 and 6,
+			using <a href="https://github.com/grantgalitz/XAudioJS">XAudioJS</a>.</li>
+			<li>Flash Player, Java applet, Silverlight and JavaScript players were put in a single "web" package.</li>
+			<li>UTF-8 encoding is supported for STIL.</li>
+			<li>Author is no longer hidden in the converted XEX files.</li>
+			<li>The Winamp plugin opens ATR disk images and plays files inside them.</li>
+			<li>The Audacious plugin updated to Audacious 3.2 and compiled for Windows.</li>
+			<li>The BASS add-on made compatible with AIMP 3 (SAP format only).</li>
+			<li>Enabled title/author/year in the BASS add-on (only selected BASS-based players use it,
+			for example <a href="http://sourceforge.net/projects/encorebassing/">EncoreBassing</a>).</li>
+			<li>The Windows Media Player codec supports subsongs, AUTHOR and NAME
+			(this works at least with Media Player Classic Home Cinema).</li>
+			<li>Extended and unified the JavaScript interface of the web players.</li>
+			<li>New TortoiseSVN and TortoiseGit plugins show changes in SAP tags.</li>
+		</ul>
+	</release>
+
+	<release version="3.1.1" date="2011-10-26">
+		<ul>
+			<li>Converted XEX files may optionally display information.</li>
+			<li>Fixed conversion of some TYPE D SAP files (e.g. Saturday_Demo.sap) to XEX.</li>
+			<li>Fixed time detection for some FC files.</li>
+		</ul>
+	</release>
+
+	<release version="3.1.0" date="2011-09-24">
+		<ul>
+			<li>The WASAP/Winamp/Apollo/XMPlay file information window now includes STIL
+			(SAP Tune Information List) and technical data.</li>
+			<li>Added Future Composer (*.fc) format (contributed by Jerzy Kut).</li>
+			<li>Written <a href="http://asap.sourceforge.net/sap-format.html">specification of the SAP format</a>.</li>
+			<li>XMPlay displays STIL, tracker name and RMT instrument names.</li>
+			<li>The 64-bit setup package now includes the Windows Media Player plugin (useful for the Vista/7
+			<a href="http://gallery.live.com/liveItemDetail.aspx?li=3af0c591-260b-4721-b28f-fa0f1d929760">sidebar WMP gadget</a>).</li>
+			<li>The Java release now includes <code>asap.jar</code> for <a href="http://wudsn.com">WUDSN IDE</a>.</li>
+			<li>asapplay in the D programming language ported to Linux and 64-bit compilers (by Adrian Matoga).</li>
+		</ul>
+	</release>
+
+	<release version="3.0.1" date="2011-07-15">
+		<ul>
+			<li>Use linear interpolation for resampling (try Toxic_Cream.sap).</li>
+			<li>Display titles of RMT, TMC and TM2 files.</li>
+			<li>The GSPlayer plugin now works in new Windows Mobile versions.</li>
+			<li>The Android player can play files directly from ZIP archives.</li>
+			<li>asapconv can auto-detect the native format (<code>asapconv -o .%e *.sap</code>).</li>
+			<li>asapconv can relocate modules (<code>asapconv --address=a000 -o relocated.tmc original.tmc</code>).</li>
+			<li>asapconv can write metadata to WAV files.</li>
+			<li>Created an experimental plugin for GStreamer (requires GStreamer with
+			<a href="https://bugzilla.gnome.org/show_bug.cgi?id=654295">this bug</a> fixed - that is, 0.10.36 or newer).</li>
+			<li>Converted XEX files disable the built-in BASIC.</li>
+			<li>Converted XEX files clear the I flag for the TYPE D PLAYER routine.</li>
+			<li>Doublequotes and pipes are now allowed characters in the AUTHOR and NAME tags.</li>
+		</ul>
+	</release>
+
+	<release version="3.0.0" date="2011-05-24">
+		<ul title="New ports">
+			<li>Created a desktop player for <a href="http://www.adobe.com/products/air/">Adobe AIR</a>.</li>
+			<li>Ported the Windows Media Player plugin to Windows CE.</li>
+			<li>Created a setup package with the Windows Explorer plugin for 64-bit Windows.</li>
+			<li>The Audacious plugin supports Audacious 2.5.</li>
+			<li>Created RPM packages with asapconv, ASAP C library and the XMMS plugin.</li>
+			<li>Created ASAP2WAV and a simple player in the D programming language.</li>
+			<li>JavaScript ASAP2WAV now runs in DMDScript and JScript.NET.</li>
+		</ul>
+		<ul title="Emulation accuracy">
+			<li>Corrected ANTIC and POKEY timings.</li>
+			<li>Implemented STIMER, NMIST and NMIRES hardware registers.</li>
+			<li>Made the CONSOL register readable.</li>
+			<li>Fixed and optimized the undocumented 6502 instructions.</li>
+		</ul>
+		<ul title="Usability improvements">
+			<li>Conversion to Atari executables (XEX format, also known as COM).</li>
+			<li>RMT files can be extracted from SAP files created in Raster Music Tracker.</li>
+			<li>Implemented subsongs, seek bar and pause in the Android port.</li>
+			<li>Added a date picker in the WASAP/Winamp/Apollo/XMPlay file information window.</li>
+			<li>The FASTPLAY tag can be up to 32767 (previously 312).</li>
+			<li>Browser JavaScript player works on <code>file://</code> URLs.</li>
+			<li>asapscan uses a much faster length detection algorithm.</li>
+		</ul>
+		<ul title="Bug fixes">
+			<li>Many important fixes in the Audacious plugin.</li>
+			<li>Many fixes in the Android port.</li>
+		</ul>
+		<ul title="Cleanup">
+			<li>Rewritten the ASAP core in the <a href="http://cito.sourceforge.net">Ć programming language</a>.</li>
+			<li>Removed <code>defaultPlaybackTime</code> and <code>loopPlaybackTime</code> parameters
+			from the applet, Flash Player and Silverlight interfaces.</li>
+		</ul>
+	</release>
+
+	<release version="2.1.2" date="2010-11-03">
+		<ul>
+			<li>New ports: Android, Audacious plugin, Silverlight and a simple command-line player using SDL.</li>
+			<li>WASAP ported to Windows CE.</li>
+			<li>Created a CAB package for Windows CE.</li>
+			<li>WASAP opens the file selector when re-run.</li>
+			<li>JavaScript ASAP2WAV now works in Rhino Shell, Google V8 shell, JScript.NET and JaegerMonkey.</li>
+			<li>A slight fix and an optimization in 6502 emulation.</li>
+			<li>"Show information about the currently playing file" now available in XMPlay and fixed in Winamp.</li>
+		</ul>
+	</release>
+
+	<release version="2.1.1" date="2010-05-05">
+		<ul>
+			<li>NTSC tag in SAP files.</li>
+			<li>Created a BASS add-on, works in AIMP.</li>
+			<li>Fixed a crash in XMPlay.</li>
+			<li>Fixed the XMMS plugin on big endian machines.</li>
+			<li>Created a Windows Explorer extension to display metadata
+			(title, author, year, duration, mono/stereo, number of subsongs, PAL/NTSC)
+			and edit on Windows Vista/7.</li>
+			<li>Created a simple player in C#.</li>
+		</ul>
+	</release>
+
+	<release version="2.1.0" date="2010-02-02">
+		<ul>
+			<li>ASAP2WAV replaced with asapconv which can additionally
+			convert native modules to and from the SAP format, edit SAP tags
+			and write MP3 files using <a href="http://lame.sourceforge.net/">LAME</a>.</li>
+			<li>Created a plugin for XMPlay.</li>
+			<li>The foobar2000 plugin updated to foobar2000 1.0.</li>
+			<li>Fixed time detection in RMT files.</li>
+			<li>The PLAYER tag is now optional for TYPE D SAP files.</li>
+			<li>A better validation in the "File Information" window.</li>
+			<li>Windows Media Player's "Open" now includes ASAP file types.</li>
+			<li>A progress bar when writing WAV files from WASAP.</li>
+			<li>Flash player uses DEFSONG.</li>
+			<li>Source code improved and migrated from CVS to Git.</li>
+		</ul>
+	</release>
+
+	<release version="2.0.0" date="2009-12-10">
+		<ul>
+			<li>Created a Windows setup.</li>
+			<li>ASAP ported to Flash Player and experimentally to JavaScript.</li>
+			<li>New input formats: DLT, CMS and CM3.</li>
+			<li>Added GTIA sound and COVOX.</li>
+			<li>WASAP now includes "Save as WAV".</li>
+			<li>Changed the JavaScript interface of the Java applet.</li>
+			<li>Huge changes in the build process: on Unix/Linux it no longer uses
+			the "configure" script and on Windows it uses MinGW for almost all binaries
+			(they are smaller than Visual C++ 2008's, compatible with Windows 9x,
+			wildcards work in ASAP2WAV).</li>
+		</ul>
+	</release>
+
+	<release version="1.2.1" date="2009-05-08">
+		<ul>
+			<li>Created an XBMC plugin and a POKEY emulation DLL for RMT.</li>
+			<li>The midlet has a progress bar, tags display, subsong selection and better performance.</li>
+			<li>Slightly improved the SKCTL emulation.</li>
+			<li>Converted the documentation from plain text to HTML.</li>
+		</ul>
+	</release>
+
+	<release version="1.2.0" date="2008-03-29">
+		<ul>
+			<li>Created plugins for Windows Media Player and Apollo.</li>
+			<li>Improved RMT duration detection.</li>
+			<li>Fixed a bug in TMC to SAP conversion.</li>
+			<li>ASAP can be compiled as C#.</li>
+		</ul>
+	</release>
+
+	<release version="1.1.0" date="2008-02-17">
+		<ul>
+			<li>All formats supported by ASAP can be converted to and from the SAP format,
+			using the file information window of WASAP or the Winamp plugin.
+			Unlike SAP Maker, ASAP supports subsongs and TIME tags.</li>
+			<li>Minor improvement of POKEY emulation.</li>
+			<li>Fixed bugs in the XMMS plugin, the foobar2000 plugin and the applet.</li>
+		</ul>
+	</release>
+
+	<release version="1.0.2" date="2007-11-02">
+		<ul>
+			<li>TIME tags can be edited in the file information window of WASAP and the Winamp plugin.</li>
+			<li>Fixed a few emulation bugs.</li>
+			<li>Fixed user interface issues in WASAP.</li>
+		</ul>
+	</release>
+
+	<release version="1.0.1" date="2007-06-10">
+		<ul>
+			<li>Created a plugin for MOC (Music On Console).</li>
+			<li>WASAP, the Winamp plugin and the foobar2000 plugin can edit AUTHOR, NAME and DATE tags in SAP files.</li>
+			<li>Winamp and XMMS plugins format titles as specified by the player.</li>
+			<li>TMC files are now played in stereo.</li>
+			<li>Fixed a few minor bugs.</li>
+		</ul>
+	</release>
+
+	<release version="1.0.0" date="2007-05-28">
+		<ul>
+			<li>This release introduces completely new 6502 and POKEY emulation.
+			SAP files with samples are supported.</li>
+			<li>ASAP can be compiled as Java - created an applet and an experimental midlet.</li>
+			<li>Winamp, foobar2000 and GSPlayer plugins support silence detection and muting of selected POKEY channels.</li>
+			<li>Winamp plugin supports subsongs and Winamp's equalizer.</li>
+		</ul>
+	</release>
+
+	<release version="0.3.0" date="2007-05-06">
+		<ul>
+			<li>Added support for AUTHOR, NAME, DATE and TIME tags in SAP files.</li>
+			<li>Winamp, foobar2000 and the new GSPlayer plugin have configurable playback time
+			for songs with no TIME tag and songs marked with LOOP.</li>
+			<li>foobar2000 plugin updated for version 0.9 of foobar2000.</li>
+			<li>XMMS plugin supports the TM8 extension.</li>
+		</ul>
+	</release>
+
+	<release version="0.2.1" date="2006-01-28">
+		<ul>
+			<li>Added the TM2 (Theta Music Composer 2.x) file format.</li>
+			<li>Improved compilation and installation on Unix-like systems.</li>
+			<li>foobar2000 plugin supports subsongs.</li>
+		</ul>
+	</release>
+
+	<release version="0.2.0" date="2006-01-15">
+		<ul>
+			<li>Added stereo and 16-bit audio output, enabled by default.</li>
+			<li>Fixed playback of compressed SAP files (for example Fractals.sap).</li>
+			<li>Subsongs supported in RMT files.</li>
+			<li>New plugins: for XMMS and for foobar2000 version 0.8.</li>
+			<li>WASAP supports Windows Explorer's "Open with".</li>
+		</ul>
+	</release>
+
+	<release version="0.1.0" date="2005-12-31">
+		<ul>
+			<li>This initial release included: ASAP2WAV - portable command-line converter of
+			Atari 8-bit music to WAV files, WASAP - tiny player for Windows and in_asap - a Winamp plugin.</li>
+			<li>It supported the following formats: SAP (except for samples and stereo),
+			CMC, CMR, DMC, MPT (without samples), MPD, RMT (mono) and TMC (mono).</li>
+		</ul>
+	</release>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/sap-format.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/sap-format.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/sap-format.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/sap-format.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,366 @@
+<page title="Spec">
+	<h2>SAP (Slight Atari Player) file format specification</h2>
+	<p>A SAP file contains chip music of the
+	<a href="http://en.wikipedia.org/wiki/Atari_8-bit_family">Atari 8-bit computers</a>.</p>
+
+	<h2>History</h2>
+	<p>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.</p>
+	<p>At the time of writing, there are five independent players of the SAP format:</p>
+	<ul>
+		<li>Slight Atari Player (SAP) by Adam Bienias</li>
+		<li><a href="http://asap.sourceforge.net/">Another Slight Atari Player (ASAP)</a> by Piotr Fusik (me)</li>
+		<li><a href="http://code.google.com/p/game-music-emu/">Game_Music_Emu (GME)</a> by Shay Green</li>
+		<li><a href="https://github.com/epi/sapemu">sapemu</a> by Adrian Matoga</li>
+		<li><a href="http://www.virtualdub.org/altirra.html">Altirra</a> by Avery Lee</li>
+	</ul>
+	<p>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.</p>
+
+	<h2>Concept</h2>
+	<p>A SAP file contains the original data and code used 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.</p>
+	<p>Identical method is used with platforms other than Atari,
+	for example the SID format for the C64 music.</p>
+	<p>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
+	as new players improve their emulation. The downside is that SAP files
+	are generally hard to create. Creating SAP files from Atari software
+	is called ripping and requires knowledge of the 6502 assembly language.
+	On the other hand, Atari music in popular formats such as CMC or RMT
+	can be easily converted to SAP (and back) using ASAP.</p>
+	<p>One SAP file may contain multiple independent tunes - these are called
+	"subsongs". For example, several songs from one game may be ripped
+	into one SAP file. Over 90% of SAP files contain just one song.
+	Unfortunately, many audio players do not support multiple subsongs per file.</p>
+
+	<h2>File Contents</h2>
+	<p>A SAP file always consists of two parts: a plain-text header,
+	followed by binary data. It is possible to create a SAP file
+	by concatenating a text file with a binary file, for example:</p>
+	<p>On Windows:</p>
+	<pre>copy /b music.txt+music.bin music.sap</pre>
+	<p>On macOS or Linux:</p>
+	<pre>cat music.txt music.bin >music.sap</pre>
+	<h3>Part One - Text Header</h3>
+	<p>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).
+	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.</p>
+	<p>Example header:</p>
+	<pre>SAP
+AUTHOR "Jakub Husak"
+NAME "Inside"
+DATE "1990"
+SONGS 3
+TYPE B
+INIT 0F80
+PLAYER 247F
+TIME 06:37.62
+TIME 02:34.02 LOOP
+TIME 00:15.40 LOOP
+</pre>
+	<p>The first line must consist of the word "SAP" immediately followed by CR/LF,
+	for format identification.</p>
+	<p>It is recommended, but not required, that tags are specified in the order
+	described below. Note that format identification in GStreamer
+	requires the AUTHOR tag to be placed right after the "SAP" line.</p>
+	<p>The arguments to AUTHOR, NAME and DATE must be wrapped in doublequotes.
+	Allowed are characters 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.
+	It is recommended to avoid doublequotes inside the arguments,
+	as not all SAP players handle them.
+	The arguments should be limited to 120 characters (plus the outer quotes).</p>
+	<p>It is strongly recommended that all SAP files contain
+	the AUTHOR, NAME and DATE tags.
+	Use <code>"&lt;?&gt;"</code> for unknown values.</p>
+	<dl>
+		<dt>AUTHOR</dt>
+		<dd>
+			<p>Name of the composer. The name should consist of a real name
+			and optionally a nickname (scene handle, no scene group) in parentheses.
+			If song was composed by many authors, separate them with " &amp; ".
+			Examples:</p>
+			<pre>AUTHOR "Dariusz Duma (Dhor)"
+AUTHOR "Lukasz Sychowicz (X-Ray) &amp; Piotr Swierszcz (Samurai)"
+AUTHOR "&lt;?&gt; (Trzcinowy Zakapior)"
+AUTHOR "Bill Williams &lt;?&gt;"
+</pre>
+			<p>The last two examples are respecively: known nickname
+			with an unknown real name and an uncertain author.</p>
+		</dd>
+
+		<dt>NAME</dt>
+		<dd>
+			<p>Song title. Examples:</p>
+			<pre>NAME "Jocky Wilson's Darts Challenge"
+NAME "&lt;?&gt;"
+</pre>
+		</dd>
+
+		<dt>DATE</dt>
+		<dd>
+			<p>Copyright year or year of creation.
+			If exact date is known, it can be included in the DD/MM/YYYY format.
+			Examples:</p>
+			<pre>DATE "1986"
+DATE "1993-1994"
+DATE "28/08/1997"
+DATE "12/2001"
+DATE "23-26/07/2010"
+DATE "199?"
+</pre>
+			<p>The last example means some unknown year in the 1990s.</p>
+		</dd>
+
+		<dt>SONG</dt>
+		<dd>
+			<p>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.</p>
+		</dd>
+
+		<dt>DEFSONG</dt>
+		<dd>
+			<p>Zero-based index of the subsong that should be played first
+			when the file is opened. Defaults to zero.</p>
+		</dd>
+
+		<dt>STEREO</dt>
+		<dd>
+			<p>Specifies that the file uses dual POKEY configuration.
+			Takes no argument.</p>
+		</dd>
+
+		<dt>NTSC</dt>
+		<dd>
+			<p>Specifies that the file should be played on an NTSC machine
+			instead of the default PAL. Takes no argument.
+			This tag is only supported on ASAP 2.1.1 and above.</p>
+		</dd>
+
+		<dt>TYPE</dt>
+		<dd>
+			<p>Player type. The argument should be one uppercase letter: B, C, D or S.
+			See the explanation below.</p>
+		</dd>
+
+		<dt>FASTPLAY</dt>
+		<dd>
+			<p>Number of scanlines between calls of the player routine.
+			A scanline is defined to be 114 Atari clock cycles.
+			FASTPLAY defaults to one frame: 312 scanlines for PAL (about 50 Hz),
+			262 for NTSC (about 60 Hz).
+			Most songs don't include this tag. Common values are 156 (twice per frame),
+			104 (three times per frame) and 78 (four times per frame).
+			ASAP 3.0.0 and above supports FASTPLAY up to 32767.
+			Other SAP players may limit the value to 312.</p>
+		</dd>
+
+		<dt>INIT</dt>
+		<dd>
+			<p>Hexadecimal address of a 6502 routine that initializes the player.
+			Required for player types B, D and S. Invalid for type C.
+			The address should be specified as four uppercase hexadecimal digits,
+			although players usually forgive lowercase and fewer digits.</p>
+		</dd>
+
+		<dt>MUSIC</dt>
+		<dd>
+			<p>Hexadecimal address of the music data.
+			Required for type C. Invalid for other types.</p>
+		</dd>
+
+		<dt>PLAYER</dt>
+		<dd>
+			<p>Hexadecimal address of the player routine.</p>
+		</dd>
+
+		<dt>COVOX</dt>
+		<dd>
+			<p>Specifies that the file uses the COVOX hardware expansion
+			at the specified hexadecimal address.
+			COVOX offers better quality of digitalized sounds than the POKEY, in stereo.
+			Currently only ASAP supports this and the only possible address is D600.</p>
+		</dd>
+
+		<dt>TIME</dt>
+		<dd>
+			<p>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).
+			The optional LOOP modifier specifies that the song starts looping endlessly
+			at the specified moment.
+			The exact format of the argument is:</p>
+			<ul>
+				<li>one or two digits specifying minutes</li>
+				<li>colon</li>
+				<li>two digits specifying seconds</li>
+				<li>optionally: decimal point (dot) followed by one to three digits (fraction of a second)</li>
+				<li>optionally: one space followed by four uppercase letters "LOOP"</li>
+			</ul>
+		</dd>
+	</dl>
+
+	<h3>Part Two - Binary Data</h3>
+	<p>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).</p>
+	<p>The difference from real Atari executables is that
+	INIT (0x2e2) and RUN (0x2e0) blocks are not supported.</p>
+	<p>Example:</p>
+-------------------------------------------------------------
+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
+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
+-------------------------------------------------------------
+
+	<p>Some players allow files that end in the middle of start/end address
+	or block data, but this practice is strongly discouraged.</p>
+
+	<h2>Execution Model</h2>
+	<p>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.
+	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).</p>
+	<p>Memory map:</p>
+	<dl>
+		<dt>0000-CFFF</dt>
+		<dd>RAM.</dd>
+
+		<dt>D000-D0FF</dt>
+		<dd>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.</dd>
+
+		<dt>D100-D1FF</dt>
+		<dd>reserved for parallel devices connected to the Atari, do not use.</dd>
+
+		<dt>D200-D2FF</dt>
+		<dd>POKEY chip mirrored 16 times
+		or two POKEY chips (stereo) mirrored 8 times.
+		At least the AUDF1-4, AUDC1-4, AUDCTL and RANDOM registers
+		must be implemented in a SAP player.
+		Emulation of timer interrupts via IRQEN and IRQST is strongly recommended.
+		SAP by Adam Bienias emulates only timer 1 interrupts.</dd>
+
+		<dt>D300-D3FF</dt>
+		<dd>reserved for the PIA chip, do not use.</dd>
+
+		<dt>D400-D4FF</dt>
+		<dd>ANTIC chip mirrored 16 times.
+		SAP files may rely on WSYNC (D40A) and VCOUNT (D40B) registers.
+		ASAP also implements NMIST/NMIRES (D40F), but not NMIEN (D40E).
+		The playback routine should be driven by the PLAYER/FASTPLAY mechanism
+		instead of directly programming ANTIC interrupts.</dd>
+
+		<dt>D500-D5FF</dt>
+		<dd>reserved for cartridge, do not use.</dd>
+
+		<dt>D600-D6FF</dt>
+		<dd>COVOX chip if enabled via the COVOX tag (ASAP only).
+		The COVOX consists of four unsigned 8-bit DACs:
+		0 and 3 for the left channel, 1 and 2 for the right channel.</dd>
+
+		<dt>D700-D7FF</dt>
+		<dd>reserved for expansions, do not use.</dd>
+
+		<dt>D800-FFFF</dt>
+		<dd>RAM.
+		FFFE/FFFF is 6502's interrupt vector for POKEY timer interrupts.</dd>
+	</dl>
+
+	<p>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
+	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.</p>
+
+	<h3>Player Types</h3>
+	<p>The value of the TYPE tag determines how the player routine
+	gets called by the SAP player:</p>
+	<dl>
+		<dt>TYPE B</dt>
+		<dd>The player is initialized by loading the zero-based subsong number
+		into the accumulator and calling the routine specified in the INIT tag.
+		The routine must return with an RTS.
+		Then, every FASTPLAY scanlines (312 being the default)
+		the PLAYER routine is called. It must return with an RTS as well.</dd>
+
+		<dt>TYPE C</dt>
+		<dd>
+			<p>This type is for easy handling CMC (Chaos Music Composer) music.
+			The player is initialized using the values
+			of MUSIC, PLAYER and DEFSONG as follows:</p>
+			<pre>    lda #$70
+    ldx #&lt;MUSIC
+    ldy #&gt;MUSIC
+    jsr PLAYER+3
+    lda #$00
+    ldx #DEFSONG
+    jsr PLAYER+3
+</pre>
+			<p>Then, in FASTPLAY intervals, PLAYER+6 is called.
+			When switching subsongs, the above procedure is repeated with
+			the subsong number instead of DEFSONG.</p>
+		</dd>
+
+		<dt>TYPE D</dt>
+		<dd>This is similar to TYPE B, but used for digitalized music.
+		The difference is that the INIT routine must not return.
+		It should play the digitalized music. It can use WSYNC and VCOUNT registers
+		and/or POKEY timer interrupts for timing. The POKEY interrupts
+		can be programmed via IRQEN/IRQST/AUDF1-4/AUDCTL registers,
+		the FFFE/FFFF interrupt vector and the I 6502 flag
+		(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.</dd>
+
+		<dt>TYPE S</dt>
+		<dd>This is a convenience type for SoftSynth music.
+		The PLAYER tag is not used here, yet some SAP players require it.
+		Instead of the PLAYER routine, at FASTPLAY intervals the memory location 0x45
+		is decreased and if reaches zero, the memory location 0xb07b is increased.
+		The default FASTPLAY for this type is 78.</dd>
+
+		<dt>TYPE R</dt>
+		<dd>The data part is a raw dump of the POKEY registers (D200-D208)
+		in FASTPLAY intervals, instead of an Atari executable.
+		No mainstream SAP player supports this type at the time of writing.</dd>
+
+	</dl>
+
+	<p>Game_Music_Emu supports only types B and C.</p>
+	<p>When 6502 routines get called, don't assume register values except for
+	the specified above. For example, don't assume that the INIT routine starts
+	with zero in the X register. Also, don't assume that 6502 registers
+	are unchanged between the calls to PLAYER or from INIT to PLAYER.</p>
+	<p>When starting a song, a SAP player must initialize POKEY registers to:
+	AUDF1-4 = AUDC1-4 = AUDCTL = IRQEN = 0, SKCTL = 3.</p>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/web.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/web.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/web.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/web.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,35 @@
+<page title="Web">
+	<script src="asap.js"> </script>
+	<script src="asapweb.js"> </script>
+	<script>
+		function openFiles(files)
+		{
+			var select = document.getElementById("fileSelect");
+			switch (files.length) {
+			case 0:
+				alert("No supported file selected");
+				return;
+			case 1:
+				select.style.display = "none";
+				break;
+			default:
+				select.innerHTML = "";
+				Array.prototype.forEach.call(files, function(file) {
+						var option = document.createElement("option");
+						option.text = file.name;
+						select.add(option);
+					});
+				select.style.display = "";
+				break;
+			}
+			document.getElementById("pauseButton").style.display = "";
+			asap.playFile(files[0]);
+		}
+	</script>
+	<p>Play your local Atari 8-bit chiptunes on this page, using a pure-JavaScript player.</p>
+	<p>Select file(s):
+		<input id="fileInput" type="file" multiple="multiple" onchange="openFiles(this.files)" accept=".sap,.cmc,.cm3,.cmr,.cms,.dmc,.dlt,.mpt,.mpd,.rmt,.tmc,.tm8,.tm2,.fc" />
+		<select id="fileSelect" onchange="asap.playFile(fileInput.files[this.selectedIndex])" style="display: none"> </select>
+		<input id="pauseButton" type="button" value="Pause" style="display: none" onclick="asap.togglePause()" />
+	</p>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/windows.xml kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/windows.xml
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/windows.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/windows.xml	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,67 @@
+<page title="Windows">
+	<h2>Windows</h2>
+	<p>Download <download prefix="asap-" suffix="-win32.msi" />, it's an installer for Windows 10/8/7/Vista/XP,
+	also the 64-bit ones.</p>
+
+	<h2>foobar2000</h2>
+	<p><a href="http://www.foobar2000.org/">foobar2000</a> is the recommended player.
+	The ASAP installer detects it and installs a plugin.
+	This plugin can play directly from ATR disk images.
+	You may also use foobar2000's conversion, e.g. to MP3.
+	If you want to install just the foobar2000 plugin and nothing else, there's an alternative download:
+	<download prefix="foo_asap-" suffix=".fb2k-component" />.</p>
+	<img src="foobar2000.png" alt="foobar2000" />
+
+	<h2>XMPlay</h2>
+	<p><a href="http://www.un4seen.com/xmplay.html">XMPlay</a> is a player supporting MOD and similar formats out of the box.
+	The ASAP plugin can display RMT instrument names. If you want to use the "File information" window
+	(to edit tags or convert between SAP and other formats), assign a shortcut to it from XMPlay options.</p>
+	<img src="xmplay.png" alt="XMPlay" />
+
+	<h2>Winamp</h2>
+	<p><a href="http://www.winamp.com/">Winamp</a> is a pure old-school classic! Believe it or not, it works on Windows 10.
+	The ASAP plugin supports ATR disk images.</p>
+	<img src="winamp.png" alt="Winamp" />
+
+	<h2>BASS / AIMP</h2>
+	<p><a href="http://www.un4seen.com/bass.html">BASS</a> is a component that provides audio playback
+	in <a href="http://www.aimp.ru/">AIMP</a> and <a href="http://www.un4seen.com/bass_showcase.php">other players</a>.
+	The ASAP installer detects AIMP. For other players, modify the install directory.</p>
+	<img src="aimp.png" alt="AIMP" />
+
+	<h2>VLC</h2>
+	<p><a href="http://www.videolan.org/vlc/">VLC</a> is a popular video player that plays audio as well.
+	It provides limited support for the SAP file format out of the box (no digitized sounds, buggy emulation).
+	For best experience, install the ASAP plugin.</p>
+	<p>For 64-bit VLC, you need to install <download prefix="asap-" suffix="-win64.msi" />.
+	It is okay to have both 32-bit and 64-bit ASAP packages installed at the same time.</p>
+	<img src="vlc.png" alt="VLC" />
+
+	<h2>Raster Music Tracker</h2>
+	<p><a href="http://raster.infos.cz/atari/rmt/rmt.htm">RMT</a> is a chiptune editor running on Windows.
+	For better emulation of the POKEY chip, install the ASAP plugin.</p>
+
+	<h2>WASAP</h2>
+	<p>WASAP is a tiny standalone player. When you run it, an "Open file" dialog appears.
+	Simply select the file you want to listen to. WASAP is later controlled by its red tray icon.
+	When you hover the mouse pointer over the icon, the name of the loaded file appears.
+	To open another file, left-click the tray icon. The other options are
+	available in the menu which appears when you right-click the icon.</p>
+	<p>Because of limited functionality of WASAP (for instance, no playlist),
+	it's recommended to use the previously described players instead.</p>
+	<img src="wasap.png" alt="WASAP" />
+
+	<h2>Windows Explorer</h2>
+	<p>The Windows Explorer extension provides no playback, only metadata display and editor.
+	On 64-bit Windows, you need to install <download prefix="asap-" suffix="-win64.msi" />.</p>
+	<img src="shellex.png" alt="Windows Explorer" />
+
+	<h2>asapconv</h2>
+	<p>For command-line conversions (e.g. to WAV or between SAP and the tracker formats)
+	and editing the metadata, use asapconv. Run the program from the command prompt to see the syntax.
+	The <code>-o/--output</code> option selects the output format and is mandatory.</p>
+
+	<h2>Manual installation</h2>
+	<p>If you are allergic to installers, you may download <download prefix="asap-" suffix="-win32.zip" />
+	and extract the files to proper locations.</p>
+</page>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/www.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/www.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/www.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/www.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,33 @@
+ifndef DO
+$(error Use "Makefile" instead of "www.mk")
+endif
+
+WWW_TARGETS = www/index.html www/android.html www/windows.html www/macos.html www/linux.html \
+	www/web.html www/news.html www/sap-format.html www/contact.html \
+	www/apokeysnd.dll www/asap.js www/asapweb.js \
+	www/favicon.ico www/PORTS.xml www/PORTS.xsl
+CLEAN += $(WWW_TARGETS)
+
+www: $(WWW_TARGETS)
+.PHONY: www
+
+www/%.html: $(call src,www/www.xsl www/%.xml)
+	$(DO)xsltproc -o $@ --stringparam version $(VERSION) $^ && java -jar C:/bin/vnu.jar $@
+
+www/apokeysnd.dll: win32/apokeysnd.dll
+	$(COPY)
+
+www/asap.js: javascript/asap.js
+	$(COPY)
+
+www/asapweb.js: $(srcdir)javascript/asapweb.js
+	$(COPY)
+
+www/favicon.ico: $(srcdir)win32/wasap/wasap.ico
+	$(COPY)
+
+www/PORTS.xml: $(srcdir)PORTS.xml
+	$(COPY)
+
+www/PORTS.xsl: $(srcdir)PORTS.xsl
+	$(COPY)
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/www.xsl kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/www.xsl
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/www/www.xsl	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/www/www.xsl	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,148 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:param name="version" />
+	<xsl:output method="html" />
+
+	<xsl:template match="/page">
+		<xsl:text disable-output-escaping="yes">&lt;!DOCTYPE html&gt;
+</xsl:text>
+		<html lang="en">
+			<head>
+				<title>
+					<xsl:text>ASAP</xsl:text>
+					<xsl:if test="@title != 'Home'">
+						<xsl:text> - </xsl:text>
+						<xsl:value-of select="@title" />
+					</xsl:if>
+				</title>
+				<style>
+					html { background-color: #eee; color: #000; font-family: Georgia,"Times New Roman",Times,serif; padding: 0em 3em; }
+					h1, h2, h3, dt { color: #c22; }
+					a { color: #00c; }
+					nav ul { border-bottom: solid #ccc 1px; margin: 0px; padding: 0.5em 0em; }
+					nav li { display: inline; }
+					nav li.tab_selected { background-color: #fff; border: solid #ccc 1px; border-bottom-color: #fff; padding: 0.5em; }
+					nav li a { padding: 0.5em; text-decoration: none; }
+					main { background-color: #fff; border: solid #ccc 1px; border-top-style: none; padding: 1em 3em 3em 3em; }
+					dt { margin-top: 1em; }
+					.author { color: #c22; padding-right: 1em; text-align: right; }
+					.rip { border: solid #000 1px; padding-left: 2px; padding-right: 2px; color: #000; }
+					pre { background-color: #eee; padding: 1ex; }
+				</style>
+				<xsl:apply-templates select="script" />
+			</head>
+			<body>
+				<header>
+					<h1>ASAP - Another Slight Atari Player</h1>
+				</header>
+				<nav>
+					<ul>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Home</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Android</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Windows</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">macOS</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Linux</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Web</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">News</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Spec</xsl:with-param></xsl:call-template>
+						<xsl:call-template name="menu"><xsl:with-param name="page">Contact</xsl:with-param></xsl:call-template>
+					</ul>
+				</nav>
+				<main>
+					<xsl:apply-templates select="*[not(self::script)]" />
+				</main>
+				<footer>
+					<p>
+						<a href="https://sourceforge.net/p/asap/">
+							<img alt="Download ASAP" src="https://sourceforge.net/sflogo.php?type=13&amp;group_id=154391" />
+						</a>
+					</p>
+				</footer>
+			</body>
+		</html>
+	</xsl:template>
+
+	<xsl:template name="menu">
+		<xsl:param name="page" />
+		<li>
+			<xsl:choose>
+				<xsl:when test="$page = /page/@title">
+					<xsl:attribute name="class">tab_selected</xsl:attribute>
+					<xsl:value-of select="$page" />
+				</xsl:when>
+				<xsl:when test="$page = 'Home'">
+					<a href="/">Home</a>
+				</xsl:when>
+				<xsl:when test="$page = 'Spec'">
+					<a href="sap-format.html">Spec</a>
+				</xsl:when>
+				<xsl:otherwise>
+					<a href="{translate($page, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')}.html">
+						<xsl:value-of select="$page" />
+					</a>
+				</xsl:otherwise>
+			</xsl:choose>
+		</li>
+	</xsl:template>
+
+	<xsl:template match="version">
+		<xsl:value-of select="$version" />
+	</xsl:template>
+
+	<xsl:template match="release">
+		<h2>
+			<xsl:text>ASAP&#160;</xsl:text>
+			<xsl:value-of select="@version" />
+			<xsl:text>&#160;(</xsl:text>
+			<xsl:value-of select="@date" />
+			<xsl:text>)</xsl:text>
+		</h2>
+		<xsl:apply-templates />
+	</xsl:template>
+
+	<xsl:template match="download">
+		<xsl:variable name="file" select="concat(@prefix, $version, @suffix)" />
+		<a href="https://sourceforge.net/projects/asap/files/asap/{$version}/{$file}/download"><xsl:value-of select="$file" /></a>
+	</xsl:template>
+
+	<xsl:template match="authors">
+		<h2>Authors</h2>
+		<table>
+			<xsl:for-each select="author">
+				<tr>
+					<td class="author">
+						<xsl:choose>
+							<xsl:when test="@rip">
+								<span class="rip"><xsl:value-of select="@name" /></span>
+							</xsl:when>
+							<xsl:when test="@href">
+								<a href="{@href}"><xsl:value-of select="@name" /></a>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="@name" />
+							</xsl:otherwise>
+						</xsl:choose>
+					</td>
+					<td>
+						<xsl:apply-templates />
+					</td>
+				</tr>
+			</xsl:for-each>
+		</table>
+	</xsl:template>
+
+	<xsl:template match="ul[@title]">
+		<p><xsl:value-of select="@title" />:</p>
+		<ul>
+			<xsl:apply-templates />
+		</ul>
+	</xsl:template>
+
+	<xsl:template match="a[@href]|code|div|dd|dl|dt|h2|h3|img|input|li|ol|p|pre|script|select|ul">
+		<xsl:element name="{name()}">
+			<xsl:copy-of select="@*" />
+			<xsl:apply-templates />
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*" />
+</xsl:stylesheet>
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/xmms/libasap-xmms.c kodi-audiodecoder-asap-3.0.1/lib/asap-code/xmms/libasap-xmms.c
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/xmms/libasap-xmms.c	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/xmms/libasap-xmms.c	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,292 @@
+/*
+ * libasap-xmms.c - ASAP plugin for XMMS
+ *
+ * Copyright (C) 2006-2019  Piotr Fusik
+ *
+ * This file is part of ASAP (Another Slight Atari Player),
+ * see http://asap.sourceforge.net
+ *
+ * ASAP is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * ASAP is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ASAP; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <pthread.h>
+#include <stdbool.h>
+#include <string.h>
+#ifdef USE_STDIO
+#include <stdio.h>
+#else
+#include <fcntl.h>
+#include <unistd.h>
+#endif
+
+#include <xmms/plugin.h>
+#include <xmms/titlestring.h>
+#include <xmms/util.h>
+
+#include "asap.h"
+
+#define BITS_PER_SAMPLE  16
+#define BUFFERED_BLOCKS  512
+
+static int channels;
+
+static InputPlugin mod;
+
+static unsigned char module[ASAPInfo_MAX_MODULE_LENGTH];
+static int module_len;
+static ASAP *asap;
+
+static volatile int seek_to;
+static pthread_t thread_handle;
+static volatile bool thread_run = false;
+static volatile bool generated_eof = false;
+
+static char *asap_stpcpy(char *dest, const char *src)
+{
+	size_t len = strlen(src);
+	memcpy(dest, src, len);
+	return dest + len;
+}
+
+static void asap_show_message(gchar *title, gchar *text)
+{
+	xmms_show_message(title, text, "Ok", FALSE, NULL, NULL);
+}
+
+static void asap_init(void)
+{
+	asap = ASAP_New();
+}
+
+static void asap_about(void)
+{
+	asap_show_message("About ASAP XMMS plugin " ASAPInfo_VERSION,
+		ASAPInfo_CREDITS "\n" ASAPInfo_COPYRIGHT);
+}
+
+static int asap_is_our_file(char *filename)
+{
+	return ASAPInfo_IsOurFile(filename);
+}
+
+static bool asap_load_file(const char *filename)
+{
+#ifdef USE_STDIO
+	FILE *fp = fopen(filename, "rb");
+	if (fp == NULL)
+		return false;
+	module_len = (int) fread(module, 1, sizeof(module), fp);
+	fclose(fp);
+#else
+	int fd = open(filename, O_RDONLY);
+	if (fd == -1)
+		return false;
+	module_len = read(fd, module, sizeof(module));
+	close(fd);
+	if (module_len < 0)
+		return false;
+#endif
+	return true;
+}
+
+static ASAPInfo *asap_get_info(const char *filename)
+{
+	if (!asap_load_file(filename))
+		return NULL;
+	ASAPInfo *info = ASAPInfo_New();
+	if (info == NULL)
+		return NULL;
+	if (!ASAPInfo_Load(info, filename, module, module_len)) {
+		ASAPInfo_Delete(info);
+		return NULL;
+	}
+	return info;
+}
+
+static char *asap_get_title(const char *filename, const ASAPInfo *info)
+{
+	char *path = g_strdup(filename);
+	char *filepart = strrchr(path, '/');
+	if (filepart != NULL) {
+		filepart[1] = '\0';
+		filepart += 2;
+	}
+	else
+		filepart = path;
+	char *ext = strrchr(filepart, '.');
+	if (ext != NULL)
+		ext++;
+
+	TitleInput *title_input;
+	XMMS_NEW_TITLEINPUT(title_input);
+	const char *p = ASAPInfo_GetAuthor(info);
+	if (p[0] != '\0')
+		title_input->performer = (gchar *) p;
+	title_input->track_name = (gchar *) ASAPInfo_GetTitleOrFilename(info);
+	int year = ASAPInfo_GetYear(info);
+	if (year > 0)
+		title_input->year = year;
+	p = ASAPInfo_GetDate(info);
+	if (p[0] != '\0')
+		title_input->date = (gchar *) p;
+	title_input->file_name = g_basename(filename);
+	title_input->file_ext = ext;
+	title_input->file_path = path;
+	char *title = xmms_get_titlestring(xmms_get_gentitle_format(), title_input);
+	if (title == NULL)
+		title = g_strdup(ASAPInfo_GetTitleOrFilename(info));
+
+	g_free(path);
+	return title;
+}
+
+static void *asap_play_thread(void *arg)
+{
+	while (thread_run) {
+		if (generated_eof) {
+			xmms_usleep(10000);
+			continue;
+		}
+		if (seek_to >= 0) {
+			mod.output->flush(seek_to);
+			ASAP_Seek(asap, seek_to);
+			seek_to = -1;
+		}
+		int buffered_bytes = BUFFERED_BLOCKS * channels * (BITS_PER_SAMPLE / 8);
+		static unsigned char buffer[BUFFERED_BLOCKS * (BITS_PER_SAMPLE / 8) * 2];
+		buffered_bytes = ASAP_Generate(asap, buffer, buffered_bytes,
+			BITS_PER_SAMPLE == 8 ? ASAPSampleFormat_U8 : ASAPSampleFormat_S16_L_E);
+		if (buffered_bytes == 0) {
+			generated_eof = true;
+			mod.output->buffer_free();
+			mod.output->buffer_free();
+			continue;
+		}
+		mod.add_vis_pcm(mod.output->written_time(),
+			BITS_PER_SAMPLE == 8 ? FMT_U8 : FMT_S16_LE,
+			channels, buffered_bytes, buffer);
+		while (thread_run && mod.output->buffer_free() < buffered_bytes)
+			xmms_usleep(20000);
+		if (thread_run)
+			mod.output->write_audio(buffer, buffered_bytes);
+	}
+	pthread_exit(NULL);
+}
+
+static void asap_play_file(char *filename)
+{
+	if (asap == NULL)
+		return;
+	if (!asap_load_file(filename))
+		return;
+	if (!ASAP_Load(asap, filename, module, module_len))
+		return;
+	const ASAPInfo *info = ASAP_GetInfo(asap);
+	int song = ASAPInfo_GetDefaultSong(info);
+	int duration = ASAPInfo_GetDuration(info, song);
+	if (!ASAP_PlaySong(asap, song, duration))
+		return;
+	channels = ASAPInfo_GetChannels(info);
+	if (!mod.output->open_audio(BITS_PER_SAMPLE == 8 ? FMT_U8 : FMT_S16_LE, ASAP_SAMPLE_RATE, channels))
+		return;
+	char *title = asap_get_title(filename, info);
+	mod.set_info(title, duration, BITS_PER_SAMPLE * 1000, ASAP_SAMPLE_RATE, channels);
+	g_free(title);
+	seek_to = -1;
+	thread_run = true;
+	generated_eof = false;
+	pthread_create(&thread_handle, NULL, asap_play_thread, NULL);
+}
+
+static void asap_seek(int time)
+{
+	seek_to = time * 1000;
+	generated_eof = false;
+	while (thread_run && seek_to >= 0)
+		xmms_usleep(10000);
+}
+
+static void asap_pause(short paused)
+{
+	mod.output->pause(paused);
+}
+
+static void asap_stop(void)
+{
+	if (thread_run) {
+		thread_run = false;
+		pthread_join(thread_handle, NULL);
+		mod.output->close_audio();
+	}
+}
+
+static int asap_get_time(void)
+{
+	if (!thread_run || (generated_eof && !mod.output->buffer_playing()))
+		return -1;
+	return mod.output->output_time();
+}
+
+static void asap_get_song_info(char *filename, char **title, int *length)
+{
+	ASAPInfo *info = asap_get_info(filename);
+	if (info == NULL)
+		return;
+	*title = asap_get_title(filename, info);
+	*length = ASAPInfo_GetDuration(info, ASAPInfo_GetDefaultSong(info));
+	ASAPInfo_Delete(info);
+}
+
+static void asap_file_info_box(char *filename)
+{
+	ASAPInfo *info = asap_get_info(filename);
+	if (info == NULL)
+		return;
+	char s[3 * ASAPInfo_MAX_TEXT_LENGTH + 100];
+	char *p = asap_stpcpy(s, "Author: ");
+	p = asap_stpcpy(p, ASAPInfo_GetAuthor(info));
+	p = asap_stpcpy(p, "\nName: ");
+	p = asap_stpcpy(p, ASAPInfo_GetTitle(info));
+	p = asap_stpcpy(p, "\nDate: ");
+	p = asap_stpcpy(p, ASAPInfo_GetDate(info));
+	*p = '\0';
+	ASAPInfo_Delete(info);
+	asap_show_message("File information", s);
+}
+
+static InputPlugin mod = {
+	NULL, NULL,
+	"ASAP " ASAPInfo_VERSION,
+	asap_init,
+	asap_about,
+	NULL,
+	asap_is_our_file,
+	NULL,
+	asap_play_file,
+	asap_stop,
+	asap_pause,
+	asap_seek,
+	NULL,
+	asap_get_time,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	asap_get_song_info,
+	asap_file_info_box,
+	NULL
+};
+
+InputPlugin *get_iplugin_info(void)
+{
+	return &mod;
+}
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/xmms/libasap-xmms.map kodi-audiodecoder-asap-3.0.1/lib/asap-code/xmms/libasap-xmms.map
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/xmms/libasap-xmms.map	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/xmms/libasap-xmms.map	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,14 @@
+# This linker script defines symbols that should be exported
+# from the shared library.
+# Without this script, all global symbols are exported, which:
+# - makes the library about 4K bigger
+# - makes the symbols accessible from the outside
+# - can lead to symbol collisions with different libraries
+#   (I am not sure whether this problem actually exists)
+# It should be noted that the shared library can be generated
+# without this script, so you can omit it if your linker does not
+# understand it.
+{
+	global: get_iplugin_info;
+	local: *;
+};
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/asap-code/xmms/xmms.mk kodi-audiodecoder-asap-3.0.1/lib/asap-code/xmms/xmms.mk
--- kodi-audiodecoder-asap-2.0.2/lib/asap-code/xmms/xmms.mk	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/asap-code/xmms/xmms.mk	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,33 @@
+XMMS_CFLAGS = `xmms-config --cflags`
+XMMS_LIBS = `xmms-config --libs`
+XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir`
+XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins
+
+# no user-configurable paths below this line
+
+ifndef DO
+$(error Use "Makefile" instead of "xmms.mk")
+endif
+
+asap-xmms: libasap-xmms.so
+.PHONY: asap-xmms
+
+libasap-xmms.so: $(call src,xmms/libasap-xmms.c asap.[ch])
+	$(DO_CC) $(XMMS_CFLAGS) -Wl,--version-script=$(srcdir)xmms/libasap-xmms.map $(XMMS_LIBS)
+CLEAN += libasap-xmms.so
+
+install-xmms: libasap-xmms.so
+	$(call INSTALL_PROGRAM,libasap-xmms.so,$(XMMS_INPUT_PLUGIN_DIR))
+.PHONY: install-xmms
+
+uninstall-xmms:
+	$(RM) $(DESTDIR)$(XMMS_INPUT_PLUGIN_DIR)/libasap-xmms.so
+.PHONY: uninstall-xmms
+
+install-xmms-user: libasap-xmms.so
+	$(call INSTALL_PROGRAM,libasap-xmms.so,$(XMMS_USER_PLUGIN_DIR))
+.PHONY: install-xmms-user
+
+uninstall-xmms-user:
+	$(RM) $(DESTDIR)$(XMMS_USER_PLUGIN_DIR)/libasap-xmms.so
+.PHONY: uninstall-xmms-user
diff -Nru kodi-audiodecoder-asap-2.0.2/lib/kodi-asap-code-note.txt kodi-audiodecoder-asap-3.0.1/lib/kodi-asap-code-note.txt
--- kodi-audiodecoder-asap-2.0.2/lib/kodi-asap-code-note.txt	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/lib/kodi-asap-code-note.txt	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,2 @@
+asap-code source from https://sourceforge.net/projects/asap/
+Sync to 5.0.1 (19 Jan 2020)
diff -Nru kodi-audiodecoder-asap-2.0.2/LICENSE.md kodi-audiodecoder-asap-3.0.1/LICENSE.md
--- kodi-audiodecoder-asap-2.0.2/LICENSE.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/LICENSE.md	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,264 @@
+The GNU General Public License, Version 2, June 1991 (GPLv2)
+============================================================
+
+> Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+> 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+
+Preamble
+--------
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to most
+of the Free Software Foundation's software and to any other program whose
+authors commit to using it. (Some other Free Software Foundation software is
+covered by the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you can
+do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a
+fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show them
+these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer
+you this license which gives you legal permission to copy, distribute and/or
+modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced by
+others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish
+to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's free
+use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+
+Terms And Conditions For Copying, Distribution And Modification
+---------------------------------------------------------------
+
+**0.** This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License. The "Program", below, refers to any such program or
+work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is included without
+limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope. The act of running the Program is not
+restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program). Whether that is true depends on what the Program does.
+
+**1.** You may copy and distribute verbatim copies of the Program's source code
+as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the Program
+a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at
+your option offer warranty protection in exchange for a fee.
+
+**2.** You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you also
+meet all of these conditions:
+
+*   **a)** You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+*   **b)** You must cause any work that you distribute or publish, that in whole
+    or in part contains or is derived from the Program or any part thereof, to
+    be licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+*   **c)** If the modified program normally reads commands interactively when
+    run, you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License. (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works. But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the entire whole,
+and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+**3.** You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and 2
+above provided that you also do one of the following:
+
+*   **a)** Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above on
+    a medium customarily used for software interchange; or,
+
+*   **b)** Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+*   **c)** Accompany it with the information you received as to the offer to
+    distribute corresponding source code. (This alternative is allowed only for
+    noncommercial distribution and only if you received the program in object
+    code or executable form with such an offer, in accord with Subsection b
+    above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all the
+source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable. However, as a special exception, the source code distributed
+need not include anything that is normally distributed (in either source or
+binary form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component itself
+accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source code
+from the same place counts as distribution of the source code, even though third
+parties are not compelled to copy the source along with the object code.
+
+**4.** You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License. However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+**5.** You are not required to accept this License, since you have not signed
+it. However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you do
+not accept this License. Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+**6.** Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+**7.** If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution of
+the Program by all those who receive copies directly or indirectly through you,
+then the only way you could satisfy both it and this License would be to refrain
+entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and the
+section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+**8.** If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+**9.** The Free Software Foundation may publish revised and/or new versions of
+the General Public License from time to time. Such new versions will be similar
+in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that version
+or of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of this License, you may choose any
+version ever published by the Free Software Foundation.
+
+**10.** If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+
+No Warranty
+-----------
+
+**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
diff -Nru kodi-audiodecoder-asap-2.0.2/README.md kodi-audiodecoder-asap-3.0.1/README.md
--- kodi-audiodecoder-asap-2.0.2/README.md	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/README.md	2013-05-31 22:59:22.000000000 +0000
@@ -1,15 +1,25 @@
+<p align="center">
+  <img src="audiodecoder.asap/icon.png" />
+</p>
+
+------------------
+
+[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
+[![Build Status](https://travis-ci.org/xbmc/audiodecoder.asap.svg?branch=Matrix)](https://travis-ci.org/xbmc/audiodecoder.asap/branches)
+[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.asap?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=4&branchName=Matrix)
+[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audiodecoder.asap/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudiodecoder.asap/branches/)
+<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.asap?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-asap?branch=Matrix) -->
+
 # audiodecoder.asap addon for Kodi
 
-This is a [Kodi](http://kodi.tv) audio decoder addon for SAP files.
+This is a [Kodi](https://kodi.tv) audio decoder addon for SAP files.
 
-[![Build Status](https://travis-ci.org/xbmc/audiodecoder.asap.svg?branch=master)](https://travis-ci.org/xbmc/audiodecoder.asap)
-[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.asap?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=4&branchName=Leia)
-<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.asap?svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-asap) -->
+ASAP (Another Slight Atari Player) plays on Kodi and converts 8-bit Atari music (*.sap, *.cmc, *.mpt, *.rmt, *.tmc, ...) on modern computers and mobile devices.
 
 ## Build instructions
 
 When building the addon you have to use the correct branch depending on which version of Kodi you're building against. 
-For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository. 
+If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename.
 Also make sure you follow this README from the branch in question.
 
 ### Linux
@@ -17,7 +27,7 @@
 The following instructions assume you will have built Kodi already in the `kodi-build` directory 
 suggested by the README.
 
-1. `git clone --branch Leia https://github.com/xbmc/xbmc.git`
+1. `git clone --branch master https://github.com/xbmc/xbmc.git`
 2. `git clone https://github.com/xbmc/audiodecoder.asap.git`
 3. `cd audiodecoder.asap && mkdir build && cd build`
 4. `cmake -DADDONS_TO_BUILD=audiodecoder.asap -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
diff -Nru kodi-audiodecoder-asap-2.0.2/src/ASAPCodec.cpp kodi-audiodecoder-asap-3.0.1/src/ASAPCodec.cpp
--- kodi-audiodecoder-asap-2.0.2/src/ASAPCodec.cpp	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/src/ASAPCodec.cpp	2013-05-31 22:59:22.000000000 +0000
@@ -1,220 +1,199 @@
 /*
- *      Copyright (C) 2005-2020 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
  */
 
-#include <kodi/addon-instance/AudioDecoder.h>
+#include "ASAPCodec.h"
+
 #include <kodi/Filesystem.h>
 
-extern "C" {
-#include "asap.h"
+CASAPCodec::CASAPCodec(KODI_HANDLE instance, const std::string& version)
+  : CInstanceAudioDecoder(instance, version)
+{
 }
 
-struct ASAPContext {
-  char author[ASAPInfo_MAX_TEXT_LENGTH + 1];
-  char name[ASAPInfo_MAX_TEXT_LENGTH + 1];
-  int year;
-  int month;
-  int day;
-  int channels;
-  int duration;
-  ASAP* asap = nullptr;
-};
+CASAPCodec::~CASAPCodec()
+{
+  if (ctx.asap)
+    ASAP_Delete(ctx.asap);
+}
 
-class ATTRIBUTE_HIDDEN CASAPCodec : public kodi::addon::CInstanceAudioDecoder
+bool CASAPCodec::Init(const std::string& filename,
+                      unsigned int filecache,
+                      int& channels,
+                      int& samplerate,
+                      int& bitspersample,
+                      int64_t& totaltime,
+                      int& bitrate,
+                      AudioEngineDataFormat& format,
+                      std::vector<AudioEngineChannel>& channellist)
 {
-public:
-  CASAPCodec(KODI_HANDLE instance) :
-    CInstanceAudioDecoder(instance)
-  {
-  }
+  int track = 0;
+  std::string toLoad(filename);
+  if (toLoad.find(".asapstream") != std::string::npos)
+  {
+    size_t iStart = toLoad.rfind('-') + 1;
+    track = atoi(toLoad.substr(iStart, toLoad.size() - iStart - 11).c_str()) - 1;
+    //  The directory we are in, is the file
+    //  that contains the bitstream to play,
+    //  so extract it
+    size_t slash = toLoad.rfind('\\');
+    if (slash == std::string::npos)
+      slash = toLoad.rfind('/');
+    toLoad = toLoad.substr(0, slash);
+  }
+
+  kodi::vfs::CFile file;
+  if (!file.OpenFile(toLoad, 0))
+    return false;
+
+  int len = file.GetLength();
+  uint8_t* data = new uint8_t[len];
+  file.Read(data, len);
+  file.Close();
 
-  virtual ~CASAPCodec()
+  ctx.asap = ASAP_New();
+
+  // Now load the module
+  if (!ASAP_Load(ctx.asap, toLoad.c_str(), data, len))
   {
-    if (ctx.asap)
-      ASAP_Delete(ctx.asap);
-  }
-
-  bool Init(const std::string& filename, unsigned int filecache,
-            int& channels, int& samplerate,
-            int& bitspersample, int64_t& totaltime,
-            int& bitrate, AEDataFormat& format,
-            std::vector<AEChannel>& channellist) override
-  {
-    int track=0;
-    std::string toLoad(filename);
-    if (toLoad.find(".asapstream") != std::string::npos)
-    {
-      size_t iStart=toLoad.rfind('-') + 1;
-      track = atoi(toLoad.substr(iStart, toLoad.size()-iStart-11).c_str())-1;
-      //  The directory we are in, is the file
-      //  that contains the bitstream to play,
-      //  so extract it
-      size_t slash = toLoad.rfind('\\');
-      if (slash == std::string::npos)
-        slash = toLoad.rfind('/');
-      toLoad = toLoad.substr(0, slash);
-    }
-
-    kodi::vfs::CFile file;
-    if (!file.OpenFile(toLoad,0))
-      return false;
-
-    int len = file.GetLength();
-    uint8_t* data = new uint8_t[len];
-    file.Read(data, len);
-    file.Close();
-
-    ctx.asap = ASAP_New();
-
-    // Now load the module
-    if (!ASAP_Load(ctx.asap, toLoad.c_str(), data, len))
-    {
-      delete[] data;
-      return false;
-    }
     delete[] data;
-
-    const ASAPInfo* info = ASAP_GetInfo(ctx.asap);
-
-    channels = ASAPInfo_GetChannels(info);
-    samplerate = 44100;
-    bitspersample = 16;
-    totaltime = ASAPInfo_GetDuration(info, track);
-    format = AE_FMT_S16NE;
-    if (channels == 1)
-      channellist = { AE_CH_FC };
-    else
-      channellist = { AE_CH_FL, AE_CH_FR };
-    bitrate = 0;
-
-    ASAP_PlaySong(ctx.asap, track, totaltime);
-
-    return true;
+    return false;
   }
+  delete[] data;
 
-  int ReadPCM(uint8_t* buffer, int size, int& actualsize) override
-  {
-    actualsize = ASAP_Generate(ctx.asap, buffer, size, ASAPSampleFormat_S16_L_E);
+  const ASAPInfo* info = ASAP_GetInfo(ctx.asap);
 
-    return actualsize == 0;
-  }
+  channels = ASAPInfo_GetChannels(info);
+  samplerate = 44100;
+  bitspersample = 16;
+  totaltime = ASAPInfo_GetDuration(info, track);
+  format = AUDIOENGINE_FMT_S16NE;
+  if (channels == 1)
+    channellist = {AUDIOENGINE_CH_FC};
+  else
+    channellist = {AUDIOENGINE_CH_FL, AUDIOENGINE_CH_FR};
+  bitrate = 0;
 
-  int64_t Seek(int64_t time) override
-  {
-    ASAP_Seek(ctx.asap, time);
+  ASAP_PlaySong(ctx.asap, track, totaltime);
 
-    return time;
-  }
+  return true;
+}
 
-  bool ReadTag(const std::string& filename, std::string& title,
-               std::string& artist, int& length) override
-  {
-    int track=1;
-    std::string toLoad(filename);
-    if (toLoad.find(".asapstream") != std::string::npos)
-    {
-      size_t iStart=toLoad.rfind('-') + 1;
-      track = atoi(toLoad.substr(iStart, toLoad.size()-iStart-11).c_str());
-      //  The directory we are in, is the file
-      //  that contains the bitstream to play,
-      //  so extract it
-      size_t slash = toLoad.rfind('\\');
-      if (slash == std::string::npos)
-        slash = toLoad.rfind('/');
-      toLoad = toLoad.substr(0, slash);
-    }
+int CASAPCodec::ReadPCM(uint8_t* buffer, int size, int& actualsize)
+{
+  actualsize = ASAP_Generate(ctx.asap, buffer, size, ASAPSampleFormat_S16_L_E);
+
+  return actualsize == 0;
+}
 
-    kodi::vfs::CFile file;
-    if (!file.OpenFile(toLoad, 0))
-      return false;
+int64_t CASAPCodec::Seek(int64_t time)
+{
+  ASAP_Seek(ctx.asap, time);
 
-    int len = file.GetLength();
-    uint8_t* data = new uint8_t[len];
-    file.Read(data, len);
-    file.Close();
+  return time;
+}
 
-    ASAP* asap = ASAP_New();
+bool CASAPCodec::ReadTag(const std::string& filename, kodi::addon::AudioDecoderInfoTag& tag)
+{
+  int track = 0;
+  std::string toLoad(filename);
+  if (toLoad.find(".asapstream") != std::string::npos)
+  {
+    size_t iStart = toLoad.rfind('-') + 1;
+    track = atoi(toLoad.substr(iStart, toLoad.size() - iStart - 11).c_str());
+    //  The directory we are in, is the file
+    //  that contains the bitstream to play,
+    //  so extract it
+    size_t slash = toLoad.rfind('\\');
+    if (slash == std::string::npos)
+      slash = toLoad.rfind('/');
+    toLoad = toLoad.substr(0, slash);
+  }
+
+  kodi::vfs::CFile file;
+  if (!file.OpenFile(toLoad, 0))
+    return false;
+
+  int len = file.GetLength();
+  uint8_t* data = new uint8_t[len];
+  file.Read(data, len);
+  file.Close();
 
-    // Now load the module
-    if (!ASAP_Load(asap, toLoad.c_str(), data, len))
-    {
-      delete[] data;
-      return false;
-    }
+  ASAP* asap = ASAP_New();
 
+  // Now load the module
+  if (!ASAP_Load(asap, toLoad.c_str(), data, len))
+  {
     delete[] data;
+    return false;
+  }
 
-    const ASAPInfo* info = ASAP_GetInfo(asap);
-    artist = ASAPInfo_GetAuthor(info);
-    title = ASAPInfo_GetTitleOrFilename(info);
-    length = ASAPInfo_GetDuration(info, track);
+  delete[] data;
 
-    ASAP_Delete(asap);
+  const ASAPInfo* info = ASAP_GetInfo(asap);
+  tag.SetArtist(ASAPInfo_GetAuthor(info));
+  tag.SetTitle(ASAPInfo_GetTitleOrFilename(info));
+  tag.SetDuration(ASAPInfo_GetDuration(info, track) / 1000);
+  if (ASAPInfo_GetYear(info) > 0)
+    tag.SetReleaseDate(std::to_string(ASAPInfo_GetYear(info)));
+  tag.SetChannels(ASAPInfo_GetChannels(info));
+  tag.SetSamplerate(44100);
+  tag.SetTrack(track);
 
-    return true;
-  }
+  ASAP_Delete(asap);
 
-  int TrackCount(const std::string& fileName) override
-  {
-    kodi::vfs::CFile file;
-    if (!file.OpenFile(fileName,0))
-      return 1;
+  return true;
+}
 
-    int len = file.GetLength();
-    uint8_t* data = new uint8_t[len];
-    file.Read(data, len);
-    file.Close();
+int CASAPCodec::TrackCount(const std::string& fileName)
+{
+  kodi::vfs::CFile file;
+  if (!file.OpenFile(fileName, 0))
+    return 1;
+
+  int len = file.GetLength();
+  uint8_t* data = new uint8_t[len];
+  file.Read(data, len);
+  file.Close();
 
-    ASAP* asap = ASAP_New();
+  ASAP* asap = ASAP_New();
 
-    // Now load the module
-    if (!ASAP_Load(asap, fileName.c_str(), data, len))
-    {
-      ASAP_Delete(asap);
-      delete[] data;
-      return 1;
-    }
-    delete[] data;
-
-    const ASAPInfo* info = ASAP_GetInfo(asap);
-    int result = ASAPInfo_GetSongs(info);
+  // Now load the module
+  if (!ASAP_Load(asap, fileName.c_str(), data, len))
+  {
     ASAP_Delete(asap);
-
-    return result;
+    delete[] data;
+    return 1;
   }
+  delete[] data;
 
-private:
-  ASAPContext ctx;
-};
+  const ASAPInfo* info = ASAP_GetInfo(asap);
+  int result = ASAPInfo_GetSongs(info);
+  ASAP_Delete(asap);
+
+  return result;
+}
 
+//------------------------------------------------------------------------------
 
 class ATTRIBUTE_HIDDEN CMyAddon : public kodi::addon::CAddonBase
 {
 public:
   CMyAddon() = default;
-  ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override
+  ADDON_STATUS CreateInstance(int instanceType,
+                              const std::string& instanceID,
+                              KODI_HANDLE instance,
+                              const std::string& version,
+                              KODI_HANDLE& addonInstance) override
   {
-    addonInstance = new CASAPCodec(instance);
+    addonInstance = new CASAPCodec(instance, version);
     return ADDON_STATUS_OK;
   }
   virtual ~CMyAddon() = default;
 };
 
 
-ADDONCREATOR(CMyAddon);
+ADDONCREATOR(CMyAddon)
diff -Nru kodi-audiodecoder-asap-2.0.2/src/ASAPCodec.h kodi-audiodecoder-asap-3.0.1/src/ASAPCodec.h
--- kodi-audiodecoder-asap-2.0.2/src/ASAPCodec.h	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/src/ASAPCodec.h	2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSE.md for more information.
+ */
+
+#pragma once
+
+#include <kodi/addon-instance/AudioDecoder.h>
+
+extern "C"
+{
+#include "asap.h"
+}
+
+struct ASAPContext
+{
+  char author[ASAPInfo_MAX_TEXT_LENGTH + 1];
+  char name[ASAPInfo_MAX_TEXT_LENGTH + 1];
+  int year;
+  int month;
+  int day;
+  int channels;
+  int duration;
+  ASAP* asap = nullptr;
+};
+
+class ATTRIBUTE_HIDDEN CASAPCodec : public kodi::addon::CInstanceAudioDecoder
+{
+public:
+  CASAPCodec(KODI_HANDLE instance, const std::string& version);
+  virtual ~CASAPCodec();
+
+  bool Init(const std::string& filename,
+            unsigned int filecache,
+            int& channels,
+            int& samplerate,
+            int& bitspersample,
+            int64_t& totaltime,
+            int& bitrate,
+            AudioEngineDataFormat& format,
+            std::vector<AudioEngineChannel>& channellist) override;
+  int ReadPCM(uint8_t* buffer, int size, int& actualsize) override;
+  int64_t Seek(int64_t time) override;
+  bool ReadTag(const std::string& filename, kodi::addon::AudioDecoderInfoTag& tag) override;
+  int TrackCount(const std::string& fileName) override;
+
+private:
+  ASAPContext ctx;
+};
diff -Nru kodi-audiodecoder-asap-2.0.2/.travis.yml kodi-audiodecoder-asap-3.0.1/.travis.yml
--- kodi-audiodecoder-asap-2.0.2/.travis.yml	2020-02-05 15:41:38.000000000 +0000
+++ kodi-audiodecoder-asap-3.0.1/.travis.yml	2013-05-31 22:59:22.000000000 +0000
@@ -3,8 +3,8 @@
 #
 # Define the build matrix
 #
-# Travis defaults to building on Ubuntu Precise when building on
-# Linux. We need Trusty in order to get up to date versions of
+# Travis defaults to building on Ubuntu Trusty when building on
+# Linux. We need Xenial in order to get up to date versions of
 # cmake and g++.
 #
 env:
@@ -21,19 +21,38 @@
       dist: xenial
       sudo: required
       compiler: clang
+    - os: linux
+      dist: bionic
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
+    - os: linux
+      dist: focal
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.2
+
+before_install:
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
 # we'll put the Kodi source on the same level
 #
 before_script:
-  - cd $TRAVIS_BUILD_DIR/..
-  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
-  - cd ${app_id} && mkdir build && cd build
-  - mkdir -p definition/${app_id}
-  - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt
-  - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
+  - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
 
-script: make
+script: 
+  - if [[ $DEBIAN_BUILD != true ]]; then make; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi