diff --git a/CdgPlayer/KaraokeVideoPlayer.Designer.cs b/CdgPlayer/KaraokeVideoPlayer.Designer.cs index 853c09e..0d6166b 100644 --- a/CdgPlayer/KaraokeVideoPlayer.Designer.cs +++ b/CdgPlayer/KaraokeVideoPlayer.Designer.cs @@ -44,12 +44,6 @@ this.vlcPlayer.TabIndex = 0; this.vlcPlayer.Text = "vlcControl1"; this.vlcPlayer.VlcLibDirectory = null; - if (isCDG && !hideOverlay) { - this.vlcPlayer.VlcMediaplayerOptions = new string[] { "--effect-list=scope", "--no-video", "--verbose=2" }; - } - else { - this.vlcPlayer.VlcMediaplayerOptions = new string[] { "--projectm-preset-path=lib\\presets", "--effect-list=scope", "--verbose=2" }; - } this.vlcPlayer.VlcLibDirectoryNeeded += new System.EventHandler(this.vlcPlayer_VlcLibDirectoryNeeded); this.vlcPlayer.Playing += new System.EventHandler(this.vlcPlayer_Playing); this.vlcPlayer.TimeChanged += new System.EventHandler(this.vlcPlayer_TimeChanged); @@ -63,6 +57,7 @@ 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 7fd4fab..a25c127 100644 --- a/CdgPlayer/KaraokeVideoPlayer.cs +++ b/CdgPlayer/KaraokeVideoPlayer.cs @@ -15,6 +15,7 @@ namespace KaraokePlayer { public partial class KaraokeVideoPlayer : UserControl { + private bool hideOverlay = true; private GraphicsFile _cdgFile; private KaraokeVideoOverlay _overlayForm; @@ -26,6 +27,22 @@ namespace KaraokePlayer this.hideOverlay = hideOverlay; this.isCDG = isCDG; InitializeComponent(); + if (isCDG && !hideOverlay) + { + this.vlcPlayer.VlcMediaplayerOptions = new string[] { + "--effect-list=scope", + "--no-video", + "--verbose=2" + }; + } + else { + this.vlcPlayer.VlcMediaplayerOptions = new string[] { + "--projectm-preset-path=lib\\presets", + "--effect-list=scope", + "--verbose=2" + }; + } + if (!hideOverlay) { _lyricTimer.Interval = 33; @@ -52,6 +69,11 @@ namespace KaraokePlayer vlcPlayer.Play(); } + public void Stop() + { + vlcPlayer.Stop(); + } + private void vlcPlayer_Playing(object sender, VlcMediaPlayerPlayingEventArgs e) { _startTime = DateTime.Now; diff --git a/KaraokePlayer/MainForm.cs b/KaraokePlayer/MainForm.cs index 8b05459..ae0a632 100644 --- a/KaraokePlayer/MainForm.cs +++ b/KaraokePlayer/MainForm.cs @@ -74,12 +74,13 @@ namespace KaraokePlayer karaokeCDGPlayer.Play(new Uri(Path.ChangeExtension(file.FullName, ".mp3"))); karaokeCDGPlayer.Visible = true; karaokeMP4Player.Visible = false; + karaokeMP4Player.Stop(); } else { karaokeMP4Player.Play(new Uri(file.FullName)); karaokeMP4Player.Visible = true; karaokeCDGPlayer.Visible = false; - + karaokeCDGPlayer.Stop(); } }