added bool for cdg or not
This commit is contained in:
parent
54c595809e
commit
8060335da2
@ -20,8 +20,9 @@ namespace KaraokePlayer
|
|||||||
private DateTime _startTime;
|
private DateTime _startTime;
|
||||||
private readonly System.Timers.Timer _lyricTimer = new System.Timers.Timer();
|
private readonly System.Timers.Timer _lyricTimer = new System.Timers.Timer();
|
||||||
|
|
||||||
public KaraokeVideoPlayer()
|
public KaraokeVideoPlayer(bool isCDG)
|
||||||
{
|
{
|
||||||
|
this.isCDG = isCDG;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_lyricTimer.Interval = 33;
|
_lyricTimer.Interval = 33;
|
||||||
_lyricTimer.Elapsed += LyricTimerOnElapsed;
|
_lyricTimer.Elapsed += LyricTimerOnElapsed;
|
||||||
|
|||||||
6
KaraokePlayer/MainForm.Designer.cs
generated
6
KaraokePlayer/MainForm.Designer.cs
generated
@ -36,8 +36,8 @@
|
|||||||
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
|
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
|
||||||
this.materialListBox1 = new MaterialSkin.Controls.MaterialListBox();
|
this.materialListBox1 = new MaterialSkin.Controls.MaterialListBox();
|
||||||
this.materialSingleLineTextField1 = new MaterialSkin.Controls.MaterialSingleLineTextField();
|
this.materialSingleLineTextField1 = new MaterialSkin.Controls.MaterialSingleLineTextField();
|
||||||
this.karaokeCDGPlayer = new KaraokePlayer.KaraokeVideoPlayer();
|
this.karaokeCDGPlayer = new KaraokePlayer.KaraokeVideoPlayer(true);
|
||||||
this.karaokeMP4Player = new KaraokePlayer.KaraokeVideoPlayer();
|
this.karaokeMP4Player = new KaraokePlayer.KaraokeVideoPlayer(false);
|
||||||
this.browseDialog = new System.Windows.Forms.FolderBrowserDialog();
|
this.browseDialog = new System.Windows.Forms.FolderBrowserDialog();
|
||||||
this.tableLayoutPanel1.SuspendLayout();
|
this.tableLayoutPanel1.SuspendLayout();
|
||||||
this.flowLayoutPanel1.SuspendLayout();
|
this.flowLayoutPanel1.SuspendLayout();
|
||||||
@ -188,14 +188,12 @@
|
|||||||
this.karaokeCDGPlayer.Name = "karaokeCDGPlayer";
|
this.karaokeCDGPlayer.Name = "karaokeCDGPlayer";
|
||||||
this.karaokeCDGPlayer.Size = new System.Drawing.Size(472, 458);
|
this.karaokeCDGPlayer.Size = new System.Drawing.Size(472, 458);
|
||||||
this.karaokeCDGPlayer.TabIndex = 0;
|
this.karaokeCDGPlayer.TabIndex = 0;
|
||||||
this.karaokeCDGPlayer.isCDG = true;
|
|
||||||
|
|
||||||
this.karaokeMP4Player.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.karaokeMP4Player.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.karaokeMP4Player.Location = new System.Drawing.Point(0, 0);
|
this.karaokeMP4Player.Location = new System.Drawing.Point(0, 0);
|
||||||
this.karaokeMP4Player.Name = "karaokeMP4Player";
|
this.karaokeMP4Player.Name = "karaokeMP4Player";
|
||||||
this.karaokeMP4Player.Size = new System.Drawing.Size(472, 458);
|
this.karaokeMP4Player.Size = new System.Drawing.Size(472, 458);
|
||||||
this.karaokeMP4Player.TabIndex = 0;
|
this.karaokeMP4Player.TabIndex = 0;
|
||||||
this.karaokeMP4Player.isCDG = false;
|
|
||||||
//
|
//
|
||||||
// MainForm
|
// MainForm
|
||||||
//
|
//
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user