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

refactored more code

Browse Source 
Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>
This commit is contained in:
Matt Bruce 2016-03-19 13:20:56 -05:00
parent 8ec6252437
commit e4af63a695
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CdgPlayer/KaraokeVideoPlayer.Designer.cs generated
View File

@ -44,12 +44,6 @@
this.vlcPlayer.TabIndex = 0; this.vlcPlayer.TabIndex = 0;
this.vlcPlayer.Text = "vlcControl1"; this.vlcPlayer.Text = "vlcControl1";
this.vlcPlayer.VlcLibDirectory = null; 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<Vlc.DotNet.Forms.VlcLibDirectoryNeededEventArgs>(this.vlcPlayer_VlcLibDirectoryNeeded); this.vlcPlayer.VlcLibDirectoryNeeded += new System.EventHandler<Vlc.DotNet.Forms.VlcLibDirectoryNeededEventArgs>(this.vlcPlayer_VlcLibDirectoryNeeded);
this.vlcPlayer.Playing += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerPlayingEventArgs>(this.vlcPlayer_Playing); this.vlcPlayer.Playing += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerPlayingEventArgs>(this.vlcPlayer_Playing);
this.vlcPlayer.TimeChanged += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerTimeChangedEventArgs>(this.vlcPlayer_TimeChanged); this.vlcPlayer.TimeChanged += new System.EventHandler<Vlc.DotNet.Core.VlcMediaPlayerTimeChangedEventArgs>(this.vlcPlayer_TimeChanged);
@ -63,6 +57,7 @@
this.Size = new System.Drawing.Size(428, 330); this.Size = new System.Drawing.Size(428, 330);
this.Load += new System.EventHandler(this.KaraokeVideoPlayer_Load); this.Load += new System.EventHandler(this.KaraokeVideoPlayer_Load);
this.ParentChanged += new System.EventHandler(this.KaraokeVideoPlayer_ParentChanged); this.ParentChanged += new System.EventHandler(this.KaraokeVideoPlayer_ParentChanged);
((System.ComponentModel.ISupportInitialize)(this.vlcPlayer)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.vlcPlayer)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);

22
CdgPlayer/KaraokeVideoPlayer.cs
View File

@ -15,6 +15,7 @@ namespace KaraokePlayer
{ {
public partial class KaraokeVideoPlayer : UserControl public partial class KaraokeVideoPlayer : UserControl
{ {
private bool hideOverlay = true; private bool hideOverlay = true;
private GraphicsFile _cdgFile; private GraphicsFile _cdgFile;
private KaraokeVideoOverlay _overlayForm; private KaraokeVideoOverlay _overlayForm;
@ -26,6 +27,22 @@ namespace KaraokePlayer
this.hideOverlay = hideOverlay; this.hideOverlay = hideOverlay;
this.isCDG = isCDG; this.isCDG = isCDG;
InitializeComponent(); 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) if (!hideOverlay)
{ {
_lyricTimer.Interval = 33; _lyricTimer.Interval = 33;
@ -52,6 +69,11 @@ namespace KaraokePlayer
vlcPlayer.Play(); vlcPlayer.Play();
} }
public void Stop()
{
vlcPlayer.Stop();
}
private void vlcPlayer_Playing(object sender, VlcMediaPlayerPlayingEventArgs e) private void vlcPlayer_Playing(object sender, VlcMediaPlayerPlayingEventArgs e)
{ {
_startTime = DateTime.Now; _startTime = DateTime.Now;

3
KaraokePlayer/MainForm.cs
View File

@ -74,12 +74,13 @@ namespace KaraokePlayer
karaokeCDGPlayer.Play(new Uri(Path.ChangeExtension(file.FullName, ".mp3"))); karaokeCDGPlayer.Play(new Uri(Path.ChangeExtension(file.FullName, ".mp3")));
karaokeCDGPlayer.Visible = true; karaokeCDGPlayer.Visible = true;
karaokeMP4Player.Visible = false; karaokeMP4Player.Visible = false;
karaokeMP4Player.Stop();
} }
else { else {
karaokeMP4Player.Play(new Uri(file.FullName)); karaokeMP4Player.Play(new Uri(file.FullName));
karaokeMP4Player.Visible = true; karaokeMP4Player.Visible = true;
karaokeCDGPlayer.Visible = false; karaokeCDGPlayer.Visible = false;
karaokeCDGPlayer.Stop();
} }
} }