Add setting for NTP and event chord time

AmanoTooko · Apr 1, 2019 · ea2960e · ea2960e
1 parent c028421
commit ea2960e
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 15 deletions.
diff --git a/Daigassou/App.config b/Daigassou/App.config
@@ -16,6 +16,15 @@
             <setting name="IsEightKeyLayout" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="MinEventMs" serializeAs="String">
+                <value>35</value>
+            </setting>
+            <setting name="MinChordMs" serializeAs="String">
+                <value>125</value>
+            </setting>
+            <setting name="NtpServer" serializeAs="String">
+                <value>ntp3.aliyun.com</value>
+            </setting>
         </Daigassou.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Daigassou/Daigassou.csproj b/Daigassou/Daigassou.csproj
@@ -129,6 +129,7 @@
     <Compile Include="Input_Midi\MidiToKey.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Settings.cs" />
     <EmbeddedResource Include="AboutForm.resx">
       <DependentUpon>AboutForm.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/Daigassou/Input_Midi/MidiToKey.cs b/Daigassou/Input_Midi/MidiToKey.cs
@@ -64,8 +64,8 @@ public void TrackPlaybackPause()
     }
     internal class MidiToKey
     {
-        private readonly int MIN_DELAY_TIME_MS_EVENT;
-        private readonly int MIN_DELAY_TIME_MS_CHORD;
+        private readonly uint MIN_DELAY_TIME_MS_EVENT;
+        private readonly uint MIN_DELAY_TIME_MS_CHORD;
         private readonly List<NotesManager> tracks;
         public int Index = 0;
         private MidiFile midi;
@@ -80,8 +80,8 @@ public MidiToKey()
             tracks = new List<NotesManager>();
             Bpm = 80;
             Offset = EnumPitchOffset.None;
-            MIN_DELAY_TIME_MS_EVENT = 35;
-            MIN_DELAY_TIME_MS_CHORD = 120;
+            MIN_DELAY_TIME_MS_EVENT = Properties.Settings.Default.MinEventMs;
+            MIN_DELAY_TIME_MS_CHORD = Properties.Settings.Default.MinChordMs;
         }
 
         public EnumPitchOffset Offset { get; set; }

diff --git a/Daigassou/MainForm.cs b/Daigassou/MainForm.cs
@@ -247,7 +247,7 @@ private void button2_Click(object sender, EventArgs e)
         private void btnTimeSync_Click(object sender, EventArgs e)
         {
             double error = 0;
-            var offset = new NtpClient("ntp3.aliyun.com").GetOffset(out error);
+            var offset = new NtpClient(Properties.Settings.Default.NtpServer).GetOffset(out error);
             if (CommonUtilities.SetSystemDateTime.SetLocalTimeByStr(
                 DateTime.Now.AddMilliseconds(offset.TotalMilliseconds * -0.5)))
                 tlblTime.Text = $"已同步 误差{offset.TotalMilliseconds}ms";

diff --git a/Daigassou/Properties/AssemblyInfo.cs b/Daigassou/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("大合奏！-Daigassou-")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("fairylab.org")]
+[assembly: AssemblyCompany("ffxiv.cat")]
 [assembly: AssemblyProduct("Daigassou")]
-[assembly: AssemblyCopyright("Copyright ©  Y.Morino@Fairylab 2018")]
+[assembly: AssemblyCopyright("Copyright ©  shiro@ffxiv.cat 2018-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Daigassou/Properties/Settings.Designer.cs b/Daigassou/Properties/Settings.Designer.cs
diff --git a/Daigassou/Properties/Settings.settings b/Daigassou/Properties/Settings.settings
@@ -2,20 +2,29 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Daigassou.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="KeyBinding8" Type="System.Collections.ArrayList" Scope="User">
+    <Setting Name="KeyBinding8" GenerateDefaultValueInCode="false" Type="System.Collections.ArrayList" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="StartKey" Type="System.Int32" Scope="User">
+    <Setting Name="StartKey" GenerateDefaultValueInCode="false" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
-    <Setting Name="CtrlKeyBinding" Type="System.Collections.ArrayList" Scope="User">
+    <Setting Name="CtrlKeyBinding" GenerateDefaultValueInCode="false" Type="System.Collections.ArrayList" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="IsEightKeyLayout" Type="System.Boolean" Scope="User">
+    <Setting Name="IsEightKeyLayout" GenerateDefaultValueInCode="false" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="KeyBinding22" Type="System.Collections.ArrayList" Scope="User">
+    <Setting Name="KeyBinding22" GenerateDefaultValueInCode="false" Type="System.Collections.ArrayList" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="MinEventMs" GenerateDefaultValueInCode="false" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">35</Value>
+    </Setting>
+    <Setting Name="MinChordMs" GenerateDefaultValueInCode="false" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">125</Value>
+    </Setting>
+    <Setting Name="NtpServer" Type="System.String" Scope="User">
+      <Value Profile="(Default)">ntp3.aliyun.com</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Daigassou/Settings.cs b/Daigassou/Settings.cs
@@ -0,0 +1,28 @@
+namespace Daigassou.Properties {
+
+
+    // 通过此类可以处理设置类的特定事件: 
+    //  在更改某个设置的值之前将引发 SettingChanging 事件。
+    //  在更改某个设置的值之后将引发 PropertyChanged 事件。
+    //  在加载设置值之后将引发 SettingsLoaded 事件。
+    //  在保存设置值之前将引发 SettingsSaving 事件。
+    public sealed partial class Settings {
+
+        public Settings() {
+            // // 若要为保存和更改设置添加事件处理程序，请取消注释下列行: 
+            //
+            // this.SettingChanging += this.SettingChangingEventHandler;
+            //
+            // this.SettingsSaving += this.SettingsSavingEventHandler;
+            //
+        }
+
+        private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+            // 在此处添加用于处理 SettingChangingEvent 事件的代码。
+        }
+
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+            // 在此处添加用于处理 SettingsSaving 事件的代码。
+        }
+    }
+}