mbrucedogs/KaraokePC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored to queueitem for singer

Browse Source 
Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>
This commit is contained in:
Matt Bruce 2016-11-20 17:53:44 -06:00
parent b7369213f2
commit 85a14d1ad6
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FirebaseKaraoke/FirebaseController.cs
View File

@ -118,7 +118,7 @@ namespace KaraokePlayer.Classes
if (CurrentSong == null || CurrentSong.Path != item.Song.Path) if (CurrentSong == null || CurrentSong.Path != item.Song.Path)
{ {
CurrentSong = item.Song; CurrentSong = item.Song;
_songChanged(new ControllerSongChangedEventArgs(item.Song)); _songChanged(new ControllerSongChangedEventArgs(item));
} }
} }

6
FirebaseKaraoke/PlayerDelegates.cs
View File

@ -17,11 +17,11 @@ namespace KaraokePlayer.Classes
} }
public class ControllerSongChangedEventArgs public class ControllerSongChangedEventArgs
{ {
public ControllerSongChangedEventArgs(Song song) public ControllerSongChangedEventArgs(QueueItem queueItem)
{ {
Song = song; QueueItem = queueItem;
} }
public Song Song { get; } public QueueItem QueueItem { get; }
} }
public delegate void ControllerStateChangedEventHandler(ControllerStateChangedEventArgs args); public delegate void ControllerStateChangedEventHandler(ControllerStateChangedEventArgs args);

4
KaraokePlayer/MainForm.cs
View File

@ -56,7 +56,7 @@ namespace KaraokePlayer
songChanged: (args) => songChanged: (args) =>
{ {
this.Invoke(new Action(() => { player.stop(); })); this.Invoke(new Action(() => { player.stop(); }));
player.Song = args.Song; player.QueueItem = args.QueueItem;
this.Invoke(new Action(() => { previewSong(); })); this.Invoke(new Action(() => { previewSong(); }));
} }
); );
@ -70,7 +70,7 @@ namespace KaraokePlayer
private async void previewSong() private async void previewSong()
{ {
songInfoForm.Update(player.Song); songInfoForm.Update(player.QueueItem);
songInfoForm.Show(); songInfoForm.Show();
if(controller.Settings == null || controller.Settings.AutoAdvance) if(controller.Settings == null || controller.Settings.AutoAdvance)
{ {

12
KaraokePlayer/PlayerWrapper.cs
View File

@ -16,7 +16,7 @@ namespace KaraokePlayer
private KaraokeVideoPlayer currentPlayer = null; private KaraokeVideoPlayer currentPlayer = null;
private KaraokeVideoPlayer mp4Player; private KaraokeVideoPlayer mp4Player;
private KaraokeVideoPlayer cdgPlayer; private KaraokeVideoPlayer cdgPlayer;
public Song Song { get; set; } public QueueItem QueueItem { get; set; }
public delegate void SongEndedEventHandler(); public delegate void SongEndedEventHandler();
public SongEndedEventHandler OnSongEnded { get; set; } public SongEndedEventHandler OnSongEnded { get; set; }
@ -52,13 +52,13 @@ namespace KaraokePlayer
public void play() public void play()
{ {
if (Song == null) return; if (QueueItem == null) return;
if (currentPlayer != null && currentPlayer.isPaused) if (currentPlayer != null && currentPlayer.isPaused)
{ {
currentPlayer.Resume(); currentPlayer.Resume();
return; return;
} }
switch (Song.FileType) switch (QueueItem.Song.FileType)
{ {
case FileType.CDG: case FileType.CDG:
PlayCdg(); PlayCdg();
@ -75,7 +75,7 @@ namespace KaraokePlayer
private void PlayM4p() private void PlayM4p()
{ {
currentPlayer = mp4Player; currentPlayer = mp4Player;
mp4Player.Play(new Uri(Song.Path)); mp4Player.Play(new Uri(QueueItem.Song.Path));
mp4Player.Visible = true; mp4Player.Visible = true;
cdgPlayer.Visible = false; cdgPlayer.Visible = false;
cdgPlayer.Stop(); cdgPlayer.Stop();
@ -94,7 +94,7 @@ namespace KaraokePlayer
// do nothing // do nothing
} }
Directory.CreateDirectory(extractPath); Directory.CreateDirectory(extractPath);
using (ZipArchive archive = ZipFile.OpenRead(Song.Path)) using (ZipArchive archive = ZipFile.OpenRead(QueueItem.Song.Path))
{ {
foreach (ZipArchiveEntry entry in archive.Entries) foreach (ZipArchiveEntry entry in archive.Entries)
{ {
@ -118,7 +118,7 @@ namespace KaraokePlayer
private void PlayCdg() private void PlayCdg()
{ {
currentPlayer = cdgPlayer; currentPlayer = cdgPlayer;
cdgPlayer.Play(new Uri(Path.ChangeExtension(Song.Path, ".mp3"))); cdgPlayer.Play(new Uri(Path.ChangeExtension(QueueItem.Song.Path, ".mp3")));
cdgPlayer.Visible = true; cdgPlayer.Visible = true;
mp4Player.Visible = false; mp4Player.Visible = false;
mp4Player.Stop(); mp4Player.Stop();

4
KaraokePlayer/SongInfoForm.cs
View File

@ -22,9 +22,9 @@ namespace KaraokePlayer
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
} }
public void Update(Song song) public void Update(QueueItem queueItem)
{ {
previewLabel.Text = "Up Next:" + "\r\n\r\n" + song.Artist + "\r\n\r\n\r\n" + song.Title; previewLabel.Text = "Up Next: " + queueItem.Singer.Name + "\r\n\r\n" + queueItem.Song.Artist + "\r\n\r\n" + queueItem.Song.Title;
} }
} }
} }