已點歌曲列表刪除
This commit is contained in:
parent
a4b397e812
commit
2d8e94704d
@ -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,18 +102,15 @@ namespace DBObj
|
||||
|
||||
public static void Cancel(SongData song)
|
||||
{
|
||||
//if (song.FileExistsInServers())
|
||||
//{
|
||||
not_played.Remove(song);
|
||||
played.Remove(song);
|
||||
// PrimaryForm.Instance.AddSongCount(songData.Number);
|
||||
chkCut();
|
||||
//}
|
||||
}
|
||||
|
||||
public static void Insert(SongData song)
|
||||
{
|
||||
if (song.FileExistsInServers()) {
|
||||
if (song.FileExistsInServers())
|
||||
{
|
||||
not_played.Insert(0, new SongData(song, PlayState.InsertPlayback));
|
||||
chkCut();
|
||||
}
|
||||
@ -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() : "目前沒有下一首,請踴躍點歌!!!"
|
||||
);
|
||||
|
Loading…
x
Reference in New Issue
Block a user