Leecheng/superstar_v2
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2508281330

Browse Source 
清理已未使用註解function
This commit is contained in:
jasonchenwork 2025-08-28 13:30:59 +08:00
parent 2b25b14047
commit 9e44419710
4 changed files with 6 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OverlayFormObj/OverlayForm.Labels.cs
View File

@ -336,7 +336,7 @@ namespace OverlayFormObj
topLeftLabel.Text = text; topLeftLabel.Text = text;
topLeftLabel.Visible = true; // 確保標籤顯示 topLeftLabel.Visible = true; // 確保標籤顯示
Console.WriteLine($"更新顯示: {text}"); Console.WriteLine($"更新顯示: {text}");
Console.WriteLine(topLeftLabel.Location); // Console.WriteLine(topLeftLabel.Location);
} }
private void InitializeTopRightLabel() private void InitializeTopRightLabel()

21
PromotionsAndMenuPanel.cs
View File

@ -1,12 +1,8 @@
namespace DualScreenDemo namespace DualScreenDemo
{ {
public class PromotionsAndMenuPanel : Panel public class PromotionsAndMenuPanel : Panel
{ {
//public ImagePanel prevPagePanel;
public ImagePanel currentPagePanel; public ImagePanel currentPagePanel;
//public ImagePanel nextPagePanel;
private List<Image> promotionsAndMenuImages; private List<Image> promotionsAndMenuImages;
private const int ImagesPerPage = 1; private const int ImagesPerPage = 1;
@ -34,25 +30,17 @@ namespace DualScreenDemo
private void InitializePages() private void InitializePages()
{ {
//prevPagePanel = new ImagePanel();
currentPagePanel = new ImagePanel(); currentPagePanel = new ImagePanel();
// nextPagePanel = new ImagePanel();
// PrimaryForm.ResizeAndPositionControl(prevPagePanel, -1440, 0, 1440, 900);
PrimaryForm.ResizeAndPositionControl(currentPagePanel, 0, 0, 1440, 900); PrimaryForm.ResizeAndPositionControl(currentPagePanel, 0, 0, 1440, 900);
// PrimaryForm.ResizeAndPositionControl(nextPagePanel, 1440, 0, 1440, 900);
//this.Controls.Add(prevPagePanel);
this.Controls.Add(currentPagePanel); this.Controls.Add(currentPagePanel);
//this.Controls.Add(nextPagePanel);
} }
public void LoadImages(List<Image> images) public void LoadImages(List<Image> images)
{ {
promotionsAndMenuImages = images; promotionsAndMenuImages = images;
//LoadPage(currentPageIndex - 1);
LoadPage(currentPageIndex); LoadPage(currentPageIndex);
//LoadPage(currentPageIndex + 1);
} }
private void LoadPage(int pageIndex) private void LoadPage(int pageIndex)
@ -77,11 +65,6 @@ namespace DualScreenDemo
private ImagePanel IdentifyTargetPanel(int pageIndex) private ImagePanel IdentifyTargetPanel(int pageIndex)
{ {
//if (pageIndex == currentPageIndex - 1)
// return prevPagePanel;
// else if (pageIndex == currentPageIndex + 1)
// return nextPagePanel;
// else
return currentPagePanel; return currentPagePanel;
} }
@ -173,9 +156,7 @@ namespace DualScreenDemo
if (currentPageIndex > 0) if (currentPageIndex > 0)
{ {
currentPageIndex--; currentPageIndex--;
//LoadPage(currentPageIndex - 1);
LoadPage(currentPageIndex); LoadPage(currentPageIndex);
//LoadPage(currentPageIndex + 1);
} }
else else
{ {
@ -190,9 +171,7 @@ namespace DualScreenDemo
if (currentPageIndex < (promotionsAndMenuImages.Count - 1) / ImagesPerPage) if (currentPageIndex < (promotionsAndMenuImages.Count - 1) / ImagesPerPage)
{ {
currentPageIndex++; currentPageIndex++;
//LoadPage(currentPageIndex - 1);
LoadPage(currentPageIndex); LoadPage(currentPageIndex);
//LoadPage(currentPageIndex + 1);
} }
else { else {

35
Services/MediaService.cs
View File

@ -15,7 +15,7 @@ namespace DualScreenDemo.Services
{ {
Core.Initialize(); Core.Initialize();
_libVLC = new LibVLC( _libVLC = new LibVLC(
// "--verbose=-1", "--verbose=-1",
// enableDebugLogs: true, // enableDebugLogs: true,
"--audio-time-stretch", "--audio-time-stretch",
"--vout=automatic", "--vout=automatic",
@ -115,39 +115,6 @@ namespace DualScreenDemo.Services
public void Stop() => _mediaPlayer.Stop(); public void Stop() => _mediaPlayer.Stop();
#endregion #endregion
#region Audio
public List<TrackDescription> GetAudioTracks()
{
var result = new List<TrackDescription>();
var media = _mediaPlayer.Media;
if (media == null) return result;
//if (!media.IsParsed)
// media.Parse(MediaParseOptions.ParseLocal);
//var tracks = media.Tracks;
// if (tracks == null) return result;
// foreach (var track in tracks.Where(t => t.TrackType == TrackType.Audio))
// {
// result.Add(new TrackDescription
// {
// Id = track.Id,
// Name = !string.IsNullOrEmpty(track.Language) ? track.Language : $"Audio Track {track.Id}"
// });
// }
return result;
}
public void SetAudioTrack(int trackIndex)
{
var audioTracks = GetAudioTracks();
if (trackIndex < 0 || trackIndex >= audioTracks.Count) return;
//_mediaPlayer.SetAudioTrack(audioTracks[trackIndex].Id);
}
#endregion
#region Volume #region Volume
public void SetVolume(int volume) => _mediaPlayer.SetVolume(volume); public void SetVolume(int volume) => _mediaPlayer.SetVolume(volume);
public int GetVolume() => _mediaPlayer.Volume; public int GetVolume() => _mediaPlayer.Volume;

13
VideoPlayerForm.cs
View File

@ -123,8 +123,6 @@ namespace DualScreenDemo
} }
else else
{ {
// _mediaService0.SetVideoOutput(PrimaryForm.Instance.videoPanel.Handle, PrimaryForm.Instance.videoPanel.Width, PrimaryForm.Instance.videoPanel.Height);
//_mediaService1.SetVideoOutput(this.Handle, secondMonitor.Bounds.Width, secondMonitor.Bounds.Height);
this.Controls.Add(PrimaryForm.Instance.videoView1); this.Controls.Add(PrimaryForm.Instance.videoView1);
PrimaryForm.Instance.videoView1.MediaPlayer = _mediaService1.Player; PrimaryForm.Instance.videoView1.MediaPlayer = _mediaService1.Player;
PrimaryForm.Instance.videoView0.MediaPlayer = _mediaService0.Player; PrimaryForm.Instance.videoView0.MediaPlayer = _mediaService0.Player;
@ -348,12 +346,13 @@ namespace DualScreenDemo
try try
{ {
string pathToPlay = song.getFile(); string pathToPlay = song.getFile();
//同步畫面播放器載入media設置參數
_mediaService0.LoadMedia(pathToPlay, 0); _mediaService0.LoadMedia(pathToPlay, 0);
_mediaService0.Player.Media.AddOption(":no-audio"); _mediaService0.Player.Media.AddOption(":no-audio");
_mediaService0.Player.AspectRatio = "8:5"; _mediaService0.Player.AspectRatio = "8:5";
// _mediaService0.Player.Scale = 1.5f; //影片畫面播放器載入media設置聲道
_mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1); _mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1);
//公播時註銷原唱按鈕事件
if (song.isPublicSong) if (song.isPublicSong)
{ {
PrimaryForm.Instance.originalSongButton.Click -= PrimaryForm.Instance.OriginalSongButton_Click; PrimaryForm.Instance.originalSongButton.Click -= PrimaryForm.Instance.OriginalSongButton_Click;
@ -363,13 +362,13 @@ namespace DualScreenDemo
PrimaryForm.Instance.originalSongButton.Click -= PrimaryForm.Instance.OriginalSongButton_Click; PrimaryForm.Instance.originalSongButton.Click -= PrimaryForm.Instance.OriginalSongButton_Click;
PrimaryForm.Instance.originalSongButton.Click += PrimaryForm.Instance.OriginalSongButton_Click; PrimaryForm.Instance.originalSongButton.Click += PrimaryForm.Instance.OriginalSongButton_Click;
} }
isVocalRemoved = true; isVocalRemoved = true;
if (isMuted) { Mute(true); } if (isMuted) { Mute(true); }
// 音量處理 // 音量處理
SetVolume(100 + song.getBasic().getDbChange()); SetVolume(100 + song.getBasic().getDbChange());
Task.Run(() => Thread.Sleep(100)); Task.Run(() => Thread.Sleep(100));
Console.WriteLine(_mediaService1.GetVolume());
if (isSyncToPrimaryMonitor) SyncToPrimaryMonitor(); if (isSyncToPrimaryMonitor) SyncToPrimaryMonitor();
return Task.CompletedTask; return Task.CompletedTask;
} }
@ -498,12 +497,10 @@ namespace DualScreenDemo
{ {
if (isMuted) if (isMuted)
{ {
// _mediaService0.Mute(true);
_mediaService1.Mute(true); _mediaService1.Mute(true);
} }
else else
{ {
// _ToggleVocalRemoval(isVocalRemoved);
_mediaService1.Mute(false); _mediaService1.Mute(false);
} }
return isMuted; return isMuted;
@ -524,7 +521,6 @@ namespace DualScreenDemo
{ {
if (isVocalRemoved) if (isVocalRemoved)
{ {
_mediaService1.Player.Select(TrackType.Audio, "audio/2"); _mediaService1.Player.Select(TrackType.Audio, "audio/2");
isVocalRemoved = false; isVocalRemoved = false;
@ -535,7 +531,6 @@ namespace DualScreenDemo
// _mediaService1.Player.Select(TrackType.Audio, "audio/3"); // _mediaService1.Player.Select(TrackType.Audio, "audio/3");
isVocalRemoved = true; isVocalRemoved = true;
} }
// isVocalRemoved = _ToggleVocalRemoval(!isVocalRemoved);
OverlayForm.MainForm.ShowTopRightLabelTime(isVocalRemoved ? "無人聲" : "有人聲"); OverlayForm.MainForm.ShowTopRightLabelTime(isVocalRemoved ? "無人聲" : "有人聲");
} }