Permalink
Browse files

Merge branch 'master' of https://github.com/movAX13h/turrican2tools

  • Loading branch information...
movAX13h committed Nov 2, 2018
2 parents fc5221e + f147ec2 commit 6f62310eee20c23fcf9be71baaa13e8f9bc0a100
@@ -9,6 +9,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TFXTool.TFX;
/* written by srtuss */
@@ -726,7 +727,7 @@ private void Playroutine_MacroStart(object sender, MacroStartEventArgs e)
}
}
private void Playroutine_TrackstepPositionChanged(object sender, EventArgs e)
private void Playroutine_TrackstepPositionChanged2(object sender, EventArgs e)
{
if(lviLastTrackstepHighlight != null)
lviLastTrackstepHighlight.BackColor = Color.White;
@@ -736,6 +737,19 @@ private void Playroutine_TrackstepPositionChanged(object sender, EventArgs e)
item.EnsureVisible();
lviLastTrackstepHighlight = item;
}
private void Playroutine_TrackstepPositionChanged(object sender, EventArgs e)
{
if(InvokeRequired)
{
Invoke(new Action(() => Playroutine_TrackstepPositionChanged2(sender, e)));
}
else
{
Playroutine_TrackstepPositionChanged2(sender, e);
}
}
private void checkBoxChX_CheckedChanged(object sender, EventArgs e)
@@ -2,6 +2,7 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using TFXTool.TFX;
namespace TFXTool
{
@@ -10,7 +10,7 @@
// http://amigadev.elowar.com/read/ADCD_2.1/Hardware_Manual_guide/node0060.html
// http://www.polynominal.com/Commodore-Amiga/commodore-amiga-500-paula.htm
namespace TFXTool
namespace TFXTool.TFX
{
public class PaulaChip : CodeProcessorNode
{
@@ -39,7 +39,7 @@ public PaulaChip(AudioContext audioContext) : base(audioContext)
void ClockChip(float[] addLeft, float[] addRight, int offset, int numFrames)
{
float cpuCyclesPerFrame = 7159091 / 44100f;
float cpuCyclesPerFrame = (float)(7159091 / audioContext.Samplerate);
for(int i = 0; i < numChannels; ++i)
{
@@ -2,7 +2,7 @@
using System;
using System.Windows.Forms;
namespace TFXTool
namespace TFXTool.TFX
{
class Playback
{
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
namespace TFXTool
namespace TFXTool.TFX
{
class Playroutine
{
@@ -38,7 +38,7 @@ public void SetSong(int i)
void Log(string text)
{
Console.WriteLine(text);
//Console.WriteLine(text);
}
/// <summary>
@@ -6,7 +6,7 @@
// specs from:
// ftp://ftp.modland.com/pub/documents/format_documentation/The%20Final%20Musicsystem%20eXtended%20Professional%20v2.0%20%28.mdat,%20.smpl%29.txt
namespace TFXTool
namespace TFXTool.TFX
{
public class TFXFile
{
@@ -61,18 +61,18 @@
<Compile Include="Light.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="PaulaChip.cs" />
<Compile Include="Playback.cs" />
<Compile Include="TFX\PaulaChip.cs" />
<Compile Include="TFX\Playback.cs" />
<Compile Include="PlayerForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="PlayerForm.Designer.cs">
<DependentUpon>PlayerForm.cs</DependentUpon>
</Compile>
<Compile Include="Playroutine.cs" />
<Compile Include="TFX\Playroutine.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TFXFile.cs" />
<Compile Include="TFX\TFXFile.cs" />
<Compile Include="TfmxplayPlayback.cs" />
<EmbeddedResource Include="EditorForm.resx">
<DependentUpon>EditorForm.cs</DependentUpon>
@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TFXTool.TFX;
namespace TFXTool
{

0 comments on commit 6f62310

Please sign in to comment.