From 3af3ba9831422cf349e59e93356f63931e20ae5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20King?= Date: Sat, 6 Feb 2021 18:51:54 +0000 Subject: [PATCH] Tweaked chord prediction --- MusicAnalyser/App/Analysis/Analyser.cs | 142 ++++---- MusicAnalyser/App/Analysis/Chord.cs | 1 + MusicAnalyser/App/Analysis/Music.cs | 4 +- MusicAnalyser/UI/Form1.Designer.cs | 439 +++++++++++-------------- 4 files changed, 271 insertions(+), 315 deletions(-) diff --git a/MusicAnalyser/App/Analysis/Analyser.cs b/MusicAnalyser/App/Analysis/Analyser.cs index 2ab4842..522ffa7 100644 --- a/MusicAnalyser/App/Analysis/Analyser.cs +++ b/MusicAnalyser/App/Analysis/Analyser.cs @@ -176,7 +176,50 @@ public bool FindChordsNotes() if (aggregateNotes.Count == 0) return false; - int[,] tempNoteOccurences = new int[12, 2]; + // UNUSED + //List[] notesByName = new List[12]; + //for (int i = 0; i < 12; i++) + // notesByName[i] = new List(); + //Dictionary noteDistributionDict = new Dictionary(); + + //for(int i = 0; i < aggregateNotes.Count; i++) + //{ + // string noteName = aggregateNotes[i].Name; + // double noteMag = aggregateNotes[i].Magnitude; + // int index = aggregateNotes[i].NoteIndex; + // notesByName[index].Add(aggregateNotes[i]); + // if (noteDistributionDict.ContainsKey(noteName)) + // noteDistributionDict[noteName] += noteMag; + // else + // noteDistributionDict.Add(noteName, noteMag); + //} + //string[] keys = noteDistributionDict.Keys.ToArray(); + //foreach (string key in keys) + // noteDistributionDict[key] /= Prefs.CHORD_DETECTION_INTERVAL; + + //noteDistributionDict = noteDistributionDict.OrderByDescending(x => x.Value).Take(4).ToDictionary(x => x.Key, x => x.Value); + + //chordNotes = new List[noteDistributionDict.Count]; + //keys = noteDistributionDict.Keys.ToArray(); + //for (int i = 0; i < chordNotes.Length; i++) + //{ + // chordNotes[i] = new List(); + // List octaves = new List(); + // int noteIndex = Music.GetNoteIndex(keys[i] + "0"); + // for (int j = 0; j < notesByName[noteIndex].Count; j++) + // { + // if (!octaves.Contains(notesByName[noteIndex][j].Octave)) // Stores each prominent note in collected notes only once + // { + // chordNotes[i].Add(notesByName[noteIndex][j]); + // octaves.Add(notesByName[noteIndex][j].Octave); + // } + // } + // chordNotes[i] = chordNotes[i].OrderBy(x => x.Frequency).ToList(); // Order: Frequency - low to high + //} + //aggregateNotes.Clear(); + //return true; + + int[,] tempNoteOccurences = new int[12, 2]; // Note index, timestamp List[] notesByName = new List[12]; for (int i = 0; i < 12; i++) notesByName[i] = new List(); @@ -184,7 +227,7 @@ public bool FindChordsNotes() int initialTimeStamp = aggregateNotes[0].TimeStamp; int timeStampOffset = 0; - for(int i = 0; i < aggregateNotes.Count; i++) + for (int i = 0; i < aggregateNotes.Count; i++) { int index = aggregateNotes[i].NoteIndex; notesByName[index].Add(aggregateNotes[i]); @@ -198,25 +241,21 @@ public bool FindChordsNotes() } aggregateNotes.Clear(); - int numChordNotes = 0; List chordNoteIndexes = new List(); - for(int i = 0; i < tempNoteOccurences.Length / 2; i++) + for (int i = 0; i < tempNoteOccurences.Length / 2; i++) { - if(tempNoteOccurences[i, 0] >= Prefs.CHORD_NOTE_OCCURENCE_OFFSET) - { - numChordNotes++; + if (tempNoteOccurences[i, 0] >= Prefs.CHORD_NOTE_OCCURENCE_OFFSET) // Prunes spurious notes chordNoteIndexes.Add(i); - } } - chordNotes = new List[numChordNotes]; - for(int i = 0; i < numChordNotes; i++) + chordNotes = new List[chordNoteIndexes.Count]; + for (int i = 0; i < chordNotes.Length; i++) { chordNotes[i] = new List(); List octaves = new List(); - for(int j = 0; j < notesByName[chordNoteIndexes[i]].Count; j++) + for (int j = 0; j < notesByName[chordNoteIndexes[i]].Count; j++) { - if (!octaves.Contains(notesByName[chordNoteIndexes[i]][j].Octave)) + if (!octaves.Contains(notesByName[chordNoteIndexes[i]][j].Octave)) // Stores each prominent note in collected notes only once { chordNotes[i].Add(notesByName[chordNoteIndexes[i]][j]); octaves.Add(notesByName[chordNoteIndexes[i]][j].Octave); @@ -224,42 +263,6 @@ public bool FindChordsNotes() } chordNotes[i] = chordNotes[i].OrderBy(x => x.Frequency).ToList(); // Order: Frequency - low to high } - - int removed = 0; - for(int i = 0; i < chordNotes.Length; i++) - { - if(chordNotes[i].Count == 1 && chordNotes[i][0].Octave > 4) - { - chordNotes[i].Clear(); - removed++; - continue; - } - - int lowestOctave = chordNotes[i][0].Octave; - for(int j = 1; j < chordNotes[i].Count; j++) - { - if (chordNotes[i][j].Octave < lowestOctave) - lowestOctave = chordNotes[i][j].Octave; - } - - if (lowestOctave > 4) - { - chordNotes[i].Clear(); - removed++; - } - } - - List[] chordTemp = new List[chordNotes.Length - removed]; - int tempIndex = 0; - for(int i = 0; i < chordNotes.Length; i++) - { - if (chordNotes[i].Count != 0) - { - chordTemp[tempIndex] = chordNotes[i]; - tempIndex++; - } - } - chordNotes = chordTemp; return true; } @@ -293,9 +296,9 @@ public void FindChords() noteDifference = 12 + noteDifference; intervals.Add(noteDifference); } - string chordQuality = Music.GetChordQuality(intervals); // Determines chord quality from intervals - if(chordQuality != "N/A") - chords.Add(CreateChord(myChordNotes[0].Name, chordQuality, myChordNotes)); + string chordQuality = Music.GetChordQuality(intervals, out int fifthOmitted); // Determines chord quality from intervals + if (chordQuality != "N/A") + chords.Add(CreateChord(myChordNotes[0].Name, chordQuality, myChordNotes, fifthOmitted)); myChordNotes = NextChord(myChordNotes); // Iterates chord root note } @@ -305,7 +308,7 @@ public void FindChords() prevChord = chords[0]; } - private Chord CreateChord(string root, string quality, List notes) + private Chord CreateChord(string root, string quality, List notes, int fifthOmitted) { Note[] tempNotes = new Note[notes.Count]; Array.Copy(notes.ToArray(), tempNotes, notes.Count); @@ -321,7 +324,8 @@ private Chord CreateChord(string root, string quality, List notes) Root = root, Quality = quality, Notes = tempNotes.ToList(), - NumExtensions = numExtensions + NumExtensions = numExtensions, + FifthOmitted = fifthOmitted }; return myChord; } @@ -352,7 +356,7 @@ private void AdjustChordProbabilities() rootFreq[i] = chords[i].Notes[0].Frequency; double avgFreq = rootFreq.Average(); for (int i = 0; i < rootFreq.Length; i++) - rootFreq[i] -= avgFreq; + rootFreq[i] = avgFreq - rootFreq[i]; rootFreq = Normalise(rootFreq); double[] chordExtensions = new double[chords.Count]; @@ -360,36 +364,28 @@ private void AdjustChordProbabilities() chordExtensions[i] = chords[i].NumExtensions; double avgExtensions = chordExtensions.Average(); for (int i = 0; i < chordExtensions.Length; i++) - chordExtensions[i] -= avgExtensions; + chordExtensions[i] = avgExtensions - chordExtensions[i]; chordExtensions = Normalise(chordExtensions); + double[] fifthOmitted = new double[chords.Count]; + for (int i = 0; i < chords.Count; i++) + fifthOmitted[i] = chords[i].FifthOmitted; + fifthOmitted = Normalise(fifthOmitted); + double[] chordPredictedBefore = new double[chords.Count]; if (prevChord != null) - { - for(int i = 0; i < chords.Count; i++) - { - if (chords[i].Root == prevChord.Root) - chordPredictedBefore[i] += 1; - } - } - - double[] rootInKey = new double[chords.Count]; - if (majorKeyRoot != "N/A") { - string[] scale = new string[7]; - Array.Copy(Music.Scales, Music.GetNoteIndex(majorKeyRoot + "0") * 7, scale, 0, scale.Length); for (int i = 0; i < chords.Count; i++) { - if (scale.Contains(chords[i].Root)) - rootInKey[i] += 1; - else - rootInKey[i] -= 1; + if (chords[i].Root == prevChord.Root) + chordPredictedBefore[i] += 1; } } double[] overallProb = new double[chords.Count]; - for(int i = 0; i < chords.Count; i++) - overallProb[i] = rootMagnitudes[i] + rootOccurences[i] - 2 * rootFreq[i] - chordExtensions[i] + 1.5 * chordPredictedBefore[i] + rootInKey[i]; + for (int i = 0; i < chords.Count; i++) + //overallProb[i] = 1.0 * rootMagnitudes[i] + 1.0 * rootOccurences[i] + 1.0 * chordExtensions[i] + 2 * rootFreq[i] + 1.0 * fifthOmitted[i] + 1.5 * chordPredictedBefore[i]; + overallProb[i] = 1.1*rootMagnitudes[i] + 1.0*rootOccurences[i] + 2.3*chordExtensions[i] + 1.8*rootFreq[i] + 1.0*fifthOmitted[i] + 0.7*chordPredictedBefore[i]; overallProb = Normalise(overallProb); double probSum = overallProb[0] + 1; for (int i = 1; i < chords.Count; i++) diff --git a/MusicAnalyser/App/Analysis/Chord.cs b/MusicAnalyser/App/Analysis/Chord.cs index db41649..d5fc659 100644 --- a/MusicAnalyser/App/Analysis/Chord.cs +++ b/MusicAnalyser/App/Analysis/Chord.cs @@ -13,6 +13,7 @@ class Chord public string Quality { get; set; } public List Notes { get; set; } public int NumExtensions { get; set; } + public int FifthOmitted { get; set; } public double Probability { get; set; } } } diff --git a/MusicAnalyser/App/Analysis/Music.cs b/MusicAnalyser/App/Analysis/Music.cs index d1bbeda..bbb4229 100644 --- a/MusicAnalyser/App/Analysis/Music.cs +++ b/MusicAnalyser/App/Analysis/Music.cs @@ -260,9 +260,9 @@ public static string GetMode(double[] percent, string majorRoot, string minorRoo return ""; } - public static string GetChordQuality(List intervals) + public static string GetChordQuality(List intervals, out int fifthOmitted) { - int fifthOmitted = 0; + fifthOmitted = 0; while (fifthOmitted <= 1) { if (intervals.Contains(4) && intervals.Contains(7)) // Major chords diff --git a/MusicAnalyser/UI/Form1.Designer.cs b/MusicAnalyser/UI/Form1.Designer.cs index 18e3434..e5fc670 100644 --- a/MusicAnalyser/UI/Form1.Designer.cs +++ b/MusicAnalyser/UI/Form1.Designer.cs @@ -121,10 +121,10 @@ private void InitializeComponent() // btnOpenClose // this.btnOpenClose.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnOpenClose.Location = new System.Drawing.Point(10, 25); - this.btnOpenClose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnOpenClose.Location = new System.Drawing.Point(13, 31); + this.btnOpenClose.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnOpenClose.Name = "btnOpenClose"; - this.btnOpenClose.Size = new System.Drawing.Size(56, 22); + this.btnOpenClose.Size = new System.Drawing.Size(75, 27); this.btnOpenClose.TabIndex = 0; this.btnOpenClose.Text = "Open"; this.btnOpenClose.UseVisualStyleBackColor = true; @@ -134,10 +134,10 @@ private void InitializeComponent() // this.btnPlay.Enabled = false; this.btnPlay.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnPlay.Location = new System.Drawing.Point(10, 52); - this.btnPlay.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnPlay.Location = new System.Drawing.Point(13, 64); + this.btnPlay.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnPlay.Name = "btnPlay"; - this.btnPlay.Size = new System.Drawing.Size(117, 22); + this.btnPlay.Size = new System.Drawing.Size(156, 27); this.btnPlay.TabIndex = 1; this.btnPlay.Text = "Play"; this.btnPlay.UseVisualStyleBackColor = true; @@ -147,10 +147,10 @@ private void InitializeComponent() // this.btnStop.Enabled = false; this.btnStop.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnStop.Location = new System.Drawing.Point(70, 25); - this.btnStop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnStop.Location = new System.Drawing.Point(93, 31); + this.btnStop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(56, 22); + this.btnStop.Size = new System.Drawing.Size(75, 27); this.btnStop.TabIndex = 0; this.btnStop.Text = "Stop"; this.btnStop.UseVisualStyleBackColor = true; @@ -161,10 +161,10 @@ private void InitializeComponent() this.spFFT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.spFFT.BackColor = System.Drawing.SystemColors.Control; - this.spFFT.Location = new System.Drawing.Point(10, 433); - this.spFFT.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.spFFT.Location = new System.Drawing.Point(13, 533); + this.spFFT.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.spFFT.Name = "spFFT"; - this.spFFT.Size = new System.Drawing.Size(1383, 300); + this.spFFT.Size = new System.Drawing.Size(1433, 369); this.spFFT.TabIndex = 3; // // timerFFT @@ -177,11 +177,11 @@ private void InitializeComponent() this.lstChords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lstChords.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lstChords.FormattingEnabled = true; - this.lstChords.ItemHeight = 14; - this.lstChords.Location = new System.Drawing.Point(1522, 506); - this.lstChords.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lstChords.ItemHeight = 18; + this.lstChords.Location = new System.Drawing.Point(1618, 623); + this.lstChords.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lstChords.Name = "lstChords"; - this.lstChords.Size = new System.Drawing.Size(91, 88); + this.lstChords.Size = new System.Drawing.Size(120, 94); this.lstChords.TabIndex = 5; // // label1 @@ -189,21 +189,20 @@ private void InitializeComponent() this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(1519, 482); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(1614, 593); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(84, 15); + this.label1.Size = new System.Drawing.Size(107, 19); this.label1.TabIndex = 6; this.label1.Text = "Chords Found:"; // // barVolume // this.barVolume.Enabled = false; - this.barVolume.Location = new System.Drawing.Point(330, 28); - this.barVolume.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.barVolume.Location = new System.Drawing.Point(440, 34); + this.barVolume.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.barVolume.Maximum = 20; this.barVolume.Name = "barVolume"; - this.barVolume.Size = new System.Drawing.Size(149, 45); + this.barVolume.Size = new System.Drawing.Size(199, 56); this.barVolume.TabIndex = 7; this.barVolume.Value = 10; this.barVolume.Scroll += new System.EventHandler(this.barVolume_Scroll); @@ -212,10 +211,9 @@ private void InitializeComponent() // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(336, 56); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(448, 69); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(22, 15); + this.label2.Size = new System.Drawing.Size(29, 19); this.label2.TabIndex = 8; this.label2.Text = "0%"; // @@ -223,10 +221,9 @@ private void InitializeComponent() // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(394, 56); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(525, 69); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(28, 15); + this.label3.Size = new System.Drawing.Size(37, 19); this.label3.TabIndex = 9; this.label3.Text = "50%"; // @@ -234,10 +231,9 @@ private void InitializeComponent() // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(454, 56); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(605, 69); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(34, 15); + this.label4.Size = new System.Drawing.Size(45, 19); this.label4.TabIndex = 10; this.label4.Text = "100%"; // @@ -245,10 +241,9 @@ private void InitializeComponent() // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(278, 32); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(371, 39); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 15); + this.label5.Size = new System.Drawing.Size(67, 19); this.label5.TabIndex = 11; this.label5.Text = "Volume: "; // @@ -258,20 +253,20 @@ private void InitializeComponent() this.chbFollow.Checked = true; this.chbFollow.CheckState = System.Windows.Forms.CheckState.Checked; this.chbFollow.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chbFollow.Location = new System.Drawing.Point(1203, 28); - this.chbFollow.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chbFollow.Location = new System.Drawing.Point(1604, 34); + this.chbFollow.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.chbFollow.Name = "chbFollow"; - this.chbFollow.Size = new System.Drawing.Size(110, 19); + this.chbFollow.Size = new System.Drawing.Size(135, 23); this.chbFollow.TabIndex = 13; this.chbFollow.Text = "Follow Playback"; this.chbFollow.UseVisualStyleBackColor = true; // // txtPlayTime // - this.txtPlayTime.Location = new System.Drawing.Point(818, 27); - this.txtPlayTime.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtPlayTime.Location = new System.Drawing.Point(1091, 33); + this.txtPlayTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtPlayTime.Name = "txtPlayTime"; - this.txtPlayTime.Size = new System.Drawing.Size(68, 20); + this.txtPlayTime.Size = new System.Drawing.Size(89, 22); this.txtPlayTime.TabIndex = 16; this.txtPlayTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -279,10 +274,9 @@ private void InitializeComponent() // this.lblPlayTime.AutoSize = true; this.lblPlayTime.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPlayTime.Location = new System.Drawing.Point(728, 28); - this.lblPlayTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblPlayTime.Location = new System.Drawing.Point(971, 34); this.lblPlayTime.Name = "lblPlayTime"; - this.lblPlayTime.Size = new System.Drawing.Size(84, 15); + this.lblPlayTime.Size = new System.Drawing.Size(108, 19); this.lblPlayTime.TabIndex = 17; this.lblPlayTime.Text = "Playback Time:"; // @@ -290,11 +284,10 @@ private void InitializeComponent() // this.lblC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblC.AutoSize = true; - this.lblC.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblC.Location = new System.Drawing.Point(1407, 484); - this.lblC.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblC.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblC.Location = new System.Drawing.Point(1465, 596); this.lblC.Name = "lblC"; - this.lblC.Size = new System.Drawing.Size(26, 15); + this.lblC.Size = new System.Drawing.Size(34, 19); this.lblC.TabIndex = 18; this.lblC.Text = "C: 0"; // @@ -302,11 +295,10 @@ private void InitializeComponent() // this.lblDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblDb.AutoSize = true; - this.lblDb.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDb.Location = new System.Drawing.Point(1407, 498); - this.lblDb.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblDb.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblDb.Location = new System.Drawing.Point(1465, 613); this.lblDb.Name = "lblDb"; - this.lblDb.Size = new System.Drawing.Size(34, 15); + this.lblDb.Size = new System.Drawing.Size(44, 19); this.lblDb.TabIndex = 19; this.lblDb.Text = "Db: 0"; // @@ -314,11 +306,10 @@ private void InitializeComponent() // this.lblD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblD.AutoSize = true; - this.lblD.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblD.Location = new System.Drawing.Point(1407, 512); - this.lblD.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblD.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblD.Location = new System.Drawing.Point(1465, 630); this.lblD.Name = "lblD"; - this.lblD.Size = new System.Drawing.Size(27, 15); + this.lblD.Size = new System.Drawing.Size(35, 19); this.lblD.TabIndex = 20; this.lblD.Text = "D: 0"; // @@ -326,11 +317,10 @@ private void InitializeComponent() // this.lblEb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblEb.AutoSize = true; - this.lblEb.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblEb.Location = new System.Drawing.Point(1407, 526); - this.lblEb.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEb.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblEb.Location = new System.Drawing.Point(1465, 647); this.lblEb.Name = "lblEb"; - this.lblEb.Size = new System.Drawing.Size(32, 15); + this.lblEb.Size = new System.Drawing.Size(42, 19); this.lblEb.TabIndex = 20; this.lblEb.Text = "Eb: 0"; // @@ -338,11 +328,10 @@ private void InitializeComponent() // this.lblE.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblE.AutoSize = true; - this.lblE.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblE.Location = new System.Drawing.Point(1407, 540); - this.lblE.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblE.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblE.Location = new System.Drawing.Point(1465, 665); this.lblE.Name = "lblE"; - this.lblE.Size = new System.Drawing.Size(25, 15); + this.lblE.Size = new System.Drawing.Size(33, 19); this.lblE.TabIndex = 20; this.lblE.Text = "E: 0"; // @@ -350,11 +339,10 @@ private void InitializeComponent() // this.lblF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblF.AutoSize = true; - this.lblF.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblF.Location = new System.Drawing.Point(1407, 553); - this.lblF.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblF.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblF.Location = new System.Drawing.Point(1465, 681); this.lblF.Name = "lblF"; - this.lblF.Size = new System.Drawing.Size(25, 15); + this.lblF.Size = new System.Drawing.Size(32, 19); this.lblF.TabIndex = 20; this.lblF.Text = "F: 0"; // @@ -362,11 +350,10 @@ private void InitializeComponent() // this.lblGb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblGb.AutoSize = true; - this.lblGb.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGb.Location = new System.Drawing.Point(1407, 567); - this.lblGb.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblGb.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblGb.Location = new System.Drawing.Point(1465, 698); this.lblGb.Name = "lblGb"; - this.lblGb.Size = new System.Drawing.Size(34, 15); + this.lblGb.Size = new System.Drawing.Size(44, 19); this.lblGb.TabIndex = 20; this.lblGb.Text = "Gb: 0"; // @@ -374,11 +361,10 @@ private void InitializeComponent() // this.lblG.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblG.AutoSize = true; - this.lblG.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblG.Location = new System.Drawing.Point(1407, 581); - this.lblG.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblG.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblG.Location = new System.Drawing.Point(1465, 715); this.lblG.Name = "lblG"; - this.lblG.Size = new System.Drawing.Size(27, 15); + this.lblG.Size = new System.Drawing.Size(35, 19); this.lblG.TabIndex = 20; this.lblG.Text = "G: 0"; // @@ -386,11 +372,10 @@ private void InitializeComponent() // this.lblAb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblAb.AutoSize = true; - this.lblAb.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAb.Location = new System.Drawing.Point(1407, 595); - this.lblAb.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblAb.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblAb.Location = new System.Drawing.Point(1465, 732); this.lblAb.Name = "lblAb"; - this.lblAb.Size = new System.Drawing.Size(33, 15); + this.lblAb.Size = new System.Drawing.Size(43, 19); this.lblAb.TabIndex = 20; this.lblAb.Text = "Ab: 0"; // @@ -398,11 +383,10 @@ private void InitializeComponent() // this.lblA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblA.AutoSize = true; - this.lblA.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblA.Location = new System.Drawing.Point(1407, 609); - this.lblA.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblA.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblA.Location = new System.Drawing.Point(1465, 750); this.lblA.Name = "lblA"; - this.lblA.Size = new System.Drawing.Size(26, 15); + this.lblA.Size = new System.Drawing.Size(34, 19); this.lblA.TabIndex = 20; this.lblA.Text = "A: 0"; // @@ -410,11 +394,10 @@ private void InitializeComponent() // this.lblBb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblBb.AutoSize = true; - this.lblBb.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblBb.Location = new System.Drawing.Point(1407, 622); - this.lblBb.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblBb.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBb.Location = new System.Drawing.Point(1465, 766); this.lblBb.Name = "lblBb"; - this.lblBb.Size = new System.Drawing.Size(33, 15); + this.lblBb.Size = new System.Drawing.Size(43, 19); this.lblBb.TabIndex = 20; this.lblBb.Text = "Bb: 0"; // @@ -422,11 +405,10 @@ private void InitializeComponent() // this.lblB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblB.AutoSize = true; - this.lblB.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblB.Location = new System.Drawing.Point(1407, 636); - this.lblB.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblB.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblB.Location = new System.Drawing.Point(1465, 783); this.lblB.Name = "lblB"; - this.lblB.Size = new System.Drawing.Size(26, 15); + this.lblB.Size = new System.Drawing.Size(34, 19); this.lblB.TabIndex = 20; this.lblB.Text = "B: 0"; // @@ -434,11 +416,10 @@ private void InitializeComponent() // this.lblKey.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblKey.AutoSize = true; - this.lblKey.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblKey.Location = new System.Drawing.Point(1409, 665); - this.lblKey.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblKey.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblKey.Location = new System.Drawing.Point(1468, 818); this.lblKey.Name = "lblKey"; - this.lblKey.Size = new System.Drawing.Size(85, 15); + this.lblKey.Size = new System.Drawing.Size(112, 19); this.lblKey.TabIndex = 21; this.lblKey.Text = "Predicted Key: "; // @@ -448,21 +429,20 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.lblExeTime.AutoSize = true; this.lblExeTime.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblExeTime.Location = new System.Drawing.Point(35, 384); - this.lblExeTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblExeTime.Location = new System.Drawing.Point(47, 473); this.lblExeTime.Name = "lblExeTime"; - this.lblExeTime.Size = new System.Drawing.Size(116, 15); + this.lblExeTime.Size = new System.Drawing.Size(151, 19); this.lblExeTime.TabIndex = 4; this.lblExeTime.Text = "Execution Time: 0 ms"; // // barTempo // this.barTempo.Enabled = false; - this.barTempo.Location = new System.Drawing.Point(546, 25); - this.barTempo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.barTempo.Location = new System.Drawing.Point(728, 31); + this.barTempo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.barTempo.Maximum = 20; this.barTempo.Name = "barTempo"; - this.barTempo.Size = new System.Drawing.Size(149, 45); + this.barTempo.Size = new System.Drawing.Size(199, 56); this.barTempo.TabIndex = 7; this.barTempo.Value = 10; this.barTempo.Scroll += new System.EventHandler(this.barTempo_Scroll); @@ -471,10 +451,9 @@ private void InitializeComponent() // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(495, 31); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(660, 38); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(49, 15); + this.label7.Size = new System.Drawing.Size(63, 19); this.label7.TabIndex = 11; this.label7.Text = "Tempo: "; // @@ -482,10 +461,9 @@ private void InitializeComponent() // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(548, 54); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(731, 66); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(28, 15); + this.label8.Size = new System.Drawing.Size(37, 19); this.label8.TabIndex = 8; this.label8.Text = "50%"; // @@ -493,10 +471,9 @@ private void InitializeComponent() // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(606, 54); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(808, 66); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(34, 15); + this.label9.Size = new System.Drawing.Size(45, 19); this.label9.TabIndex = 9; this.label9.Text = "100%"; // @@ -504,21 +481,20 @@ private void InitializeComponent() // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(670, 53); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(893, 65); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(34, 15); + this.label10.Size = new System.Drawing.Size(45, 19); this.label10.TabIndex = 10; this.label10.Text = "150%"; // // barPitch // this.barPitch.Enabled = false; - this.barPitch.Location = new System.Drawing.Point(370, 384); - this.barPitch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.barPitch.Location = new System.Drawing.Point(493, 473); + this.barPitch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.barPitch.Maximum = 100; this.barPitch.Name = "barPitch"; - this.barPitch.Size = new System.Drawing.Size(149, 45); + this.barPitch.Size = new System.Drawing.Size(199, 56); this.barPitch.TabIndex = 7; this.barPitch.Value = 50; this.barPitch.Scroll += new System.EventHandler(this.barPitch_Scroll); @@ -527,10 +503,9 @@ private void InitializeComponent() // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(368, 413); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(491, 508); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(23, 15); + this.label11.Size = new System.Drawing.Size(30, 19); this.label11.TabIndex = 8; this.label11.Text = "-50"; // @@ -538,10 +513,9 @@ private void InitializeComponent() // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(439, 413); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(585, 508); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(13, 15); + this.label12.Size = new System.Drawing.Size(17, 19); this.label12.TabIndex = 9; this.label12.Text = "0"; // @@ -549,10 +523,9 @@ private void InitializeComponent() // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(495, 413); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(660, 508); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(25, 15); + this.label13.Size = new System.Drawing.Size(33, 19); this.label13.TabIndex = 10; this.label13.Text = "+50"; // @@ -560,20 +533,19 @@ private void InitializeComponent() // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(304, 384); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(405, 473); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(66, 15); + this.label14.Size = new System.Drawing.Size(85, 19); this.label14.TabIndex = 11; this.label14.Text = "Pitch Sync: "; // // barZoom // - this.barZoom.Location = new System.Drawing.Point(206, 384); - this.barZoom.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.barZoom.Location = new System.Drawing.Point(275, 473); + this.barZoom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.barZoom.Maximum = 2; this.barZoom.Name = "barZoom"; - this.barZoom.Size = new System.Drawing.Size(82, 45); + this.barZoom.Size = new System.Drawing.Size(109, 56); this.barZoom.TabIndex = 7; this.barZoom.Value = 1; // @@ -581,10 +553,9 @@ private void InitializeComponent() // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(271, 416); - this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label16.Location = new System.Drawing.Point(361, 512); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(19, 15); + this.label16.Size = new System.Drawing.Size(24, 19); this.label16.TabIndex = 8; this.label16.Text = "2k"; // @@ -592,10 +563,9 @@ private void InitializeComponent() // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(203, 416); - this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label17.Location = new System.Drawing.Point(271, 512); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(25, 15); + this.label17.Size = new System.Drawing.Size(33, 19); this.label17.TabIndex = 8; this.label17.Text = "500"; // @@ -603,10 +573,9 @@ private void InitializeComponent() // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label18.Location = new System.Drawing.Point(238, 416); - this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label18.Location = new System.Drawing.Point(317, 512); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(19, 15); + this.label18.Size = new System.Drawing.Size(24, 19); this.label18.TabIndex = 8; this.label18.Text = "1k"; // @@ -614,21 +583,19 @@ private void InitializeComponent() // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label19.Location = new System.Drawing.Point(157, 384); - this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label19.Location = new System.Drawing.Point(209, 473); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(40, 15); + this.label19.Size = new System.Drawing.Size(50, 19); this.label19.TabIndex = 11; this.label19.Text = "Zoom:"; // // lblError // this.lblError.AutoSize = true; - this.lblError.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblError.Location = new System.Drawing.Point(561, 384); - this.lblError.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblError.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblError.Location = new System.Drawing.Point(748, 473); this.lblError.Name = "lblError"; - this.lblError.Size = new System.Drawing.Size(52, 15); + this.lblError.Size = new System.Drawing.Size(70, 19); this.lblError.TabIndex = 18; this.lblError.Text = "+ 0 cents"; // @@ -636,10 +603,9 @@ private void InitializeComponent() // this.label20.AutoSize = true; this.label20.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label20.Location = new System.Drawing.Point(524, 384); - this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label20.Location = new System.Drawing.Point(699, 473); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(35, 15); + this.label20.Size = new System.Drawing.Size(47, 19); this.label20.TabIndex = 6; this.label20.Text = "Error:"; // @@ -652,8 +618,8 @@ private void InitializeComponent() this.helpToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(1682, 24); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(1832, 28); this.menuStrip1.TabIndex = 22; this.menuStrip1.Text = "menuStrip1"; // @@ -664,13 +630,13 @@ private void InitializeComponent() this.closeToolStripMenuItem, this.saveRecordingToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 26); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.btnOpen_Click); // @@ -678,7 +644,7 @@ private void InitializeComponent() // this.closeToolStripMenuItem.Enabled = false; this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(204, 26); this.closeToolStripMenuItem.Text = "Close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); // @@ -686,7 +652,7 @@ private void InitializeComponent() // this.saveRecordingToolStripMenuItem.Enabled = false; this.saveRecordingToolStripMenuItem.Name = "saveRecordingToolStripMenuItem"; - this.saveRecordingToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.saveRecordingToolStripMenuItem.Size = new System.Drawing.Size(204, 26); this.saveRecordingToolStripMenuItem.Text = "Save Recording..."; this.saveRecordingToolStripMenuItem.Click += new System.EventHandler(this.saveRecordingToolStripMenuItem_Click); // @@ -696,14 +662,14 @@ private void InitializeComponent() this.playToolStripMenuItem, this.stopToolStripMenuItem}); this.playbackToolStripMenuItem.Name = "playbackToolStripMenuItem"; - this.playbackToolStripMenuItem.Size = new System.Drawing.Size(66, 20); + this.playbackToolStripMenuItem.Size = new System.Drawing.Size(81, 24); this.playbackToolStripMenuItem.Text = "Playback"; // // playToolStripMenuItem // this.playToolStripMenuItem.Enabled = false; this.playToolStripMenuItem.Name = "playToolStripMenuItem"; - this.playToolStripMenuItem.Size = new System.Drawing.Size(98, 22); + this.playToolStripMenuItem.Size = new System.Drawing.Size(123, 26); this.playToolStripMenuItem.Text = "Play"; this.playToolStripMenuItem.Click += new System.EventHandler(this.btnPlay_Click); // @@ -711,7 +677,7 @@ private void InitializeComponent() // this.stopToolStripMenuItem.Enabled = false; this.stopToolStripMenuItem.Name = "stopToolStripMenuItem"; - this.stopToolStripMenuItem.Size = new System.Drawing.Size(98, 22); + this.stopToolStripMenuItem.Size = new System.Drawing.Size(123, 26); this.stopToolStripMenuItem.Text = "Stop"; this.stopToolStripMenuItem.Click += new System.EventHandler(this.stopToolStripMenuItem_Click); // @@ -720,13 +686,13 @@ private void InitializeComponent() this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.perferencesToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(55, 24); this.helpToolStripMenuItem.Text = "Help"; // // perferencesToolStripMenuItem // this.perferencesToolStripMenuItem.Name = "perferencesToolStripMenuItem"; - this.perferencesToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.perferencesToolStripMenuItem.Size = new System.Drawing.Size(167, 26); this.perferencesToolStripMenuItem.Text = "Perferences"; this.perferencesToolStripMenuItem.Click += new System.EventHandler(this.perferencesToolStripMenuItem_Click); // @@ -734,11 +700,10 @@ private void InitializeComponent() // this.lblMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblMode.AutoSize = true; - this.lblMode.Font = new System.Drawing.Font("Open Sans SemiBold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblMode.Location = new System.Drawing.Point(1478, 688); - this.lblMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblMode.Font = new System.Drawing.Font("Open Sans Semibold", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblMode.Location = new System.Drawing.Point(1560, 847); this.lblMode.Name = "lblMode"; - this.lblMode.Size = new System.Drawing.Size(37, 15); + this.lblMode.Size = new System.Drawing.Size(48, 19); this.lblMode.TabIndex = 21; this.lblMode.Text = "Mode"; // @@ -747,10 +712,10 @@ private void InitializeComponent() this.chbAllChords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbAllChords.AutoSize = true; this.chbAllChords.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chbAllChords.Location = new System.Drawing.Point(1517, 606); - this.chbAllChords.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chbAllChords.Location = new System.Drawing.Point(1619, 746); + this.chbAllChords.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.chbAllChords.Name = "chbAllChords"; - this.chbAllChords.Size = new System.Drawing.Size(71, 19); + this.chbAllChords.Size = new System.Drawing.Size(88, 23); this.chbAllChords.TabIndex = 13; this.chbAllChords.Text = "Show All"; this.chbAllChords.UseVisualStyleBackColor = true; @@ -759,19 +724,18 @@ private void InitializeComponent() // this.lblSelectTime.AutoSize = true; this.lblSelectTime.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblSelectTime.Location = new System.Drawing.Point(890, 28); - this.lblSelectTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSelectTime.Location = new System.Drawing.Point(1187, 34); this.lblSelectTime.Name = "lblSelectTime"; - this.lblSelectTime.Size = new System.Drawing.Size(68, 15); + this.lblSelectTime.Size = new System.Drawing.Size(90, 19); this.lblSelectTime.TabIndex = 24; this.lblSelectTime.Text = "Select Time:"; // // txtSelectTime // - this.txtSelectTime.Location = new System.Drawing.Point(962, 27); - this.txtSelectTime.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtSelectTime.Location = new System.Drawing.Point(1283, 33); + this.txtSelectTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtSelectTime.Name = "txtSelectTime"; - this.txtSelectTime.Size = new System.Drawing.Size(68, 20); + this.txtSelectTime.Size = new System.Drawing.Size(89, 22); this.txtSelectTime.TabIndex = 23; this.txtSelectTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -779,28 +743,27 @@ private void InitializeComponent() // this.lblLoopDuration.AutoSize = true; this.lblLoopDuration.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblLoopDuration.Location = new System.Drawing.Point(1034, 28); - this.lblLoopDuration.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblLoopDuration.Location = new System.Drawing.Point(1379, 34); this.lblLoopDuration.Name = "lblLoopDuration"; - this.lblLoopDuration.Size = new System.Drawing.Size(86, 15); + this.lblLoopDuration.Size = new System.Drawing.Size(108, 19); this.lblLoopDuration.TabIndex = 26; this.lblLoopDuration.Text = "Loop Duration:"; // // txtLoopTime // - this.txtLoopTime.Location = new System.Drawing.Point(1120, 27); - this.txtLoopTime.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtLoopTime.Location = new System.Drawing.Point(1493, 33); + this.txtLoopTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtLoopTime.Name = "txtLoopTime"; - this.txtLoopTime.Size = new System.Drawing.Size(68, 20); + this.txtLoopTime.Size = new System.Drawing.Size(89, 22); this.txtLoopTime.TabIndex = 25; this.txtLoopTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // prbLevelMeter // - this.prbLevelMeter.Location = new System.Drawing.Point(981, 26); - this.prbLevelMeter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.prbLevelMeter.Location = new System.Drawing.Point(1308, 32); + this.prbLevelMeter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.prbLevelMeter.Name = "prbLevelMeter"; - this.prbLevelMeter.Size = new System.Drawing.Size(201, 19); + this.prbLevelMeter.Size = new System.Drawing.Size(268, 23); this.prbLevelMeter.TabIndex = 28; this.prbLevelMeter.Visible = false; // @@ -808,10 +771,10 @@ private void InitializeComponent() // this.btnAddScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnAddScript.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAddScript.Location = new System.Drawing.Point(1593, 181); - this.btnAddScript.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnAddScript.Location = new System.Drawing.Point(1713, 223); + this.btnAddScript.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnAddScript.Name = "btnAddScript"; - this.btnAddScript.Size = new System.Drawing.Size(66, 24); + this.btnAddScript.Size = new System.Drawing.Size(88, 30); this.btnAddScript.TabIndex = 30; this.btnAddScript.Text = "Add"; this.btnAddScript.UseVisualStyleBackColor = true; @@ -821,11 +784,10 @@ private void InitializeComponent() // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Open Sans SemiBold", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(1478, 70); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Font = new System.Drawing.Font("Open Sans Semibold", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(1560, 86); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(126, 19); + this.label6.Size = new System.Drawing.Size(148, 23); this.label6.TabIndex = 31; this.label6.Text = "Processing Chain"; // @@ -835,20 +797,19 @@ private void InitializeComponent() this.lblSelMessage.AutoSize = true; this.lblSelMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSelMessage.ForeColor = System.Drawing.Color.Crimson; - this.lblSelMessage.Location = new System.Drawing.Point(1398, 93); - this.lblSelMessage.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblSelMessage.Location = new System.Drawing.Point(1453, 114); this.lblSelMessage.Name = "lblSelMessage"; - this.lblSelMessage.Size = new System.Drawing.Size(0, 13); + this.lblSelMessage.Size = new System.Drawing.Size(0, 17); this.lblSelMessage.TabIndex = 32; // // btnApplyScripts // this.btnApplyScripts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnApplyScripts.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnApplyScripts.Location = new System.Drawing.Point(1593, 210); - this.btnApplyScripts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnApplyScripts.Location = new System.Drawing.Point(1713, 258); + this.btnApplyScripts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnApplyScripts.Name = "btnApplyScripts"; - this.btnApplyScripts.Size = new System.Drawing.Size(66, 24); + this.btnApplyScripts.Size = new System.Drawing.Size(88, 30); this.btnApplyScripts.TabIndex = 33; this.btnApplyScripts.Text = "Apply"; this.btnApplyScripts.UseVisualStyleBackColor = true; @@ -861,22 +822,22 @@ private void InitializeComponent() this.tblSettings.ColumnCount = 1; this.tblSettings.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tblSettings.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tblSettings.Location = new System.Drawing.Point(1397, 240); - this.tblSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tblSettings.Location = new System.Drawing.Point(1452, 295); + this.tblSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tblSettings.Name = "tblSettings"; this.tblSettings.RowCount = 1; this.tblSettings.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tblSettings.Size = new System.Drawing.Size(262, 97); + this.tblSettings.Size = new System.Drawing.Size(349, 119); this.tblSettings.TabIndex = 34; // // btnSave // this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSave.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSave.Location = new System.Drawing.Point(1593, 342); - this.btnSave.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnSave.Location = new System.Drawing.Point(1713, 421); + this.btnSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(66, 24); + this.btnSave.Size = new System.Drawing.Size(88, 30); this.btnSave.TabIndex = 36; this.btnSave.Text = "Save"; this.btnSave.UseVisualStyleBackColor = true; @@ -887,10 +848,10 @@ private void InitializeComponent() this.btnDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnDefaults.Enabled = false; this.btnDefaults.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnDefaults.Location = new System.Drawing.Point(1522, 342); - this.btnDefaults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnDefaults.Location = new System.Drawing.Point(1618, 421); + this.btnDefaults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnDefaults.Name = "btnDefaults"; - this.btnDefaults.Size = new System.Drawing.Size(66, 24); + this.btnDefaults.Size = new System.Drawing.Size(88, 30); this.btnDefaults.TabIndex = 37; this.btnDefaults.Text = "Defaults"; this.btnDefaults.UseVisualStyleBackColor = true; @@ -901,10 +862,10 @@ private void InitializeComponent() this.cbPresets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cbPresets.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbPresets.FormattingEnabled = true; - this.cbPresets.Location = new System.Drawing.Point(1448, 115); - this.cbPresets.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbPresets.Location = new System.Drawing.Point(1520, 142); + this.cbPresets.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbPresets.Name = "cbPresets"; - this.cbPresets.Size = new System.Drawing.Size(141, 22); + this.cbPresets.Size = new System.Drawing.Size(187, 26); this.cbPresets.TabIndex = 38; this.cbPresets.SelectedIndexChanged += new System.EventHandler(this.cbPresets_SelectedIndexChanged); // @@ -913,10 +874,9 @@ private void InitializeComponent() this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label21.AutoSize = true; this.label21.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label21.Location = new System.Drawing.Point(1407, 117); - this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label21.Location = new System.Drawing.Point(1465, 144); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(39, 15); + this.label21.Size = new System.Drawing.Size(51, 19); this.label21.TabIndex = 39; this.label21.Text = "Preset"; // @@ -924,10 +884,10 @@ private void InitializeComponent() // this.btnSavePreset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSavePreset.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSavePreset.Location = new System.Drawing.Point(1593, 111); - this.btnSavePreset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnSavePreset.Location = new System.Drawing.Point(1713, 137); + this.btnSavePreset.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSavePreset.Name = "btnSavePreset"; - this.btnSavePreset.Size = new System.Drawing.Size(66, 24); + this.btnSavePreset.Size = new System.Drawing.Size(88, 30); this.btnSavePreset.TabIndex = 40; this.btnSavePreset.Text = "Save"; this.btnSavePreset.UseVisualStyleBackColor = true; @@ -938,8 +898,8 @@ private void InitializeComponent() this.segMode.Cursor = System.Windows.Forms.Cursors.Hand; this.segMode.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.segMode.Items = "Play Mode, Step Mode, Record Mode"; - this.segMode.Location = new System.Drawing.Point(131, 27); - this.segMode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.segMode.Location = new System.Drawing.Point(175, 33); + this.segMode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.segMode.Name = "segMode"; this.segMode.SegmentActiveTextColor = System.Drawing.Color.White; this.segMode.SegmentBackColor = System.Drawing.SystemColors.Control; @@ -947,15 +907,15 @@ private void InitializeComponent() this.segMode.SegmentInactiveTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(210)))), ((int)(((byte)(210))))); this.segMode.SegmentStyle = XanderUI.XUISegment.Style.Android; this.segMode.SelectedIndex = 0; - this.segMode.Size = new System.Drawing.Size(136, 47); + this.segMode.Size = new System.Drawing.Size(181, 58); this.segMode.TabIndex = 41; this.segMode.IndexChanged += new System.EventHandler(this.segMode_IndexChanged); // // numStepVal // this.numStepVal.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numStepVal.Location = new System.Drawing.Point(69, 54); - this.numStepVal.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numStepVal.Location = new System.Drawing.Point(92, 66); + this.numStepVal.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.numStepVal.Maximum = new decimal(new int[] { 1000, 0, @@ -967,7 +927,7 @@ private void InitializeComponent() 0, 0}); this.numStepVal.Name = "numStepVal"; - this.numStepVal.Size = new System.Drawing.Size(56, 22); + this.numStepVal.Size = new System.Drawing.Size(75, 25); this.numStepVal.TabIndex = 42; this.numStepVal.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.numStepVal.Value = new decimal(new int[] { @@ -982,10 +942,9 @@ private void InitializeComponent() // this.lblStep.AutoSize = true; this.lblStep.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblStep.Location = new System.Drawing.Point(10, 55); - this.lblStep.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblStep.Location = new System.Drawing.Point(13, 68); this.lblStep.Name = "lblStep"; - this.lblStep.Size = new System.Drawing.Size(57, 15); + this.lblStep.Size = new System.Drawing.Size(75, 19); this.lblStep.TabIndex = 43; this.lblStep.Text = "Step (ms):"; this.lblStep.Visible = false; @@ -994,10 +953,10 @@ private void InitializeComponent() // this.chbFilter.AutoSize = true; this.chbFilter.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chbFilter.Location = new System.Drawing.Point(646, 384); - this.chbFilter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chbFilter.Location = new System.Drawing.Point(861, 473); + this.chbFilter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.chbFilter.Name = "chbFilter"; - this.chbFilter.Size = new System.Drawing.Size(130, 19); + this.chbFilter.Size = new System.Drawing.Size(166, 23); this.chbFilter.TabIndex = 45; this.chbFilter.Text = "Note Highlight Filter"; this.chbFilter.UseVisualStyleBackColor = true; @@ -1008,10 +967,9 @@ private void InitializeComponent() this.lblFilterFreq.AutoSize = true; this.lblFilterFreq.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblFilterFreq.ForeColor = System.Drawing.Color.Gray; - this.lblFilterFreq.Location = new System.Drawing.Point(573, 531); - this.lblFilterFreq.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblFilterFreq.Location = new System.Drawing.Point(764, 654); this.lblFilterFreq.Name = "lblFilterFreq"; - this.lblFilterFreq.Size = new System.Drawing.Size(41, 15); + this.lblFilterFreq.Size = new System.Drawing.Size(54, 19); this.lblFilterFreq.TabIndex = 46; this.lblFilterFreq.Text = "440 Hz"; this.lblFilterFreq.Visible = false; @@ -1024,11 +982,12 @@ private void InitializeComponent() this.flpScripts.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.flpScripts.ColumnCount = 1; this.flpScripts.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.flpScripts.Location = new System.Drawing.Point(1397, 140); + this.flpScripts.Location = new System.Drawing.Point(1452, 172); + this.flpScripts.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flpScripts.Name = "flpScripts"; this.flpScripts.RowCount = 1; this.flpScripts.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.flpScripts.Size = new System.Drawing.Size(191, 96); + this.flpScripts.Size = new System.Drawing.Size(255, 118); this.flpScripts.TabIndex = 47; // // btnFilterDrag @@ -1036,10 +995,10 @@ private void InitializeComponent() this.btnFilterDrag.BackColor = System.Drawing.SystemColors.ControlLight; this.btnFilterDrag.Enabled = false; this.btnFilterDrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnFilterDrag.Location = new System.Drawing.Point(546, 526); - this.btnFilterDrag.Margin = new System.Windows.Forms.Padding(2); + this.btnFilterDrag.Location = new System.Drawing.Point(728, 647); + this.btnFilterDrag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnFilterDrag.Name = "btnFilterDrag"; - this.btnFilterDrag.Size = new System.Drawing.Size(22, 24); + this.btnFilterDrag.Size = new System.Drawing.Size(29, 30); this.btnFilterDrag.TabIndex = 44; this.btnFilterDrag.TabStop = false; this.btnFilterDrag.UseVisualStyleBackColor = false; @@ -1054,26 +1013,26 @@ private void InitializeComponent() this.cwvViewer.BytesPerSample = 0; this.cwvViewer.Font = new System.Drawing.Font("Open Sans", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cwvViewer.LeftSample = ((long)(0)); - this.cwvViewer.Location = new System.Drawing.Point(24, 93); + this.cwvViewer.Location = new System.Drawing.Point(32, 114); this.cwvViewer.LoopEndSample = ((long)(0)); - this.cwvViewer.Margin = new System.Windows.Forms.Padding(2); + this.cwvViewer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cwvViewer.Name = "cwvViewer"; this.cwvViewer.PenColor = System.Drawing.Color.DodgerBlue; this.cwvViewer.PenWidth = 1F; this.cwvViewer.RightSample = ((long)(0)); this.cwvViewer.SamplesPerPixel = 128; this.cwvViewer.SelectSample = ((long)(0)); - this.cwvViewer.Size = new System.Drawing.Size(1369, 245); + this.cwvViewer.Size = new System.Drawing.Size(1414, 302); this.cwvViewer.StartPosition = ((long)(0)); this.cwvViewer.TabIndex = 2; this.cwvViewer.WaveStream = null; // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(1682, 768); + this.ClientSize = new System.Drawing.Size(1832, 945); this.Controls.Add(this.flpScripts); this.Controls.Add(this.lblFilterFreq); this.Controls.Add(this.chbFilter); @@ -1147,7 +1106,7 @@ private void InitializeComponent() this.Controls.Add(this.menuStrip1); this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "Form1"; this.Text = "Music Analyser"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);