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/DBObj/SongData.cs b/DBObj/SongData.cs index 4d67087..1517e13 100644 --- a/DBObj/SongData.cs +++ b/DBObj/SongData.cs @@ -122,7 +122,7 @@ namespace DBObj var check = IsFtpUriReachable(new Uri(server).ToString()); if (!string.IsNullOrWhiteSpace(server) && check != false) { - Console.WriteLine(new Uri(new Uri(server), filename)); + // Console.WriteLine(new Uri(new Uri(server), filename)); if (IsFtpUriReachable(new Uri(new Uri(server), filename).ToString())) return new Uri(new Uri(server), filename); } } 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(); }; } diff --git a/VideoPlayerForm.cs b/VideoPlayerForm.cs index 22b7478..88ef3aa 100644 --- a/VideoPlayerForm.cs +++ b/VideoPlayerForm.cs @@ -126,6 +126,8 @@ namespace DualScreenDemo this.Controls.Add(PrimaryForm.Instance.videoView1); PrimaryForm.Instance.videoView1.MediaPlayer = _mediaService1.Player; PrimaryForm.Instance.videoView0.MediaPlayer = _mediaService0.Player; + //同步畫面比例 + _mediaService0.Player.AspectRatio = "8:5"; _mediaService0._zero = true; PlayNextSong(); } @@ -347,16 +349,21 @@ namespace DualScreenDemo try { string pathToPlay = song.getFile(); - Uri url = song.getFileUrl(); - if (pathToPlay == null) _mediaService0.LoadMedia(url, 0); - //同步畫面播放器載入media設置參數 - else _mediaService0.LoadMedia(pathToPlay, 0); - // _mediaService0.Player.Media.AddOption(":no-audio"); - _mediaService0.Player.AspectRatio = "8:5"; - if(pathToPlay==null)_mediaService1.LoadMedia(url, song.isPublicSong ? 0 : 1); + Uri url = song.getFileUrl(); //影片畫面播放器載入media設置聲道 - else _mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1); - + if (pathToPlay == null) + { + _mediaService0.LoadMedia(url, 0); + _mediaService1.LoadMedia(url, song.isPublicSong ? 0 : 1); + } + else + { + _mediaService0.LoadMedia(pathToPlay, 0); + _mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1); + } + // _mediaService0.Player.Media.AddOption(":no-audio"); + // _mediaService0.Player.AspectRatio = "8:5"; + isVocalRemoved = true; if (isMuted) { Mute(true); } @@ -364,7 +371,8 @@ namespace DualScreenDemo SetVolume(100 + song.getBasic().getDbChange()); Task.Run(() => Thread.Sleep(100)); if (isSyncToPrimaryMonitor) SyncToPrimaryMonitor(); - if (url == null&&!song.isPublicSong) PlayNextSong(); + //ftp抓不到檔案跳下一首歌 + if (url == null && !song.isPublicSong) PlayNextSong(); PrimaryForm.Instance.standardKeyButton.PerformClick(); return Task.CompletedTask; }