已點歌曲列表刪除

This commit is contained in:
allen.yan 2025-08-08 16:32:54 +08:00
parent a4b397e812
commit 2d8e94704d

View File

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