Version 18.2.7

KeppySoftware · Jan 14, 2019 · 05eae09 · 05eae09
1 parent 53231f7
commit 05eae09
Show file tree

Hide file tree

Showing 7 changed files with 197 additions and 19 deletions.
diff --git a/KeppyMIDIConverter/Bass.Net.xml b/KeppyMIDIConverter/Bass.Net.xml
diff --git a/KeppyMIDIConverter/Functions/BASSControl.cs b/KeppyMIDIConverter/Functions/BASSControl.cs
@@ -327,12 +327,12 @@ public class MidiFilterProcAnalytic
         }
 
         public static Boolean[] TracksList;
-        public static Boolean MidiFilterProc(int handle, int track, BASS_MIDI_EVENT midievent, bool seeking, IntPtr user)
+        public static Boolean MidiFilterProc(int handle, int track, IntPtr midievent, bool seeking, IntPtr user)
         {
             try
             {
                 Int32 Track = track;
-                BASS_MIDI_EVENT temp = midievent;
+                BASS_MIDI_EVENT temp = BASS_MIDI_EVENT.FromIntPtr(midievent);
 
                 if (temp.eventtype == BASSMIDIEvent.MIDI_EVENT_NOTE && (Properties.Settings.Default.IgnoreNotes1 || Properties.Settings.Default.AskForIgnoreTracks))
                 {

diff --git a/KeppyMIDIConverter/Functions/BasicFunctions.cs b/KeppyMIDIConverter/Functions/BasicFunctions.cs
@@ -227,13 +227,6 @@ public static void ToAddOrNotToAdd(ListViewItem lvi, string notes, string str)
             else
                 MainWindow.Delegate.Invoke((MethodInvoker)delegate { MainWindow.Delegate.MIDIList.Items.Add(lvi); });
         }
-
-        public static void AddMIDIToListWithInfo(string MIDI)
-        {
-            string[] midiinfo = DataCheck.GetMoreInfoMIDI(MIDI);
-            ListViewItem lvi = new ListViewItem(new string[] { MIDI, midiinfo[2], midiinfo[1], midiinfo[0], midiinfo[3] });
-            ToAddOrNotToAdd(lvi, midiinfo[1], MIDI);
-        }
     }
 
     public static class StringExt

diff --git a/KeppyMIDIConverter/Functions/Extensions/DataCheck.cs b/KeppyMIDIConverter/Functions/Extensions/DataCheck.cs
@@ -45,7 +45,7 @@ public static string[] GetMoreInfoMIDI(string str)
                 }
                 catch { size = "-"; }
 
-                Bass.BASS_Init(0, 22050, BASSInit.BASS_DEVICE_NOSPEAKER, IntPtr.Zero);
+                Bass.BASS_Init(0, 4000, BASSInit.BASS_DEVICE_NOSPEAKER, IntPtr.Zero);
                 Int32 time = BassMidi.BASS_MIDI_StreamCreateFile(str, 0L, 0L, BASSFlag.BASS_STREAM_DECODE, 0);
 
                 if (time == 0) return null;
@@ -57,11 +57,18 @@ public static string[] GetMoreInfoMIDI(string str)
                 // Get length of MIDI
                 string Length = span.Minutes.ToString() + ":" + span.Seconds.ToString().PadLeft(2, '0') + "." + span.Milliseconds.ToString().PadLeft(3, '0');
 
-                UInt64 count = (UInt64)BassMidi.BASS_MIDI_StreamGetEvents(time, -1, BASSMIDIEvent.MIDI_EVENT_NOTES, null);
+                UInt64 count = 0;
                 Int32 Tracks = BassMidi.BASS_MIDI_StreamGetTrackCount(time);
+                for (int i = 0; i < Tracks; i++)
+                    count += (UInt32)BassMidi.BASS_MIDI_StreamGetEvents(time, i, BASSMIDIEvent.MIDI_EVENT_NOTES, null);
 
                 Bass.BASS_Free();
-                return new string[] { Length, Tracks.ToString("N0"), count.ToString("N0"), size, };
+                return new string[] {
+                    Length,
+                    String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0:N0}", Tracks),
+                    String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0:N0}", count),
+                    size
+                };
             }
             catch
             {

diff --git a/KeppyMIDIConverter/Properties/AssemblyInfo.cs b/KeppyMIDIConverter/Properties/AssemblyInfo.cs
@@ -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.2.6")]
-[assembly: AssemblyFileVersion("18.2.6")]
+[assembly: AssemblyVersion("18.2.7")]
+[assembly: AssemblyFileVersion("18.2.7")]
diff --git a/KeppyMIDIConverter/kmcsetup.iss b/KeppyMIDIConverter/kmcsetup.iss
@@ -5,7 +5,7 @@
 #define vc
 
 #define MyAppSetupName "Keppy's MIDI Converter"
-#define MyAppVersion '18.2.6'
+#define MyAppVersion '18.2.7'
 
 [Setup]
 AllowCancelDuringInstall=False

diff --git a/KeppyMIDIConverter/kmcupdate.txt b/KeppyMIDIConverter/kmcupdate.txt
@@ -1 +1 @@
-18.2.6
+18.2.7