From 8060335da256211f9067ec381f3ff3c4fe229e22 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 16 Mar 2016 21:52:15 -0500 Subject: [PATCH] added bool for cdg or not --- CdgPlayer/KaraokeVideoPlayer.cs | 3 ++- KaraokePlayer/MainForm.Designer.cs | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CdgPlayer/KaraokeVideoPlayer.cs b/CdgPlayer/KaraokeVideoPlayer.cs index 0ded4a0..b5cff61 100644 --- a/CdgPlayer/KaraokeVideoPlayer.cs +++ b/CdgPlayer/KaraokeVideoPlayer.cs @@ -20,8 +20,9 @@ namespace KaraokePlayer private DateTime _startTime; private readonly System.Timers.Timer _lyricTimer = new System.Timers.Timer(); - public KaraokeVideoPlayer() + public KaraokeVideoPlayer(bool isCDG) { + this.isCDG = isCDG; InitializeComponent(); _lyricTimer.Interval = 33; _lyricTimer.Elapsed += LyricTimerOnElapsed; diff --git a/KaraokePlayer/MainForm.Designer.cs b/KaraokePlayer/MainForm.Designer.cs index 645e100..9036dc2 100644 --- a/KaraokePlayer/MainForm.Designer.cs +++ b/KaraokePlayer/MainForm.Designer.cs @@ -36,8 +36,8 @@ this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.materialListBox1 = new MaterialSkin.Controls.MaterialListBox(); this.materialSingleLineTextField1 = new MaterialSkin.Controls.MaterialSingleLineTextField(); - this.karaokeCDGPlayer = new KaraokePlayer.KaraokeVideoPlayer(); - this.karaokeMP4Player = new KaraokePlayer.KaraokeVideoPlayer(); + this.karaokeCDGPlayer = new KaraokePlayer.KaraokeVideoPlayer(true); + this.karaokeMP4Player = new KaraokePlayer.KaraokeVideoPlayer(false); this.browseDialog = new System.Windows.Forms.FolderBrowserDialog(); this.tableLayoutPanel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -188,14 +188,12 @@ this.karaokeCDGPlayer.Name = "karaokeCDGPlayer"; this.karaokeCDGPlayer.Size = new System.Drawing.Size(472, 458); this.karaokeCDGPlayer.TabIndex = 0; - this.karaokeCDGPlayer.isCDG = true; this.karaokeMP4Player.Dock = System.Windows.Forms.DockStyle.Fill; this.karaokeMP4Player.Location = new System.Drawing.Point(0, 0); this.karaokeMP4Player.Name = "karaokeMP4Player"; this.karaokeMP4Player.Size = new System.Drawing.Size(472, 458); this.karaokeMP4Player.TabIndex = 0; - this.karaokeMP4Player.isCDG = false; // // MainForm //