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

已點歌曲列表刪除

Browse Source
This commit is contained in:
allen.yan 2025-08-08 16:32:54 +08:00
parent a4b397e812
commit 2d8e94704d
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
DBObj/SongList.cs
View File

@ -9,10 +9,10 @@ namespace DBObj
{ {
private static bool isWelcome = true; private static bool isWelcome = true;
public static SongData welcome; public static SongData welcome;
public static SongData close ; public static SongData close;
private static SongData publicPlaying=null; private static SongData publicPlaying = null;
private static List<SongData> publicSong = new(); private static List<SongData> publicSong = new();
private static SongData playing=null; private static SongData playing = null;
private static List<SongData> not_played = new List<SongData>(); private static List<SongData> not_played = new List<SongData>();
private static List<SongData> played = new List<SongData>(); private static List<SongData> played = new List<SongData>();
public static List<SongData> PublicSong() => publicSong; public static List<SongData> PublicSong() => publicSong;
@ -20,7 +20,7 @@ namespace DBObj
public static SongData Current() public static SongData Current()
{ {
Console.WriteLine(not_played.Count + " Current " + playing); Console.WriteLine(not_played.Count + " Current " + playing);
return (playing ==null) ? publicPlaying : playing; return (playing == null) ? publicPlaying : playing;
} }
public static SongData Next() public static SongData Next()
{ {
@ -58,12 +58,17 @@ namespace DBObj
} }
private static SongData NextPublicSong() private static SongData NextPublicSong()
{ {
if (Program.room.IsClose()) { if (Program.room.IsClose())
{
publicPlaying = close; publicPlaying = close;
} else if(Program.room.IsOpen() && isWelcome){ }
else if (Program.room.IsOpen() && isWelcome)
{
isWelcome = false; isWelcome = false;
publicPlaying = welcome; publicPlaying = welcome;
} else { }
else
{
publicPlaying = publicSong[0]; publicPlaying = publicSong[0];
publicSong.RemoveAt(0); publicSong.RemoveAt(0);
publicSong.Add(publicPlaying); publicSong.Add(publicPlaying);
@ -97,19 +102,16 @@ namespace DBObj
public static void Cancel(SongData song) public static void Cancel(SongData song)
{ {
//if (song.FileExistsInServers()) not_played.Remove(song);
//{ played.Remove(song);
not_played.Remove(song); chkCut();
played.Remove(song);
// PrimaryForm.Instance.AddSongCount(songData.Number);
chkCut();
//}
} }
public static void Insert(SongData song) public static void Insert(SongData song)
{ {
if (song.FileExistsInServers()) { if (song.FileExistsInServers())
not_played.Insert(0, new SongData(song,PlayState.InsertPlayback)); {
not_played.Insert(0, new SongData(song, PlayState.InsertPlayback));
chkCut(); chkCut();
} }
else else
@ -126,16 +128,21 @@ namespace DBObj
PrimaryForm.Instance.Invoke(new System.Action(() => PrimaryForm.Instance.videoPlayerForm.PlayNextSong())); PrimaryForm.Instance.Invoke(new System.Action(() => PrimaryForm.Instance.videoPlayerForm.PlayNextSong()));
else else
PrimaryForm.Instance.videoPlayerForm.PlayNextSong(); PrimaryForm.Instance.videoPlayerForm.PlayNextSong();
} else { }
else
{
UpdateNextSongLabel(); UpdateNextSongLabel();
} }
} }
public static void UpdateNextSongLabel() public static void UpdateNextSongLabel()
{ {
if (Program.room.IsClose()) { if (Program.room.IsClose())
{
VideoPlayerForm.overlayForm.UpdateTopLeftLabel(" "); VideoPlayerForm.overlayForm.UpdateTopLeftLabel(" ");
} else { }
else
{
VideoPlayerForm.overlayForm.UpdateTopLeftLabel( VideoPlayerForm.overlayForm.UpdateTopLeftLabel(
(not_played.Count > 0) ? not_played[0].next_song_text() : "目前沒有下一首，請踴躍點歌!!!" (not_played.Count > 0) ? not_played[0].next_song_text() : "目前沒有下一首，請踴躍點歌!!!"
); );