Skip to content

Commit 3d275ed

Browse files
authored
Merge pull request #14 from MrRedBeard/Release
Prep for release v0.2.2
2 parents e465e8b + 4751b6a commit 3d275ed

File tree

16 files changed

+3096
-19
lines changed

16 files changed

+3096
-19
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# User-specific files (MonoDevelop/Xamarin Studio)
1111
*.userprefs
1212

13+
# Release
14+
/release
15+
1316
# Build results
1417
[Dd]ebug/
1518
[Dd]ebugPublic/

MusicXMLParser.exe

-185 KB
Binary file not shown.

MusicXMLParser/MainForm.Designer.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MusicXMLParser/MainForm.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
63
using System.IO;
74
using System.Linq;
8-
using System.Reflection;
9-
using System.Text;
105
using System.Threading;
116
using System.Windows.Forms;
127
using System.Xml;
138
using System.IO.Compression;
14-
using System.Media;
15-
using System.Runtime.InteropServices;
169
using NAudio.Wave.SampleProviders;
1710
using NAudio.Wave;
1811

@@ -25,16 +18,16 @@ namespace MusicXMLParser
2518
/// C# conversion found here:
2619
/// https://github.com/MrRedBeard/DotNet-MXL-Parsing-for-Arduino
2720
///
28-
/// Refactored and updated here:
29-
/// https://github.com/DavidWeed/DotNet-MXL-Parsing-for-Arduino
21+
/// Contribution:
22+
/// https://github.com/DavidWeed/
23+
///
24+
/// Bounty:
25+
/// https://github.com/Tom-Neverwinter
3026
/// </summary>
31-
27+
3228

3329
public partial class FormMain : Form
3430
{
35-
[DllImport("kernel32.dll")]
36-
private static extern bool Beep(int frequency, int duration);
37-
3831
private Thread SoundPlayThread;
3932
private CancellationTokenSource stopSoundPlay;
4033

MusicXMLParser/MainForm.resx

Lines changed: 3046 additions & 0 deletions
Large diffs are not rendered by default.

MusicXMLParser/MusicXMLParser.csproj

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<PropertyGroup>
3737
<StartupObject>MusicXMLParser.Program</StartupObject>
3838
</PropertyGroup>
39+
<PropertyGroup>
40+
<ApplicationIcon>logo.ico</ApplicationIcon>
41+
</PropertyGroup>
3942
<ItemGroup>
4043
<Reference Include="Microsoft.Win32.Registry, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4144
<HintPath>..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
@@ -65,12 +68,6 @@
6568
<Reference Include="System.Core" />
6669
<Reference Include="System.IO.Compression" />
6770
<Reference Include="System.IO.Compression.FileSystem" />
68-
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69-
<HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
70-
</Reference>
71-
<Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<HintPath>..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
73-
</Reference>
7471
<Reference Include="System.Xml.Linq" />
7572
<Reference Include="System.Data.DataSetExtensions" />
7673
<Reference Include="Microsoft.CSharp" />
@@ -124,6 +121,16 @@
124121
<ItemGroup>
125122
<None Include="Resources\bg-spinner.gif" />
126123
</ItemGroup>
124+
<ItemGroup>
125+
<None Include="Resources\logo.bmp" />
126+
</ItemGroup>
127+
<ItemGroup>
128+
<None Include="Resources\logo.png" />
129+
</ItemGroup>
130+
<ItemGroup>
131+
<Content Include="logo.ico" />
132+
<None Include="Resources\logo.ico" />
133+
</ItemGroup>
127134
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
128135
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
129136
Other similar extension points exist, see Microsoft.Common.targets.

MusicXMLParser/Properties/Resources.Designer.cs

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MusicXMLParser/Properties/Resources.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,10 @@
124124
<data name="bg_spinner" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125
<value>..\Resources\bg-spinner.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126126
</data>
127+
<data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
128+
<value>..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129+
</data>
130+
<data name="logo1" type="System.Resources.ResXFileRef, System.Windows.Forms">
131+
<value>..\Resources\logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132+
</data>
127133
</root>

MusicXMLParser/Resources/logo.bmp

3.3 KB
Binary file not shown.

MusicXMLParser/Resources/logo.ico

178 KB
Binary file not shown.

0 commit comments

Comments
 (0)