Skip to content

Commit

Permalink
Version 14.8.5
Browse files Browse the repository at this point in the history
bri committed Sep 14, 2023

Verified

This commit was signed with the committer’s verified signature.
DmitriyMV Dmitriy Matrenichev
1 parent 38f63d9 commit 6ec4b55
Showing 16 changed files with 60 additions and 69 deletions.
Binary file modified OmniMIDI/Resource.aps
Binary file not shown.
Binary file modified OmniMIDI/Resource.rc
Binary file not shown.
14 changes: 6 additions & 8 deletions OmniMIDI/SoundFontLoader.h
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ static BOOL FontLoader(LPWSTR in_path) {
{
PrintMessageToDebugLog("NewSFLoader", "Initializing SoundFont...");
HSOUNDFONT SF = BASS_MIDI_FontInit(in_path,
BASS_UNICODE | BASS_MIDI_FONT_NOLIMITS | BASS_MIDI_FONT_MMAP |
BASS_UNICODE | BASS_MIDI_FONT_MMAP |
(ManagedSettings.AudioRampIn ? BASS_MIDI_FONT_NORAMPIN : 0) |
(ManagedSettings.LinAttMod ? BASS_MIDI_FONT_LINATTMOD : 0) |
(ManagedSettings.LinDecVol ? BASS_MIDI_FONT_LINDECVOL : 0) |
@@ -289,12 +289,12 @@ static BOOL FontLoader(LPWSTR in_path) {
{
PrintSoundFontToDebugLog(CurrentSF->Path, "Initializing SoundFont...");
HSOUNDFONT font = BASS_MIDI_FontInit(CurrentSF->Path,
BASS_UNICODE | BASS_MIDI_FONT_NOLIMITS | BASS_MIDI_FONT_MMAP |
BASS_UNICODE | BASS_MIDI_FONT_MMAP |
(CurrentSF->XGBankMode ? BASS_MIDI_FONT_XGDRUMS : NULL) |
(ManagedSettings.AudioRampIn ? BASS_MIDI_FONT_NORAMPIN : 0) |
(ManagedSettings.LinAttMod ? BASS_MIDI_FONT_LINATTMOD : 0) |
(ManagedSettings.LinDecVol ? BASS_MIDI_FONT_LINDECVOL : 0) |
(ManagedSettings.NoSFGenLimits ? BASS_MIDI_FONT_NOLIMITS : 0));
(ManagedSettings.AudioRampIn ? BASS_MIDI_FONT_NORAMPIN : NULL) |
(ManagedSettings.LinAttMod ? BASS_MIDI_FONT_LINATTMOD : NULL) |
(ManagedSettings.LinDecVol ? BASS_MIDI_FONT_LINDECVOL : NULL) |
(ManagedSettings.NoSFGenLimits ? BASS_MIDI_FONT_NOLIMITS : NULL));

if (!font) {
PrintSoundFontToDebugLog(CurrentSF->Path, "An error has occurred while initializing the SoundFont.");
@@ -312,8 +312,6 @@ static BOOL FontLoader(LPWSTR in_path) {
CurrentSF->DestinationBankLSB
};



if (ManagedSettings.PreloadSoundFonts && CurrentSF->Preload) {
PrintSoundFontToDebugLog(CurrentSF->Path, "Preloading SoundFont...");
#if defined(_M_IX86)
28 changes: 14 additions & 14 deletions OmniMIDIConfigurator/OmniMIDIConfigurator/App.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="OmniMIDIConfigurator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="OmniMIDIConfigurator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="OmniMIDIConfigurator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="OmniMIDIConfigurator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<OmniMIDIConfigurator.Properties.Settings>
@@ -23,10 +23,10 @@
<value>0</value>
</setting>
<setting name="LastImportExportPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="LastBrowserPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="UpdateBranch" serializeAs="String">
<value>choose</value>
@@ -41,10 +41,10 @@
<value>True</value>
</setting>
<setting name="LastSoundFontPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="LastPatchPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="DrawControlsFaster" serializeAs="String">
<value>False</value>
@@ -136,16 +136,16 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Original file line number Diff line number Diff line change
@@ -142,6 +142,7 @@ public SettingStruct(string S, int V)
new SettingStruct ("Extra8Lists", 0),
new SettingStruct ("FastHotkeys", 1),
new SettingStruct ("FollowDefaultAudioDevice", 0),
new SettingStruct ("TGTSpeedHack", 0x3B9ACA00),
new SettingStruct ("GetEvBuffSizeFromRAM", 0),
new SettingStruct ("HyperPlayback", 0),
new SettingStruct ("IgnoreNotesBetweenVel", 0),
@@ -175,7 +176,9 @@ public SettingStruct(string S, int V)
new SettingStruct ("VolumeMonitor", 0),
new SettingStruct ("XASamplesPerFrame", 88),
new SettingStruct ("XASPFSweepRate", 15),
new SettingStruct ("FastLibs", 0)
new SettingStruct ("XASPFSweepRate", 15),
new SettingStruct ("LinAttMod", 0),
new SettingStruct ("LinDecVol", 0)
};

public static string GetProcessorArchitecture()

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
@@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>OmniMIDIConfigurator</RootNamespace>
<AssemblyName>OmniMIDIConfigurator</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>

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

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ private void KSDefaultDialog_Load(object sender, EventArgs e)

private void RD_Click(object sender, EventArgs e)
{
Program.Register(false);
Program.Register();

/*
if (Environment.Is64BitOperatingSystem)
@@ -37,7 +37,7 @@ private void RD_Click(object sender, EventArgs e)

private void UnRD_Click(object sender, EventArgs e)
{
Program.Unregister(false);
Program.Unregister();

/*
if (Environment.Is64BitOperatingSystem)
16 changes: 6 additions & 10 deletions OmniMIDIDriverRegister/OmniMIDIDriverRegister/Program.cs
Original file line number Diff line number Diff line change
@@ -69,16 +69,12 @@ static void Main(string[] args)

return;
case "/register":
Register(false);
return;
case "/registerv":
Register(true);
Register();
return;
case "/unregister":
Unregister(false);
return;
case "/unregisterv":
Unregister(true);
Unregister();
return;
case "/rmidimap":
RegisterMidiMapper(true, false);
@@ -137,7 +133,7 @@ public static void ShowMessage(bool IsSilent, String Text, String Title, Message
MessageBox.Show(Text, String.Format("OmniMIDI R/U Tool ~ {0}", Title), MessageBoxButtons.OK, TypeOfError);
}

public static void Register(bool IsSilent /*, String WhichBit, RegistryKey WhichKey */)
public static void Register(/* bool IsSilent, String WhichBit, RegistryKey WhichKey */)
{
if (!RestartAsAdminIfRequired()) return;

@@ -148,7 +144,7 @@ public static void Register(bool IsSilent /*, String WhichBit, RegistryKey Which
Process P;

SI.FileName = String.Format(@"{0}\{1}", Environment.GetFolderPath(Environment.SpecialFolder.SystemX86), "rundll32.exe");
SI.Arguments = String.Format("OmniMIDI.dll,DriverRegistration RegisterDrv{0}", IsSilent ? "S" : String.Empty);
SI.Arguments = "OmniMIDI.dll,DriverRegistration RegisterDrv";
P = Process.Start(SI);
P.WaitForExit();

@@ -189,7 +185,7 @@ public static void Register(bool IsSilent /*, String WhichBit, RegistryKey Which
*/
}

public static void Unregister(bool IsSilent /*, String WhichBit, RegistryKey WhichKey */)
public static void Unregister(/* bool IsSilent, String WhichBit, RegistryKey WhichKey */)
{
if (!RestartAsAdminIfRequired()) return;

@@ -200,7 +196,7 @@ public static void Unregister(bool IsSilent /*, String WhichBit, RegistryKey Whi
Process P;

SI.FileName = String.Format(@"{0}\{1}", Environment.GetFolderPath(Environment.SpecialFolder.SystemX86), "rundll32.exe");
SI.Arguments = String.Format("OmniMIDI.dll,DriverRegistration UnregisterDrv{0}", IsSilent ? "S" : String.Empty);
SI.Arguments = "OmniMIDI.dll,DriverRegistration UnregisterDrv";
P = Process.Start(SI);
P.WaitForExit();

34 changes: 6 additions & 28 deletions OmniMIDIv2/BASSSynth.cpp
Original file line number Diff line number Diff line change
@@ -209,49 +209,27 @@ bool OmniMIDI::BASSSynth::LoadFuncs() {

for (int i = 0; i < sizeof(BLibImports) / sizeof(BLibImports[0]); i++)
{
ptr = (void*)GetProcAddress(BAudLib->Ptr(), BLibImports[i].GetName());
if (ptr)
{
BLibImports[i].SetPtr(ptr);
if (BLibImports[i].SetPtr((void*)GetProcAddress(BAudLib->Ptr(), BLibImports[i].GetName())))
continue;
}

ptr = (void*)GetProcAddress(BMidLib->Ptr(), BLibImports[i].GetName());
if (ptr)
{
BLibImports[i].SetPtr(ptr);
if (BLibImports[i].SetPtr((void*)GetProcAddress(BMidLib->Ptr(), BLibImports[i].GetName())))
continue;
}

switch (Settings->AudioEngine) {
case WASAPI:
ptr = (void*)GetProcAddress(BWasLib->Ptr(), BLibImports[i].GetName());
if (ptr)
{
BLibImports[i].SetPtr(ptr);
if (BLibImports[i].SetPtr((void*)GetProcAddress(BWasLib->Ptr(), BLibImports[i].GetName())))
continue;
}
break;

case ASIO:
ptr = (void*)GetProcAddress(BAsiLib->Ptr(), BLibImports[i].GetName());
if (ptr)
{
BLibImports[i].SetPtr(ptr);
if (BLibImports[i].SetPtr((void*)GetProcAddress(BAsiLib->Ptr(), BLibImports[i].GetName())))
continue;
}
break;
}

if (BVstLib->IsOnline())
{
ptr = (void*)GetProcAddress(BVstLib->Ptr(), BLibImports[i].GetName());
if (ptr)
{
BLibImports[i].SetPtr(ptr);
if (BLibImports[i].SetPtr((void*)GetProcAddress(BVstLib->Ptr(), BLibImports[i].GetName())))
continue;
}
}
}

return true;
@@ -274,7 +252,7 @@ bool OmniMIDI::BASSSynth::UnloadFuncs() {
return false;

for (int i = 0; i < sizeof(BLibImports) / sizeof(BLibImports[0]); i++)
BLibImports[i].SetPtr(nullptr);
BLibImports[i].SetPtr();

return true;
}
2 changes: 1 addition & 1 deletion OmniMIDIv2/NtFuncs.h
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ namespace NT {
Funcs() {
ntdll = GetModuleHandleA("ntdll");

if (ntdll) {
if (!ntdll) {
// ... How?
LL = true;
ntdll = LoadLibraryA("ntdll");
18 changes: 17 additions & 1 deletion OmniMIDIv2/SynthMain.h
Original file line number Diff line number Diff line change
@@ -109,7 +109,23 @@ namespace OmniMIDI {
void SetName(const char* pfuncname) { funcname = pfuncname; }
const char* GetName() { return funcname; }

void SetPtr(void* pfuncptr) { *(funcptr) = pfuncptr; }
bool SetPtr(void* pfuncptr = (void*)-1){
if (!pfuncptr)
return false;

if ((size_t)pfuncptr == -1)
{
*(funcptr) = nullptr;
return true;
}
else {
if (pfuncptr != *(funcptr))
*(funcptr) = pfuncptr;
}

return true;
}

void* GetPtr() { return *(funcptr); }
};

0 comments on commit 6ec4b55

Please sign in to comment.