Skip to content

Commit 332d4a0

Browse files
AugustoRuizAugustoRuiz
committed
Version 2.0.1.20
1 parent 7a91292 commit 332d4a0

File tree

20 files changed

+330
-164
lines changed

20 files changed

+330
-164
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,3 +210,4 @@ FakesAssemblies/
210210
GeneratedArtifacts/
211211
_Pvt_Extensions/
212212
ModelManifest.xml
213+
/songs/Gryzor

‎FileAssociation/FileAssociation.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,19 @@
119119
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
120120
<Prefer32Bit>false</Prefer32Bit>
121121
</PropertyGroup>
122+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
123+
<PlatformTarget>x64</PlatformTarget>
124+
<OutputPath>bin\x64\Debug\</OutputPath>
125+
</PropertyGroup>
126+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
127+
<PlatformTarget>x64</PlatformTarget>
128+
<OutputPath>bin\x64\Release\</OutputPath>
129+
<Optimize>true</Optimize>
130+
</PropertyGroup>
131+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Install|x64'">
132+
<PlatformTarget>x64</PlatformTarget>
133+
<OutputPath>bin\x64\Install\</OutputPath>
134+
</PropertyGroup>
122135
<ItemGroup>
123136
<Reference Include="System" />
124137
<Reference Include="System.Data" />

‎LibAYEmu/LibAYEmu.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,19 @@
164164
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
165165
<Prefer32Bit>false</Prefer32Bit>
166166
</PropertyGroup>
167+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
168+
<PlatformTarget>x64</PlatformTarget>
169+
<OutputPath>bin\x64\Debug\</OutputPath>
170+
</PropertyGroup>
171+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
172+
<PlatformTarget>x64</PlatformTarget>
173+
<OutputPath>bin\x64\Release\</OutputPath>
174+
<Optimize>true</Optimize>
175+
</PropertyGroup>
176+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Install|x64'">
177+
<PlatformTarget>x64</PlatformTarget>
178+
<OutputPath>bin\x64\Install\</OutputPath>
179+
</PropertyGroup>
167180
<ItemGroup>
168181
<Reference Include="System">
169182
<Name>System</Name>

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# WYZTracker Manual
22
![alt text](https://raw.githubusercontent.com/AugustoRuiz/WYZTracker/master/docs/imgs/banner.png "WYZTracker Logo")
33
## Introduction
4-
WYZTracker is a tool developed by Augusto Ruiz, from Retroworks, that can be used to compose music for [WYZ's Player](https://sites.google.com/site/wyzplayer/).
4+
WYZTracker is a tool developed by Augusto Ruiz, from Retroworks, that can be used to compose music for [WYZ's Player](https://github.com/AugustoRuiz/WYZPlayer).
5+
6+
### An important note:
7+
WYZTracker requires OpenAL. [Windows Installer is here](https://www.openal.org/downloads/oalinst.zip).
58

69
New player features:
710
* Song can loop to an specific pattern.

‎Sanford.Multimedia.Midi/Sanford.Multimedia.Midi.csproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,36 @@
7979
<ErrorReport>prompt</ErrorReport>
8080
<Prefer32Bit>false</Prefer32Bit>
8181
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
83+
<DebugSymbols>true</DebugSymbols>
84+
<OutputPath>bin\x86\Debug\</OutputPath>
85+
<DefineConstants>DEBUG;TRACE</DefineConstants>
86+
<BaseAddress>285212672</BaseAddress>
87+
<FileAlignment>4096</FileAlignment>
88+
<DebugType>full</DebugType>
89+
<PlatformTarget>x86</PlatformTarget>
90+
<LangVersion>7.3</LangVersion>
91+
<ErrorReport>prompt</ErrorReport>
92+
</PropertyGroup>
93+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
94+
<OutputPath>bin\x86\Release\</OutputPath>
95+
<DefineConstants>DEBUG;TRACE</DefineConstants>
96+
<BaseAddress>285212672</BaseAddress>
97+
<Optimize>true</Optimize>
98+
<FileAlignment>4096</FileAlignment>
99+
<PlatformTarget>x86</PlatformTarget>
100+
<LangVersion>7.3</LangVersion>
101+
<ErrorReport>prompt</ErrorReport>
102+
</PropertyGroup>
103+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
104+
<PlatformTarget>x64</PlatformTarget>
105+
<OutputPath>bin\x64\Debug\</OutputPath>
106+
</PropertyGroup>
107+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
108+
<PlatformTarget>x64</PlatformTarget>
109+
<OutputPath>bin\x64\Release\</OutputPath>
110+
<Optimize>true</Optimize>
111+
</PropertyGroup>
82112
<ItemGroup>
83113
<Reference Include="Sanford.Collections, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
84114
<SpecificVersion>False</SpecificVersion>

‎Sanford.Multimedia.Midi/Sequencing/Track Classes/Track.cs‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,17 @@ public void Merge(Track trk)
268268

269269
#region Ensure
270270

271+
#if (DEBUG)
271272
Debug.Assert(count == oldCount + trk.Count - 1);
273+
#endif
272274

273-
#endregion
275+
#endregion
274276

275-
#region Invariant
277+
#region Invariant
276278

277279
AssertValid();
278280

279-
#endregion
281+
#endregion
280282
}
281283

282284
/// <summary>
@@ -287,7 +289,7 @@ public void Merge(Track trk)
287289
/// </param>
288290
public void RemoveAt(int index)
289291
{
290-
#region Require
292+
#region Require
291293

292294
if(index < 0)
293295
{
@@ -298,7 +300,7 @@ public void RemoveAt(int index)
298300
throw new ArgumentException("Cannot remove the end of track event.", "index");
299301
}
300302

301-
#endregion
303+
#endregion
302304

303305
MidiEvent current = GetMidiEvent(index);
304306

@@ -331,11 +333,11 @@ public void RemoveAt(int index)
331333

332334
count--;
333335

334-
#region Invariant
336+
#region Invariant
335337

336338
AssertValid();
337339

338-
#endregion
340+
#endregion
339341
}
340342

341343
/// <summary>
@@ -349,15 +351,15 @@ public void RemoveAt(int index)
349351
/// </returns>
350352
public MidiEvent GetMidiEvent(int index)
351353
{
352-
#region Require
354+
#region Require
353355

354356
if(index < 0 || index >= Count)
355357
{
356358
throw new ArgumentOutOfRangeException("index", index,
357359
"Track index out of range.");
358360
}
359361

360-
#endregion
362+
#endregion
361363

362364
MidiEvent result;
363365

@@ -387,9 +389,9 @@ public MidiEvent GetMidiEvent(int index)
387389
}
388390
}
389391

390-
#region Ensure
392+
#region Ensure
391393

392-
#if(DEBUG)
394+
#if (DEBUG)
393395
if(index == Count - 1)
394396
{
395397
Debug.Assert(result.AbsoluteTicks == Length);
@@ -408,14 +410,14 @@ public MidiEvent GetMidiEvent(int index)
408410
}
409411
#endif
410412

411-
#endregion
413+
#endregion
412414

413415
return result;
414416
}
415417

416418
public void Move(MidiEvent e, int newPosition)
417419
{
418-
#region Require
420+
#region Require
419421

420422
if(e.Owner != this)
421423
{
@@ -431,7 +433,7 @@ public void Move(MidiEvent e, int newPosition)
431433
"Cannot move end of track message. Use the EndOfTrackOffset property instead.");
432434
}
433435

434-
#endregion
436+
#endregion
435437

436438
MidiEvent previous = e.Previous;
437439
MidiEvent next = e.Next;
@@ -494,11 +496,11 @@ public void Move(MidiEvent e, int newPosition)
494496
endOfTrackMidiEvent.SetAbsoluteTicks(Length);
495497
endOfTrackMidiEvent.Previous = tail;
496498

497-
#region Invariant
499+
#region Invariant
498500

499501
AssertValid();
500502

501-
#endregion
503+
#endregion
502504
}
503505

504506
[Conditional("DEBUG")]
@@ -534,9 +536,9 @@ private void AssertValid()
534536
Debug.Assert(c == Count, "Count mismatch");
535537
}
536538

537-
#endregion
539+
#endregion
538540

539-
#region Properties
541+
#region Properties
540542

541543
/// <summary>
542544
/// Gets the number of MidiEvents in the Track.
@@ -578,15 +580,15 @@ public int EndOfTrackOffset
578580
}
579581
set
580582
{
581-
#region Require
583+
#region Require
582584

583585
if(value < 0)
584586
{
585587
throw new ArgumentOutOfRangeException("EndOfTrackOffset", value,
586588
"End of track offset out of range.");
587589
}
588590

589-
#endregion
591+
#endregion
590592

591593
endOfTrackOffset = value;
592594

@@ -605,8 +607,8 @@ public object SyncRoot
605607
}
606608
}
607609

608-
#endregion
610+
#endregion
609611

610-
#endregion
612+
#endregion
611613
}
612614
}

‎WYZPlayer/WYZPlayer.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,33 @@
3535
<WarningLevel>4</WarningLevel>
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
39+
<DebugSymbols>true</DebugSymbols>
40+
<OutputPath>bin\Debug\</OutputPath>
41+
<DefineConstants>DEBUG;TRACE</DefineConstants>
42+
<DebugType>full</DebugType>
43+
<PlatformTarget>AnyCPU</PlatformTarget>
44+
<LangVersion>7.3</LangVersion>
45+
<ErrorReport>prompt</ErrorReport>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
48+
<OutputPath>bin\Release\</OutputPath>
49+
<DefineConstants>TRACE</DefineConstants>
50+
<Optimize>true</Optimize>
51+
<DebugType>pdbonly</DebugType>
52+
<PlatformTarget>AnyCPU</PlatformTarget>
53+
<LangVersion>7.3</LangVersion>
54+
<ErrorReport>prompt</ErrorReport>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
57+
<PlatformTarget>x64</PlatformTarget>
58+
<OutputPath>bin\x64\Debug\</OutputPath>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
61+
<PlatformTarget>x64</PlatformTarget>
62+
<OutputPath>bin\x64\Release\</OutputPath>
63+
<Optimize>true</Optimize>
64+
</PropertyGroup>
3865
<ItemGroup>
3966
<Reference Include="System" />
4067
<Reference Include="System.Data" />

‎WYZTracker.Core/Model/ChannelNote.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public SByte? VolModifier
115115

116116
public void Transpose(int semitones, int currentOctave)
117117
{
118-
if (this.HasNote)
118+
if (this.HasNote && this.Note != 'P')
119119
{
120120
int currentValue = this.GetNote();
121121
if (currentValue >= 0)
@@ -141,15 +141,15 @@ public void Transpose(int semitones, int currentOctave)
141141
if (octaveOffset != 0)
142142
{
143143
int newOctave = currentOctave + octaveOffset;
144-
if(newOctave <= MIN_OCTAVE)
144+
if (newOctave <= MIN_OCTAVE)
145145
{
146146
newOctave = MIN_OCTAVE + 1;
147147
}
148-
if(newOctave > MAX_OCTAVE)
148+
if (newOctave > MAX_OCTAVE)
149149
{
150150
newOctave = MAX_OCTAVE;
151151
}
152-
if(newOctave != currentOctave)
152+
if (newOctave != currentOctave)
153153
{
154154
this.Octave = newOctave;
155155
}

‎WYZTracker.Core/WYZTracker.Core.csproj‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25-
<PlatformTarget>x86</PlatformTarget>
25+
<PlatformTarget>AnyCPU</PlatformTarget>
2626
<Prefer32Bit>false</Prefer32Bit>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,8 +32,36 @@
3232
<DefineConstants>TRACE</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
35-
<PlatformTarget>x86</PlatformTarget>
35+
<PlatformTarget>AnyCPU</PlatformTarget>
3636
<Prefer32Bit>false</Prefer32Bit>
37+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
40+
<DebugSymbols>true</DebugSymbols>
41+
<OutputPath>bin\x86\Debug\</OutputPath>
42+
<DefineConstants>DEBUG;TRACE</DefineConstants>
43+
<DebugType>full</DebugType>
44+
<PlatformTarget>x86</PlatformTarget>
45+
<LangVersion>7.3</LangVersion>
46+
<ErrorReport>prompt</ErrorReport>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
49+
<OutputPath>bin\x86\Release\</OutputPath>
50+
<DefineConstants>TRACE</DefineConstants>
51+
<Optimize>true</Optimize>
52+
<DebugType>pdbonly</DebugType>
53+
<PlatformTarget>x86</PlatformTarget>
54+
<LangVersion>7.3</LangVersion>
55+
<ErrorReport>prompt</ErrorReport>
56+
</PropertyGroup>
57+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
58+
<PlatformTarget>x64</PlatformTarget>
59+
<OutputPath>bin\x64\Debug\</OutputPath>
60+
</PropertyGroup>
61+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
62+
<PlatformTarget>x64</PlatformTarget>
63+
<OutputPath>bin\x64\Release\</OutputPath>
64+
<Optimize>true</Optimize>
3765
</PropertyGroup>
3866
<ItemGroup>
3967
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">

‎WYZTracker.Wpf/WYZTracker.Wpf.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@
5555
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5656
<Prefer32Bit>true</Prefer32Bit>
5757
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
59+
<PlatformTarget>x64</PlatformTarget>
60+
<OutputPath>bin\x64\Debug\</OutputPath>
61+
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
63+
<PlatformTarget>x64</PlatformTarget>
64+
<OutputPath>bin\x64\Release\</OutputPath>
65+
<Optimize>true</Optimize>
66+
</PropertyGroup>
5867
<ItemGroup>
5968
<Reference Include="System" />
6069
<Reference Include="System.Data" />

0 commit comments

Comments
 (0)