Release 1.1 (#444)

Author: Danielku15

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderline/alphatab",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "alphaTab is a music notation and guitar tablature rendering library",
   "keywords": [
     "guitar",
@@ -30,7 +30,7 @@
     "lint": "tslint --project tsconfig.build.json -t codeFrame 'src/**/*.ts' 'test/**/*.ts'",
     "build": "ttsc --project tsconfig.build.json && rollup -c rollup.config.js",
     "build-ci": "npm run clean && npm run build && npm pack",
-    "start": "node scripts/setup-playground.js && npm run build && concurrently --kill-others \"ttsc --project tsconfig.build.json --watch\" \"rollup -c rollup.config.js -w\" \"http-server -o playground/control.html \"",
+    "start": "node scripts/setup-playground.js && npm run build && concurrently --kill-others \"ttsc --project tsconfig.build.json --watch\" \"rollup -c rollup.config.js -w\"",
     "test": "ttsc --project tsconfig.json && concurrently --kill-others \"ttsc --project tsconfig.json -w\" \"karma start karma.conf.js --browsers Chrome --no-single-run --reporters spec,kjhtml\"",
     "test-ci": "ttsc --project tsconfig.json && karma start karma.conf.js --browsers ChromeHeadless --single-run --reporters spec",
     "generate-csharp": "ts-node --project tsconfig.build-csharp.json src.compiler/csharp/CSharpTranspiler.ts --project tsconfig.build-csharp.json",
@@ -40,35 +40,35 @@
     "test-csharp-ci": "cd src.csharp && dotnet test"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@types/jasmine": "^3.5.11",
-    "concurrently": "^5.2.0",
+    "@rollup/plugin-commonjs": "^16.0.0",
+    "@types/jasmine": "^3.6.1",
+    "concurrently": "^5.3.0",
     "cors": "^2.8.5",
     "fs-extra": "^9.0.1",
     "git-branch": "^2.0.1",
-    "http-server": "^0.12.3",
-    "karma": "^5.1.0",
+    "karma": "^5.2.3",
     "karma-chrome-launcher": "^3.1.0",
     "karma-express-http-server": "0.0.1",
-    "karma-jasmine": "^3.3.1",
+    "karma-jasmine": "^4.0.1",
     "karma-jasmine-html-reporter": "^1.5.4",
     "karma-rollup-preprocessor": "^7.0.5",
     "karma-spec-reporter": "0.0.32",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.20",
     "multer": "^1.4.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.21.0",
+    "rollup": "^2.33.1",
     "rollup-plugin-copy": "^3.3.0",
-    "rollup-plugin-dts": "^1.4.8",
-    "rollup-plugin-license": "^2.1.0",
-    "rollup-plugin-terser": "^6.1.0",
-    "terser": "^4.8.0",
-    "ts-node": "^8.10.2",
-    "tslint": "^6.1.2",
+    "rollup-plugin-dts": "^1.4.13",
+    "rollup-plugin-license": "^2.2.0",
+    "rollup-plugin-serve": "^1.1.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "terser": "^5.3.8",
+    "ts-node": "^9.0.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0",
     "tslint-config-standard": "^9.0.0",
-    "ttypescript": "^1.5.10",
-    "typescript": "^3.9.6"
+    "ttypescript": "^1.5.12",
+    "typescript": "^4.0.5"
   },
   "files": [
     "/dist/alphaTab.js",

package.json

@@ -88,6 +88,9 @@
             </div>
 
             <div class="at-player-right">
+                <a href="#" class="at-count-in disabled" data-toggle="tooltip" data-placement="top" title="Count-In">
+                    <i class="fas fa-hourglass-half"></i>
+                </a>
                 <a href="#" class="at-metronome disabled" data-toggle="tooltip" data-placement="top" title="Metronome">
                     <i class="fas fa-edit"></i>
                 </a>

playground-template/control-template.html

@@ -201,6 +201,17 @@ function setupControl(selector) {
         }
     };
 
+    control.querySelector('.at-count-in').onclick = function (e) {
+        e.stopPropagation();
+        const link = e.target.closest('a');
+        link.classList.toggle('active');
+        if (link.classList.contains('active')) {
+            at.countInVolume = 1;
+        } else {
+            at.countInVolume = 0;
+        }
+    };
+
     control.querySelectorAll('.at-speed-options a').forEach(function (a) {
         a.onclick = function (e) {
             e.preventDefault();

playground-template/control.js

@@ -4,6 +4,7 @@ const dts = require('rollup-plugin-dts').default;
 const copy = require('rollup-plugin-copy');
 const branch = require('git-branch');
 const license = require('rollup-plugin-license');
+const serve = require('rollup-plugin-serve');
 
 const commonOutput = {
     name: 'alphaTab',
@@ -13,6 +14,8 @@ const commonOutput = {
     }
 };
 
+const isWatch = process.env.ROLLUP_WATCH;
+
 module.exports = [
     {
         input: `dist/lib/alphatab.js`,
@@ -59,6 +62,13 @@ module.exports = [
                 mappings: {
                     '@src': 'dist/lib'
                 }
+            }),
+
+            isWatch && serve({
+                open: true,
+                openPage: '/playground/control.html',
+                contentBase: '', 
+                port: 8080
             })
         ]
     },

rollup.config.js

@@ -2,4 +2,4 @@ const fs = require('fs-extra');
 
 const src = `${__dirname}/../playground-template`
 const dest = `${__dirname}/../playground`
-fs.copySync(src, dest);
+fs.copySync(src, dest, { overwrite: false });

scripts/setup-playground.js

@@ -15,8 +15,10 @@ function getTypeWithNullableInfo(checker: ts.TypeChecker, node: ts.TypeNode) {
         for (const t of node.types) {
             if (t.kind === ts.SyntaxKind.NullKeyword) {
                 isNullable = true;
+            } else if (ts.isLiteralTypeNode(t) && t.literal.kind === ts.SyntaxKind.NullKeyword) {
+                isNullable = true;
             } else if (type !== null) {
-                throw new Error('Multi union types on JSON settings not supported!');
+                throw new Error('Multi union types on JSON settings not supported: ' + node.getSourceFile().fileName + ':' + node.getText());
             } else {
                 type = checker.getTypeAtLocation(t);
             }

src.compiler/JsonSerializationBuilder.ts

@@ -495,6 +495,8 @@ export default class CSharpAstTransformer {
                 }
             } else if (ts.isVariableStatement(s)) {
                 this.visitTestClassProperty(csClass, s);
+            } else if (ts.isFunctionDeclaration(s)) {
+                this.visitTestClassMethod(csClass, s);
             } else {
                 this._context.addTsNodeDiagnostics(
                     s,
@@ -507,6 +509,40 @@ export default class CSharpAstTransformer {
         this._csharpFile.namespace.declarations.push(csClass);
     }
 
+    private visitTestClassMethod(parent: cs.ClassDeclaration, d: ts.FunctionDeclaration) {
+        const signature = this._context.typeChecker.getSignatureFromDeclaration(d);
+        const returnType = this._context.typeChecker.getReturnTypeOfSignature(signature!);
+
+        const csMethod: cs.MethodDeclaration = {
+            parent: parent,
+            nodeType: cs.SyntaxKind.MethodDeclaration,
+            isAbstract: false,
+            isOverride: false,
+            isStatic: false,
+            isVirtual: false,
+            name: this._context.toPascalCase((d.name as ts.Identifier).text),
+            parameters: [],
+            returnType: this.createUnresolvedTypeNode(null, d.type ?? d, returnType),
+            visibility: this.mapVisibility(d.modifiers),
+            tsNode: d,
+            skipEmit: this.shouldSkip(d)
+        };
+        csMethod.isAsync =
+            !!d.modifiers &&
+            !!d.modifiers.find(m => m.kind === ts.SyntaxKind.AsyncKeyword);
+
+        const type = this._context.typeChecker.getTypeAtLocation(d.name!);
+        csMethod.returnType.parent = csMethod;
+
+        d.parameters.forEach(p => csMethod.parameters.push(this.makeParameter(csMethod, p)));
+        this._declarationOrAssignmentTypeStack.push(type);
+        csMethod.body = this.visitBlock(csMethod, d.body as ts.Block);
+        this._declarationOrAssignmentTypeStack.pop();
+
+        parent.members.push(csMethod);
+        this._context.registerSymbol(csMethod);
+    }
+
     private visitTestMethod(parent: cs.ClassDeclaration, d: ts.CallExpression) {
         const csMethod: cs.MethodDeclaration = {
             parent: parent,

src.compiler/csharp/CSharpAstTransformer.ts

@@ -18,7 +18,6 @@ public class NAudioSynthOutput : WaveProvider32, ISynthOutput, IDisposable
 
         private DirectSoundOut _context;
         private CircularSampleBuffer _circularBuffer;
-        private bool _finished;
 
         /// <inheritdoc />
         public double SampleRate => PreferredSampleRate;
@@ -42,7 +41,6 @@ public void Activate()
         /// <inheritdoc />
         public void Open()
         {
-            _finished = false;
             _circularBuffer = new CircularSampleBuffer(BufferSize * BufferCount);
 
             _context = new DirectSoundOut(100);
@@ -62,7 +60,6 @@ public void Dispose()
         /// </summary>
         public void Close()
         {
-            _finished = true;
             _context.Stop();
             _circularBuffer.Clear();
             _context.Dispose();
@@ -72,7 +69,6 @@ public void Close()
         public void Play()
         {
             RequestBuffers();
-            _finished = false;
             _context.Play();
         }
 
@@ -82,12 +78,6 @@ public void Pause()
             _context.Pause();
         }
 
-        /// <inheritdoc />
-        public void SequencerFinished()
-        {
-            _finished = true;
-        }
-
         /// <inheritdoc />
         public void AddSamples(Float32Array f)
         {
@@ -117,29 +107,16 @@ private void RequestBuffers()
         /// <inheritdoc />
         public override int Read(float[] buffer, int offset, int count)
         {
-            if (_circularBuffer.Count < count)
-            {
-                if (_finished)
-                {
-                    ((EventEmitter) Finished).Trigger();
-                }
-            }
-            else
-            {
-                var read = new Float32Array(count);
-                _circularBuffer.Read(read, 0, read.Length);
+            var read = new Float32Array(count);
+            _circularBuffer.Read(read, 0, System.Math.Min(read.Length, _circularBuffer.Count));
 
-                Buffer.BlockCopy(read.Data, 0, buffer, offset * sizeof(float),
-                    count * sizeof(float));
+            Buffer.BlockCopy(read.Data, 0, buffer, offset * sizeof(float),
+                count * sizeof(float));
 
-                var samples = count / 2;
-                ((EventEmitterOfT<double>) SamplesPlayed).Trigger(samples);
-            }
+            var samples = count / 2;
+            ((EventEmitterOfT<double>) SamplesPlayed).Trigger(samples);
 
-            if (!_finished)
-            {
-                RequestBuffers();
-            }
+            RequestBuffers();
 
             return count;
         }
@@ -152,8 +129,5 @@ public override int Read(float[] buffer, int offset, int count)
 
         /// <inheritdoc />
         public IEventEmitter SampleRequest { get; } = new EventEmitter();
-
-        /// <inheritdoc />
-        public IEventEmitter Finished { get; } = new EventEmitter();
     }
 }

src.csharp/AlphaTab.Windows/NAudioSynthOutput.cs

@@ -4,6 +4,7 @@ namespace AlphaTab.Core
 {
     public static class Globals
     {
+        public const double NaN = double.NaN;
         public static Console Console { get; } = new Console();
 
         public static double ParseInt(string s)