diff --git a/CommandHandler.cs b/CommandHandler.cs index 53f68cd..b00c51b 100644 --- a/CommandHandler.cs +++ b/CommandHandler.cs @@ -136,7 +136,7 @@ namespace DualScreenDemo OverlayForm.Instance.topRightTimer.Stop(); break; case "A281A4": - SafeInvokeAction("A281A4",() => OverlayForm.MainForm.ShowTopRightLabel("↑升2調 ")); + SafeInvokeAction("A281A4",() => OverlayForm.MainForm.ShowTopRightLabel(" 女調 ")); OverlayForm.Instance.topRightTimer.Stop(); break; case "A280A4": @@ -151,7 +151,7 @@ namespace DualScreenDemo OverlayForm.Instance.topRightTimer.Stop(); break; case "A27DA4": - SafeInvokeAction("A27EA4",() => OverlayForm.MainForm.ShowTopRightLabel("↓降2調 ")); + SafeInvokeAction("A27EA4",() => OverlayForm.MainForm.ShowTopRightLabel(" 男調 ")); OverlayForm.Instance.topRightTimer.Stop(); break; case "A27CA4": diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs index a03f486..85f59c7 100644 --- a/PrimaryFormParts/PrimaryForm.cs +++ b/PrimaryFormParts/PrimaryForm.cs @@ -1034,14 +1034,16 @@ namespace DualScreenDemo { videoPlayerForm.SetVolume(videoPlayerForm.GetVolume() + 5); int vol = videoPlayerForm.GetVolume() - 100; - OverlayForm.MainForm.ShowTopRightLabel(vol.ToString(), null); + OverlayForm.MainForm.ShowTopRightLabel((vol+5).ToString(), null); + OverlayForm.Instance.topRightTimer.Stop(); }; musicDownButton.Click -= (sender, e) => { OverlayForm.MainForm.ShowTopRightLabelTime("音量 ↓", "a2 b4 a4"); }; musicDownButton.Click += (sender, e) => { videoPlayerForm.SetVolume(videoPlayerForm.GetVolume() - 5); int vol = videoPlayerForm.GetVolume() - 100; - OverlayForm.MainForm.ShowTopRightLabel(vol.ToString(), null); + OverlayForm.MainForm.ShowTopRightLabel((vol-5).ToString(), null); + OverlayForm.Instance.topRightTimer.Stop(); }; }