Skip to content

Commit

Permalink
Version 18.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
KaleidonKep99 committed Mar 9, 2018
1 parent 0da09de commit fa6abc9
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 34 deletions.
8 changes: 4 additions & 4 deletions KeppyMIDIConverter/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<value>False</value>
</setting>
<setting name="LastExportFolder" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LastMIDIFolder" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LastSoundFontFolder" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LoudMaxEnabled" serializeAs="String">
<value>False</value>
Expand Down Expand Up @@ -68,7 +68,7 @@
<value>60</value>
</setting>
<setting name="LastVSTFolder" serializeAs="String">
<value/>
<value />
</setting>
<setting name="NoMoreDonation" serializeAs="String">
<value>False</value>
Expand Down
6 changes: 6 additions & 0 deletions KeppyMIDIConverter/Forms/SoundfontDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,12 @@ private void VSTUse_CheckedChanged(object sender, EventArgs e)
{
VSTImport.Enabled = VSTUse.Checked;
KeppyMIDIConverter.MainWindow.KMCStatus.VSTMode = VSTUse.Checked;

if (VSTUse.Checked != true)
{
Properties.Settings.Default.LoudMaxEnabled = false;
Properties.Settings.Default.Save();
}
}

private void VSTImport_Click(object sender, EventArgs e)
Expand Down
32 changes: 8 additions & 24 deletions KeppyMIDIConverter/Functions/BASSControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -531,16 +531,9 @@ public static bool BASSEncodingEngine(long pos, int length)
for (int i = 0; i <= 15; i++)
BassMidi.BASS_MIDI_StreamEvent(MainWindow.KMCGlobals._recHandle, i, BASSMIDIEvent.MIDI_EVENT_MIXLEVEL, MainWindow.KMCStatus.ChannelsVolume[i]);

int got;
if (MainWindow.VSTs.VSTInfo[0].isInstrument)
{
got = Bass.BASS_ChannelGetData(MainWindow.KMCGlobals._recHandle, buffer, length);
Bass.BASS_ChannelGetData(MainWindow.VSTs._VSTHandles[0], buffer, length);
}
else
{
got = Bass.BASS_ChannelGetData(MainWindow.KMCGlobals._recHandle, buffer, length);
}
if (MainWindow.VSTs.VSTInfo[0].isInstrument) Bass.BASS_ChannelGetData(MainWindow.VSTs._VSTHandles[0], buffer, length);
int got = Bass.BASS_ChannelGetData(MainWindow.KMCGlobals._recHandle, buffer, length);

if (got < 0)
{
MainWindow.KMCGlobals.CancellationPendingValue = 2;
Expand All @@ -565,27 +558,17 @@ public static bool BASSEncodingEngineRT(double[] CustomFramerates, ref int pos,
es++;
}

int got;
if (MainWindow.VSTs.VSTInfo[0].isInstrument)
{
got = Bass.BASS_ChannelGetData(MainWindow.KMCGlobals._recHandle, buffer, length);
Bass.BASS_ChannelGetData(MainWindow.VSTs._VSTHandles[0], buffer, length);
}
else
{
got = Bass.BASS_ChannelGetData(MainWindow.KMCGlobals._recHandle, buffer, length);
}
if (MainWindow.VSTs.VSTInfo[0].isInstrument) Bass.BASS_ChannelGetData(MainWindow.VSTs._VSTHandles[0], buffer, length);
int got = Bass.BASS_ChannelGetData(MainWindow.KMCGlobals._recHandle, buffer, length);

if (got < 0)
{
MainWindow.KMCGlobals.CancellationPendingValue = 2;
return false;
}

pos += got;
if (es == MainWindow.KMCGlobals.eventc)
{
BassMidi.BASS_MIDI_StreamEvent(MainWindow.KMCGlobals._recHandle, 0, BASSMIDIEvent.MIDI_EVENT_END, 0);
}
if (es == MainWindow.KMCGlobals.eventc) BassMidi.BASS_MIDI_StreamEvent(MainWindow.KMCGlobals._recHandle, 0, BASSMIDIEvent.MIDI_EVENT_END, 0);

float fpsstring = 1 / (float)fpssim;

Expand Down Expand Up @@ -620,6 +603,7 @@ public static int BASSPlayBackEngine(int notes, int length, long pos)

if (MainWindow.Seeking)
{
BassMidi.BASS_MIDI_StreamEvent(MainWindow.KMCGlobals._recHandle, 0, BASSMIDIEvent.MIDI_EVENT_NOTESOFF, 0);
Bass.BASS_ChannelSetPosition(MainWindow.KMCGlobals._recHandle, MainWindow.CurrentSeek, BASSMode.BASS_POS_MIDI_TICK);
MainWindow.Seeking = false;
}
Expand Down
2 changes: 1 addition & 1 deletion KeppyMIDIConverter/Functions/ConverterFunctions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static void CPWork(object sender, DoWorkEventArgs e)
BASSControl.BASSVolumeSlideInit();
BASSControl.BASSEncoderInit(MainWindow.KMCGlobals.CurrentEncoder, str);
long pos = Bass.BASS_ChannelGetLength(MainWindow.KMCGlobals._recHandle);
int length = Convert.ToInt32(Bass.BASS_ChannelSeconds2Bytes(MainWindow.KMCGlobals._recHandle, (float)1.0));
int length = Convert.ToInt32(Bass.BASS_ChannelSeconds2Bytes(MainWindow.KMCGlobals._recHandle, 0.0275));
MainWindow.KMCStatus.IsKMCNowExporting = true;
bool DoINeedToContinue;
while (true)
Expand Down
1 change: 1 addition & 0 deletions KeppyMIDIConverter/Functions/Languages/OverrideLanguage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ private void InitializeLanguage()
{
Text = Languages.Parse("ChangeLanguage");
OverrideLanguageCheck.Text = Languages.Parse("OverrideLanguage");
MissingTranslations.Text = Languages.Parse("MissingTranslations");
}

public OverrideLanguage()
Expand Down

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

4 changes: 4 additions & 0 deletions KeppyMIDIConverter/Languages/Lang.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -924,4 +924,8 @@ Press OK to continue.</value>
<data name="CorruptedSetupTitle" xml:space="preserve">
<value>Corrupted setup</value>
</data>
<data name="MissingTranslations" xml:space="preserve">
<value>Some languages might not be available yet.</value>
<comment>Self-explanatory.</comment>
</data>
</root>
4 changes: 4 additions & 0 deletions KeppyMIDIConverter/Languages/Lang.it-IT.resx
Original file line number Diff line number Diff line change
Expand Up @@ -926,4 +926,8 @@ Premere OK per chiudere questa finestra.</value>
<data name="CorruptedSetupTitle" xml:space="preserve">
<value>Setup corrotto</value>
</data>
<data name="MissingTranslations" xml:space="preserve">
<value>Alcune traduzioni potrebbero non essere ancora disponibili.</value>
<comment>Self-explanatory.</comment>
</data>
</root>
4 changes: 2 additions & 2 deletions KeppyMIDIConverter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// usando l'asterisco '*' come illustrato di seguito:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("18.0.8")]
[assembly: AssemblyFileVersion("18.0.8")]
[assembly: AssemblyVersion("18.0.9")]
[assembly: AssemblyFileVersion("18.0.9")]
2 changes: 1 addition & 1 deletion KeppyMIDIConverter/Properties/Settings.Designer.cs

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

2 changes: 1 addition & 1 deletion KeppyMIDIConverter/kmcsetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define vc

#define MyAppSetupName "Keppy's MIDI Converter"
#define MyAppVersion '18.0.8'
#define MyAppVersion '18.0.9'

[Setup]
AllowCancelDuringInstall=False
Expand Down
2 changes: 1 addition & 1 deletion KeppyMIDIConverter/kmcupdate.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.8
18.0.9

0 comments on commit fa6abc9

Please sign in to comment.