Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions Documentation/input/reference/property/playtripletfeel.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Title: PlayTripletFeel
JsName: playTripletFeel
DataAttribute: data-play-triplet-feel
Category: Core
Description: Gets or sets whether in the triplet feel should be applied during playback.
Since: 0.9.5
ShowInSideBar: false
---

<h2>Description</h2>
<p>
If this setting is enabled alphaTab will consider the triplet feel during playback not only for display above the notation.
</p>

<h2>Types</h2>

<table class="table table-striped table-condensed type-table">
<tbody>
<tr>
<td><code>bool</td>
</tr>
</tbody>
</table>

<h2>Default Value</h2>

<code>true<code>

<h2>Example - C#</h2>

<pre>
<code class="language-csharp line-numbers">
var settings = Settings.Defaults;
settings.PlayTripletFeel = false;
</code>
</pre>


<h2>Example - JavaScript</h2>

<pre>
<code class="language-javascript line-numbers">
var settings = {
playTripletFeel: false
};
var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'), settings);
var japi = $('#alphaTab').alphaTab(settings);
</code>
</pre>

<h2>Example - HTML</h2>

<pre>
<code class="language-html line-numbers">
&lt;div id="alphaTab" data-play-triplet-feel="true"&gt;&lt;/div&gt;
</code>
</pre>
2 changes: 1 addition & 1 deletion Phase/Compiler/CopyNewCompiler.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
taskkill /im:msbuild.exe /f
xcopy D:\Dev\C#\Projects\Phase.netstandard\Phase.MsBuild\bin\Debug\net471\* . /Y
xcopy D:\Dev\CSharp\Phase.netstandard\Phase.MsBuild\bin\Debug\net48\* . /Y
Binary file modified Phase/Compiler/Microsoft.Build.Framework.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.Build.Tasks.Core.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.Build.Utilities.Core.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.Build.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.CodeAnalysis.CSharp.Workspaces.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.CodeAnalysis.CSharp.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.CodeAnalysis.VisualBasic.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.CodeAnalysis.Workspaces.dll
Binary file not shown.
Binary file modified Phase/Compiler/Microsoft.CodeAnalysis.dll
Binary file not shown.
Binary file modified Phase/Compiler/Mono.Cecil.Mdb.dll
Binary file not shown.
Binary file modified Phase/Compiler/Mono.Cecil.Pdb.dll
Binary file not shown.
Binary file modified Phase/Compiler/Mono.Cecil.Rocks.dll
Binary file not shown.
Binary file modified Phase/Compiler/Mono.Cecil.dll
Binary file not shown.
Binary file modified Phase/Compiler/NLog.dll
Binary file not shown.
Binary file modified Phase/Compiler/Newtonsoft.Json.dll
Binary file not shown.
Binary file modified Phase/Compiler/Phase.Core.dll
Binary file not shown.
Binary file modified Phase/Compiler/Phase.Core.pdb
Binary file not shown.
Binary file modified Phase/Compiler/Phase.MsBuild.dll
Binary file not shown.
Binary file modified Phase/Compiler/Phase.MsBuild.pdb
Binary file not shown.
Binary file modified Phase/Compiler/Phase.Translator.dll
Binary file not shown.
Binary file modified Phase/Compiler/Phase.Translator.pdb
Binary file not shown.
Binary file added Phase/Compiler/System.Buffers.dll
Binary file not shown.
Binary file modified Phase/Compiler/System.Collections.Immutable.dll
Binary file not shown.
Binary file added Phase/Compiler/System.Memory.dll
Binary file not shown.
Binary file added Phase/Compiler/System.Numerics.Vectors.dll
Binary file not shown.
Binary file added Phase/Compiler/System.Resources.Extensions.dll
Binary file not shown.
Binary file not shown.
Binary file modified Phase/Compiler/System.Text.Encoding.CodePages.dll
Binary file not shown.
Binary file modified Phase/Compiler/System.Threading.Tasks.Dataflow.dll
Binary file not shown.
Binary file modified Phase/Compiler/System.Threading.Tasks.Extensions.dll
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand All @@ -15,4 +15,4 @@
<ItemGroup>
<ProjectReference Include="..\..\..\Source\AlphaTab.CSharp\AlphaTab.CSharp.csproj" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<OutputType>WinExe</OutputType>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
</PropertyGroup>
Expand All @@ -20,4 +20,4 @@
<ItemGroup>
<ProjectReference Include="..\..\..\Source\AlphaTab.CSharp\AlphaTab.CSharp.csproj" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<OutputType>WinExe</OutputType>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
</PropertyGroup>
Expand All @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
Expand All @@ -37,4 +37,4 @@
<Resource Include="Images\32\information.png" />
</ItemGroup>

</Project>
</Project>
8 changes: 4 additions & 4 deletions Source/AlphaTab.CSharp/AlphaTab.CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<RootNamespace>AlphaTab</RootNamespace>
<AssemblyName>AlphaTab</AssemblyName>
<PackageId>AlphaTab</PackageId>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DocumentationFile>$(OutDir)$(AssemblyName).xml</DocumentationFile>
<NoWarn>$(NoWarn);0162</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net48'">
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
<ExtrasEnableUserControlDesigner>true</ExtrasEnableUserControlDesigner>
Expand All @@ -28,7 +28,7 @@
<EmbeddedResource Include="..\..\Font\bravura\ttf\Bravura.ttf" Link="Platform\CSharp\Bravura.ttf" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
Expand Down Expand Up @@ -61,4 +61,4 @@
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="xcopy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)Build\CSharp\$(TargetFramework)\&quot; /Y&#xD;&#xA;xcopy &quot;$(OutDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)Build\CSharp\$(TargetFramework)\&quot; /Y&#xD;&#xA;xcopy &quot;$(OutDir)$(TargetName).xml&quot; &quot;$(SolutionDir)Build\CSharp\$(TargetFramework)\&quot; /Y" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion Source/AlphaTab.CSharp/Environment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal partial class Environment
private static void PlatformInit()
{
RenderEngines["svg"] = new RenderEngineFactory(true, () => new CssFontSvgCanvas());
#if NET472
#if NET48
RenderEngines["gdi"] = new RenderEngineFactory(true, () => new GdiCanvas());
#endif
RenderEngines["skia"] = new RenderEngineFactory(true, () => new SkiaCanvas());
Expand Down
4 changes: 2 additions & 2 deletions Source/AlphaTab.CSharp/IO/ZipFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal partial class ZipFile
/// <returns></returns>
public void Load(IReadable s)
{
#if NET472 || NETSTANDARD2_0
#if NET48 || NETSTANDARD2_0
using (var zipArchive = new System.IO.Compression.ZipArchive(ReadableStream.Create(s),
System.IO.Compression.ZipArchiveMode.Read))
{
Expand Down Expand Up @@ -57,7 +57,7 @@ public void Load(IReadable s)
}
}
}

}
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion Source/AlphaTab.CSharp/Platform/CSharp/GdiCanvas.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using AlphaTab.Rendering;
using AlphaTab.Rendering.Glyphs;
using AlphaTab.Rendering.Utils;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System;
using System.Drawing;
using System.Windows.Forms;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System.Drawing;
using System.Drawing.Imaging;
using SkiaSharp;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System.Windows.Forms;
using AlphaTab.UI;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

using AlphaTab.Importer;
using AlphaTab.Model;
#if NET472
#if NET48
using System;
using System.Collections.Concurrent;
using System.Drawing;
Expand Down
2 changes: 1 addition & 1 deletion Source/AlphaTab.CSharp/Platform/CSharp/Wpf/AlphaTab.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System.Windows;
using System.Windows.Controls;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System;
using System.Windows;
using System.Windows.Controls;
Expand Down
4 changes: 2 additions & 2 deletions Source/AlphaTab.CSharp/Platform/CSharp/Wpf/GdiImageSource.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#if NET472
#if NET48
using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Media;
using System.Windows.Media.Imaging;

namespace AlphaTab.Platform.CSharp.Wpf
{
internal class GdiImageSource
internal class GdiImageSource
{
public static BitmapSource Create(Bitmap image)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System;
using AlphaTab.Audio.Synth;
using AlphaTab.Audio.Synth.Ds;
Expand Down
4 changes: 2 additions & 2 deletions Source/AlphaTab.CSharp/Platform/CSharp/Wpf/SkImageSource.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#if NET472
#if NET48
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using SkiaSharp;

namespace AlphaTab.Platform.CSharp.Wpf
{
internal class SkImageSource
internal class SkImageSource
{
public static BitmapSource Create(object data)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System.Windows.Input;
using AlphaTab.UI;

Expand Down
2 changes: 1 addition & 1 deletion Source/AlphaTab.CSharp/Platform/CSharp/Wpf/WpfUiFacade.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET472
#if NET48
using System;
using System.Collections.Concurrent;
using System.IO;
Expand Down
4 changes: 2 additions & 2 deletions Source/AlphaTab.JavaScript/AlphaTab.JavaScript.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PackageId>AlphaTab.JavaScript</PackageId>
<RootNamespace>AlphaTab</RootNamespace>
<AssemblyName>AlphaTab.JavaScript</AssemblyName>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<NoWarn>$(NoWarn);0626;0824</NoWarn>
<DefineConstants>$(DefineConstants);JavaScript</DefineConstants>
</PropertyGroup>
Expand All @@ -21,4 +21,4 @@
<Import Project="..\AlphaTab\AlphaTab.Shared.projitems" Label="Shared" />
<Import Project="..\..\Phase\Compiler\Phase.Build.targets" />

</Project>
</Project>
10 changes: 10 additions & 0 deletions Source/AlphaTab.JavaScript/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ public dynamic ToJson()

json.includeNoteBounds = IncludeNoteBounds;

json.playTripletFeel = PlayTripletFeel;
json.vibrato = Platform.Platform.NewObject();
json.noteSlightAmplitude = Vibrato.NoteSlightAmplitude;
json.noteWideAmplitude = Vibrato.NoteWideAmplitude;
Expand Down Expand Up @@ -521,6 +522,15 @@ public static void FillFromJson(Settings settings, dynamic json, FastDictionary<
settings.IncludeNoteBounds = (bool)dataAttributes["includeNoteBounds"];
}

if (Platform.Platform.JsonExists(json, "playTripletFeel"))
{
settings.PlayTripletFeel = json.playTripletFeel;
}
else if (dataAttributes != null && dataAttributes.ContainsKey("playTripletFeel"))
{
settings.PlayTripletFeel = (bool)dataAttributes["playTripletFeel"];
}

if (Platform.Platform.JsonExists(json, "vibrato"))
{
var vibrato = json.vibrato;
Expand Down
4 changes: 2 additions & 2 deletions Source/AlphaTab.Test.CSharp/AlphaTab.Test.CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>AlphaTab.Test.CSharp</RootNamespace>
<AssemblyName>AlphaTab.Test.CSharp</AssemblyName>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<PackageId>AlphaTab.Test.CSharp</PackageId>
<NoWarn>$(NoWarn);0626;0824</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down Expand Up @@ -36,4 +36,4 @@
<Copy SourceFiles="@(TestData)" DestinationFiles="@(TestData->'$(ProjectDir)$(OutDir)TestFiles\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>

</Project>
</Project>
4 changes: 2 additions & 2 deletions Source/AlphaTab.Test.Js/AlphaTab.Test.Js.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>AlphaTab.Test.Js</RootNamespace>
<AssemblyName>AlphaTab.Test.Js</AssemblyName>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net48</TargetFramework>
<NoWarn>$(NoWarn);0626;0824</NoWarn>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
Expand Down Expand Up @@ -37,4 +37,4 @@

<Import Project="..\..\Phase\Compiler\Phase.Build.targets" />

</Project>
</Project>
5 changes: 5 additions & 0 deletions Source/AlphaTab.Test.Js/test/alphaTab.tests.specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ describe("alphaTab.test.audio.MidiFileGeneratorTest", function() {
__instance.testBendMultiPoint();
done();
});
it("testTripletFeel", function(done) {
alphaTab.test.TestPlatform.Done = done;
__instance.testTripletFeel();
done();
});
});
describe("alphaTab.test.audio.MidiPlaybackControllerTest", function() {
var __instance = new alphaTab.test.audio.MidiPlaybackControllerTest();
Expand Down
Loading