Skip to content

Commit

Permalink
3.3.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
KaleidonKep99 committed Jul 1, 2016
1 parent 7348b82 commit 325ac0f
Show file tree
Hide file tree
Showing 12 changed files with 297 additions and 195 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,23 @@ private void KeppyDriverConfiguratorMain_Load(object sender, EventArgs e)
hLSEnabledToolStripMenuItem.Enabled = true;
hLSDisabledToolStripMenuItem.Enabled = false;
}
if (Convert.ToInt32(Settings.GetValue("watchdog")) == 1)
{
soundfontListChangeConfirmationDialogToolStripMenuItem.Enabled = true;
volumeHotkeysToolStripMenuItem.Enabled = true;
watchdogEnabledToolStripMenuItem.Checked = true;
watchdogDisabledToolStripMenuItem.Checked = false;
watchdogEnabledToolStripMenuItem.Enabled = false;
watchdogDisabledToolStripMenuItem.Enabled = true;
}
else
{
soundfontListChangeConfirmationDialogToolStripMenuItem.Enabled = false;
watchdogEnabledToolStripMenuItem.Checked = false;
watchdogDisabledToolStripMenuItem.Checked = true;
watchdogEnabledToolStripMenuItem.Enabled = true;
watchdogDisabledToolStripMenuItem.Enabled = false;
}
Frequency.Text = Settings.GetValue("frequency").ToString();
TracksLimit.Value = Convert.ToInt32(Settings.GetValue("tracks"));

Expand Down Expand Up @@ -1653,6 +1670,29 @@ private void hLSDisabledToolStripMenuItem_Click(object sender, EventArgs e)
hLSDisabledToolStripMenuItem.Enabled = false;
}


private void watchdogEnabledToolStripMenuItem_Click(object sender, EventArgs e)
{
RegistryKey Settings = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Keppy's Driver\\Watchdog", true);
Settings.SetValue("watchdog", "1", RegistryValueKind.DWord);
Settings.Close();
watchdogEnabledToolStripMenuItem.Checked = true;
watchdogDisabledToolStripMenuItem.Checked = false;
watchdogEnabledToolStripMenuItem.Enabled = false;
watchdogDisabledToolStripMenuItem.Enabled = true;
}

private void watchdogDisabledToolStripMenuItem_Click(object sender, EventArgs e)
{
RegistryKey Settings = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Keppy's Driver\\Watchdog", true);
Settings.SetValue("watchdog", "0", RegistryValueKind.DWord);
Settings.Close();
watchdogEnabledToolStripMenuItem.Checked = false;
watchdogDisabledToolStripMenuItem.Checked = true;
watchdogEnabledToolStripMenuItem.Enabled = true;
watchdogDisabledToolStripMenuItem.Enabled = false;
}

private void exitToolStripMenuItem_Click(object sender, EventArgs e)
{
Application.Exit();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\watchdog.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -75,6 +78,9 @@
<ItemGroup>
<None Include="Resources\gear.ico" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\watchdog.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
40 changes: 26 additions & 14 deletions KeppyDriverWatchdog/KeppyDriverWatchdog/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,44 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Threading;
using Microsoft.Win32;

namespace KeppyDriverWatchdog
{
static class Program
{
static RegistryKey Watchdog = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Keppy's Driver\\Watchdog", true);

[STAThread]
static void Main()
{
bool ok;
Mutex m = new Mutex(true, "KeppyDriverWatchdog", out ok);
if (!ok)
if (Convert.ToInt32(Watchdog.GetValue("watchdog")) == 1)
{
return;
}
NotifyIcon ni;
ni = new NotifyIcon();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
bool ok;
Mutex m = new Mutex(true, "KeppyDriverWatchdog", out ok);
if (!ok)
{
return;
}
NotifyIcon ni;
ni = new NotifyIcon();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);

using (ProcessIcon pi = new ProcessIcon())
{
pi.Display();
Application.Run();
}

using (ProcessIcon pi = new ProcessIcon())
GC.KeepAlive(m);
}
else
{
pi.Display();
Application.Run();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Exit();
}

GC.KeepAlive(m);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
// Le informazioni generali relative a un assembly sono controllate dal seguente
// set di attributi. Per modificare le informazioni associate a un assembly
// occorre quindi modificare i valori di questi attributi.
[assembly: AssemblyTitle("KeppyDriverWatchdog")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyTitle("Keppy's Driver Watchdog")]
[assembly: AssemblyDescription("Keppy's Driver New Configurator (C#)")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("KeppyDriverWatchdog")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyCompany("Keppy Studios Ltd.")]
[assembly: AssemblyProduct("Keppy's Driver")]
[assembly: AssemblyCopyright("Copyright © Keppy Studios 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,7 @@
<data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="watchdog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\watchdog.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file not shown.
7 changes: 4 additions & 3 deletions keppydrv.iss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AppPublisherURL=http://keppystudios.com
AppSupportPhone=+393511888475
AppSupportURL=mailto:kaleidonkep99@outlook.com
AppUpdatesURL=https://github.com/KaleidonKep99/Keppy-s-MIDI-Driver/releases
AppVersion=3.3.1.6
AppVersion=3.3.1.7
ArchitecturesAllowed=x86 x64
ArchitecturesInstallIn64BitMode=x64
Compression=bzip
Expand All @@ -34,9 +34,9 @@ VersionInfoCompany=Keppy Studios
VersionInfoCopyright=Copyright (c) 2011-2016 Brad Miller, Chris Moeller and Riccardo Loi. All rights reserved.
VersionInfoDescription=User-mode MIDI driver for Windows XP SP3 (SP2 for x64) and newer
VersionInfoProductName=Keppy's Driver
VersionInfoProductTextVersion=3.3.1.6
VersionInfoProductTextVersion=3.3.1.7
VersionInfoTextVersion=User-mode MIDI driver for Windows XP SP3 (SP2 for x64) and newer
VersionInfoVersion=3.3.1.6
VersionInfoVersion=3.3.1.7
UsePreviousSetupType=False
FlatComponentsList=False
AlwaysShowGroupOnReadyPage=True
Expand Down Expand Up @@ -130,6 +130,7 @@ Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; Valu
Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "volume"; ValueData: "10000"; Flags: createvalueifdoesntexist uninsdeletekey
Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "volumemon"; ValueData: "0"; Flags: createvalueifdoesntexist uninsdeletekey
Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "volumehotkeys"; ValueData: "1"; Flags: createvalueifdoesntexist uninsdeletekey
Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "watchdog"; ValueData: "1"; Flags: createvalueifdoesntexist uninsdeletekey
Root: "HKCU"; Subkey: "Software\Keppy's Driver\Settings"; ValueType: dword; ValueName: "xaudiodisabled"; ValueData: "0"; Flags: createvalueifdoesntexist uninsdeletekey

;Channels volume
Expand Down
Binary file modified keppydrv/Resource.aps
Binary file not shown.
Binary file modified keppydrv/Resource.rc
Binary file not shown.
Binary file modified midiicon.ico
Binary file not shown.

0 comments on commit 325ac0f

Please sign in to comment.