diff --git a/CdgPlayer/KaraokeVideoPlayer.Designer.cs b/CdgPlayer/KaraokeVideoPlayer.Designer.cs index 0d6166b..253dc51 100644 --- a/CdgPlayer/KaraokeVideoPlayer.Designer.cs +++ b/CdgPlayer/KaraokeVideoPlayer.Designer.cs @@ -44,7 +44,9 @@ this.vlcPlayer.TabIndex = 0; this.vlcPlayer.Text = "vlcControl1"; this.vlcPlayer.VlcLibDirectory = null; + this.vlcPlayer.VlcMediaplayerOptions = null; this.vlcPlayer.VlcLibDirectoryNeeded += new System.EventHandler(this.vlcPlayer_VlcLibDirectoryNeeded); + this.vlcPlayer.EndReached += new System.EventHandler(this.vlcPlayer_EndReached); this.vlcPlayer.Playing += new System.EventHandler(this.vlcPlayer_Playing); this.vlcPlayer.TimeChanged += new System.EventHandler(this.vlcPlayer_TimeChanged); // @@ -57,7 +59,6 @@ this.Size = new System.Drawing.Size(428, 330); this.Load += new System.EventHandler(this.KaraokeVideoPlayer_Load); this.ParentChanged += new System.EventHandler(this.KaraokeVideoPlayer_ParentChanged); - ((System.ComponentModel.ISupportInitialize)(this.vlcPlayer)).EndInit(); this.ResumeLayout(false); diff --git a/CdgPlayer/KaraokeVideoPlayer.cs b/CdgPlayer/KaraokeVideoPlayer.cs index a25c127..1838f94 100644 --- a/CdgPlayer/KaraokeVideoPlayer.cs +++ b/CdgPlayer/KaraokeVideoPlayer.cs @@ -21,6 +21,10 @@ namespace KaraokePlayer private KaraokeVideoOverlay _overlayForm; private DateTime _startTime; private readonly System.Timers.Timer _lyricTimer = new System.Timers.Timer(); + public delegate void SongEndedEventHandler(object sender, EventArgs e); + // An event that clients can use to be notified whenever the + // elements of the list change. + public event SongEndedEventHandler songEndedHandler; public KaraokeVideoPlayer(bool isCDG, bool hideOverlay) { @@ -102,5 +106,13 @@ namespace KaraokePlayer _overlayForm = new KaraokeVideoOverlay(this); } } + + private void vlcPlayer_EndReached(object sender, VlcMediaPlayerEndReachedEventArgs e) + { + if(this.songEndedHandler != null) + { + songEndedHandler(sender, e); + } + } } } \ No newline at end of file diff --git a/KaraokePlayer/MainForm.cs b/KaraokePlayer/MainForm.cs index ae0a632..481a0b8 100644 --- a/KaraokePlayer/MainForm.cs +++ b/KaraokePlayer/MainForm.cs @@ -16,6 +16,8 @@ namespace KaraokePlayer public MainForm() { InitializeComponent(); + karaokeCDGPlayer.songEndedHandler += new KaraokePlayer.KaraokeVideoPlayer.SongEndedEventHandler(this.karaokePlayerSongEnded); + karaokeMP4Player.songEndedHandler += new KaraokePlayer.KaraokeVideoPlayer.SongEndedEventHandler(this.karaokePlayerSongEnded); // Initialize MaterialSkinManager _materialSkinManager = MaterialSkinManager.Instance; _materialSkinManager.AddFormToManage(this); @@ -84,5 +86,9 @@ namespace KaraokePlayer } } + public void karaokePlayerSongEnded(object sender, EventArgs e) + { + //here + } } }