#310

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32750

diff --git a/client/DxPlay/Controls/PlayerControls.Designer.cs b/client/DxPlay/Controls/PlayerControls.Designer.cs
index a502c50480b5b75f93f058b7934379a1d7e5d865..440670cbcdb68f72be033d8741e16ebc9c5c75c8 100644 (file)
--- a/client/DxPlay/Controls/PlayerControls.Designer.cs
+++ b/client/DxPlay/Controls/PlayerControls.Designer.cs
@@ -47,9 +47,9 @@
             this.btnStop = new MaestroShared.Controls.NoFocusCueButton();\r
             this.btnStepForward = new MaestroShared.Controls.NoFocusCueButton();\r
             this.btnForward = new MaestroShared.Controls.NoFocusCueButton();\r
+            this.playSpeed = new DxPlay.Controls.VideoSpeedTrackbar();\r
             this.lblPlaySpeed = new System.Windows.Forms.Label();\r
             this.logoPanel = new System.Windows.Forms.Panel();\r
-            this.playSpeed = new DxPlay.Controls.VideoSpeedTrackbar();\r
             this.mainPanel.SuspendLayout();\r
             this.timecodePanel.SuspendLayout();\r
             this.controlsPanel.SuspendLayout();\r
@@ -106,9 +106,9 @@
             // \r
             this.timecodePanel.AutoSize = true;\r
             this.timecodePanel.ColumnCount = 3;\r
-            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));\r
-            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 42.22821F));\r
-            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 37.8257F));\r
+            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.32525F));\r
+            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 46.63073F));\r
+            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.95418F));\r
             this.timecodePanel.Controls.Add(this.lbCurrentTC, 0, 1);\r
             this.timecodePanel.Controls.Add(this.lbStartTC, 0, 1);\r
             this.timecodePanel.Controls.Add(this.lbStart, 0, 0);\r
@@ -132,10 +132,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));\r
             this.lbCurrentTC.BackColor = System.Drawing.Color.Transparent;\r
             this.lbCurrentTC.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbCurrentTC.Location = new System.Drawing.Point(226, 16);\r
+            this.lbCurrentTC.Location = new System.Drawing.Point(297, 16);\r
             this.lbCurrentTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbCurrentTC.Name = "lbCurrentTC";\r
-            this.lbCurrentTC.Size = new System.Drawing.Size(461, 33);\r
+            this.lbCurrentTC.Size = new System.Drawing.Size(511, 33);\r
             this.lbCurrentTC.TabIndex = 25;\r
             this.lbCurrentTC.Text = "00:00:00.00";\r
             this.lbCurrentTC.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
@@ -149,7 +149,7 @@
             this.lbStartTC.Location = new System.Drawing.Point(4, 16);\r
             this.lbStartTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbStartTC.Name = "lbStartTC";\r
-            this.lbStartTC.Size = new System.Drawing.Size(214, 21);\r
+            this.lbStartTC.Size = new System.Drawing.Size(285, 21);\r
             this.lbStartTC.TabIndex = 23;\r
             this.lbStartTC.Text = "00:00:00.00";\r
             // \r
@@ -161,7 +161,7 @@
             this.lbStart.Location = new System.Drawing.Point(4, 0);\r
             this.lbStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbStart.Name = "lbStart";\r
-            this.lbStart.Size = new System.Drawing.Size(214, 16);\r
+            this.lbStart.Size = new System.Drawing.Size(285, 16);\r
             this.lbStart.TabIndex = 19;\r
             this.lbStart.Text = "START";\r
             this.lbStart.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
@@ -171,10 +171,10 @@
             this.lbStatus.BackColor = System.Drawing.Color.Transparent;\r
             this.lbStatus.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbStatus.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbStatus.Location = new System.Drawing.Point(226, 0);\r
+            this.lbStatus.Location = new System.Drawing.Point(297, 0);\r
             this.lbStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbStatus.Name = "lbStatus";\r
-            this.lbStatus.Size = new System.Drawing.Size(461, 16);\r
+            this.lbStatus.Size = new System.Drawing.Size(511, 16);\r
             this.lbStatus.TabIndex = 21;\r
             this.lbStatus.Text = "NO INPUT";\r
             this.lbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
@@ -184,10 +184,10 @@
             this.lbDuration.BackColor = System.Drawing.Color.Transparent;\r
             this.lbDuration.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbDuration.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbDuration.Location = new System.Drawing.Point(695, 0);\r
+            this.lbDuration.Location = new System.Drawing.Point(816, 0);\r
             this.lbDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbDuration.Name = "lbDuration";\r
-            this.lbDuration.Size = new System.Drawing.Size(414, 16);\r
+            this.lbDuration.Size = new System.Drawing.Size(293, 16);\r
             this.lbDuration.TabIndex = 22;\r
             this.lbDuration.Text = "DURATION";\r
             this.lbDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
@@ -198,10 +198,10 @@
             this.lbEndTC.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbEndTC.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.lbEndTC.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            this.lbEndTC.Location = new System.Drawing.Point(695, 16);\r
+            this.lbEndTC.Location = new System.Drawing.Point(816, 16);\r
             this.lbEndTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbEndTC.Name = "lbEndTC";\r
-            this.lbEndTC.Size = new System.Drawing.Size(414, 21);\r
+            this.lbEndTC.Size = new System.Drawing.Size(293, 21);\r
             this.lbEndTC.TabIndex = 24;\r
             this.lbEndTC.Text = "00:00:00.00";\r
             this.lbEndTC.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
@@ -228,19 +228,19 @@
             this.buttonsPanel.AutoSize = true;\r
             this.buttonsPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.buttonsPanel.Controls.Add(this.btnPlay);\r
+            this.buttonsPanel.Controls.Add(this.playSpeed);\r
+            this.buttonsPanel.Controls.Add(this.lblPlaySpeed);\r
             this.buttonsPanel.Controls.Add(this.btnPause);\r
             this.buttonsPanel.Controls.Add(this.btnRewind);\r
             this.buttonsPanel.Controls.Add(this.btnStepBack);\r
             this.buttonsPanel.Controls.Add(this.btnStop);\r
             this.buttonsPanel.Controls.Add(this.btnStepForward);\r
             this.buttonsPanel.Controls.Add(this.btnForward);\r
-            this.buttonsPanel.Controls.Add(this.playSpeed);\r
-            this.buttonsPanel.Controls.Add(this.lblPlaySpeed);\r
             this.buttonsPanel.Dock = System.Windows.Forms.DockStyle.Left;\r
             this.buttonsPanel.Location = new System.Drawing.Point(0, 0);\r
             this.buttonsPanel.Margin = new System.Windows.Forms.Padding(0);\r
             this.buttonsPanel.Name = "buttonsPanel";\r
-            this.buttonsPanel.Size = new System.Drawing.Size(866, 126);\r
+            this.buttonsPanel.Size = new System.Drawing.Size(730, 126);\r
             this.buttonsPanel.TabIndex = 20;\r
             // \r
             // btnPlay\r
@@ -268,7 +268,7 @@
             this.btnPause.FlatAppearance.BorderSize = 0;\r
             this.btnPause.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnPause.Image = global::DxPlay.Properties.Resources.ic_pause_black_24dp_2x;\r
-            this.btnPause.Location = new System.Drawing.Point(84, 4);\r
+            this.btnPause.Location = new System.Drawing.Point(254, 4);\r
             this.btnPause.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnPause.Name = "btnPause";\r
             this.btnPause.Size = new System.Drawing.Size(72, 66);\r
@@ -285,7 +285,7 @@
             this.btnRewind.FlatAppearance.BorderSize = 0;\r
             this.btnRewind.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnRewind.Image = ((System.Drawing.Image)(resources.GetObject("btnRewind.Image")));\r
-            this.btnRewind.Location = new System.Drawing.Point(164, 4);\r
+            this.btnRewind.Location = new System.Drawing.Point(334, 4);\r
             this.btnRewind.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnRewind.Name = "btnRewind";\r
             this.btnRewind.Size = new System.Drawing.Size(72, 66);\r
@@ -302,7 +302,7 @@
             this.btnStepBack.FlatAppearance.BorderSize = 0;\r
             this.btnStepBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnStepBack.Image = global::DxPlay.Properties.Resources.baseline_skip_previous_black_24dp;\r
-            this.btnStepBack.Location = new System.Drawing.Point(244, 4);\r
+            this.btnStepBack.Location = new System.Drawing.Point(414, 4);\r
             this.btnStepBack.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnStepBack.Name = "btnStepBack";\r
             this.btnStepBack.Size = new System.Drawing.Size(72, 66);\r
@@ -319,7 +319,7 @@
             this.btnStop.FlatAppearance.BorderSize = 0;\r
             this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnStop.Image = global::DxPlay.Properties.Resources.ic_stop_black_24dp_2x;\r
-            this.btnStop.Location = new System.Drawing.Point(324, 4);\r
+            this.btnStop.Location = new System.Drawing.Point(494, 4);\r
             this.btnStop.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnStop.Name = "btnStop";\r
             this.btnStop.Size = new System.Drawing.Size(72, 66);\r
@@ -336,7 +336,7 @@
             this.btnStepForward.FlatAppearance.BorderSize = 0;\r
             this.btnStepForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnStepForward.Image = global::DxPlay.Properties.Resources.baseline_skip_next_black_24dp;\r
-            this.btnStepForward.Location = new System.Drawing.Point(404, 4);\r
+            this.btnStepForward.Location = new System.Drawing.Point(574, 4);\r
             this.btnStepForward.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnStepForward.Name = "btnStepForward";\r
             this.btnStepForward.Size = new System.Drawing.Size(72, 66);\r
@@ -353,7 +353,7 @@
             this.btnForward.FlatAppearance.BorderSize = 0;\r
             this.btnForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnForward.Image = global::DxPlay.Properties.Resources.baseline_fast_forward_black_24dp;\r
-            this.btnForward.Location = new System.Drawing.Point(484, 4);\r
+            this.btnForward.Location = new System.Drawing.Point(654, 4);\r
             this.btnForward.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnForward.Name = "btnForward";\r
             this.btnForward.Size = new System.Drawing.Size(72, 66);\r
@@ -362,14 +362,28 @@
             this.btnForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnForward.UseVisualStyleBackColor = false;\r
             // \r
+            // playSpeed\r
+            // \r
+            this.playSpeed.CurrentSpeed = 0F;\r
+            this.playSpeed.LargeChange = 1;\r
+            this.playSpeed.Location = new System.Drawing.Point(83, 3);\r
+            this.playSpeed.Maximum = 5;\r
+            this.playSpeed.Minimum = 0;\r
+            this.playSpeed.Name = "playSpeed";\r
+            this.playSpeed.Size = new System.Drawing.Size(136, 56);\r
+            this.playSpeed.TabIndex = 26;\r
+            this.playSpeed.Tag = "PlaySpeed";\r
+            this.playSpeed.TickStyle = System.Windows.Forms.TickStyle.None;\r
+            this.playSpeed.Value = 2;\r
+            // \r
             // lblPlaySpeed\r
             // \r
             this.lblPlaySpeed.AutoSize = true;\r
-            this.lblPlaySpeed.Location = new System.Drawing.Point(705, 0);\r
+            this.lblPlaySpeed.Location = new System.Drawing.Point(225, 0);\r
             this.lblPlaySpeed.Name = "lblPlaySpeed";\r
-            this.lblPlaySpeed.Size = new System.Drawing.Size(158, 17);\r
+            this.lblPlaySpeed.Size = new System.Drawing.Size(22, 17);\r
             this.lblPlaySpeed.TabIndex = 27;\r
-            this.lblPlaySpeed.Text = "Lejátszási sebesség: 1x";\r
+            this.lblPlaySpeed.Text = "x1";\r
             // \r
             // logoPanel\r
             // \r
@@ -383,25 +397,6 @@
             this.logoPanel.Size = new System.Drawing.Size(232, 126);\r
             this.logoPanel.TabIndex = 21;\r
             // \r
-            // playSpeed\r
-            // \r
-            this.playSpeed.AvailableSpeeds = new float[] {\r
-        0.25F,\r
-        0.5F,\r
-        1F,\r
-        2F,\r
-        3F,\r
-        5F};\r
-            this.playSpeed.CurrentSpeed = 0F;\r
-            this.playSpeed.Location = new System.Drawing.Point(563, 3);\r
-            this.playSpeed.Maximum = 5;\r
-            this.playSpeed.Minimum = 0;\r
-            this.playSpeed.Name = "playSpeed";\r
-            this.playSpeed.Size = new System.Drawing.Size(136, 56);\r
-            this.playSpeed.TabIndex = 26;\r
-            this.playSpeed.Value = 2;\r
-            this.playSpeed.ValueChanged += new System.EventHandler(this.OnPlaySpeedChanged);\r
-            // \r
             // PlayerControls\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);\r

diff --git a/client/DxPlay/Controls/PlayerControls.cs b/client/DxPlay/Controls/PlayerControls.cs
index 84cc04b6ffe0bb6eca74cecbaf37e55576ae04ba..ab447e9d9a356b615c3f90438494b2cf94e28d1c 100644 (file)
--- a/client/DxPlay/Controls/PlayerControls.cs
+++ b/client/DxPlay/Controls/PlayerControls.cs
@@ -29,48 +29,8 @@ namespace DxPlay.Controls
         public NoFocusCueButton Forward { get => btnForward; }\r
         public NoFocusCueButton StepBack { get => btnStepBack; }\r
         public NoFocusCueButton StepForward { get => btnStepForward; }\r
+        public Label PlaySpeedLabel { get => lblPlaySpeed; }\r
+        public VideoSpeedTrackbar PlaySpeed { get => playSpeed; }\r
 \r
-        private void onPlaySpeedChanged(object sender, System.EventArgs e)\r
-        {\r
-            logger.Info(sender);\r
-            switch (((VideoSpeedTrackbar)sender).Value)\r
-            {\r
-                case 1:\r
-                    ((VideoSpeedTrackbar)sender).CurrentSpeed = 0.25F;\r
-                    setVideoSpeed();\r
-                    lblPlaySpeed.Text = "Lejátszási sebesség: 0.25x";\r
-                    break;\r
-                case 2:\r
-                    ((VideoSpeedTrackbar)sender).CurrentSpeed = 0.5F;\r
-                    setVideoSpeed();\r
-                    lblPlaySpeed.Text = "Lejátszási sebesség: 0.5x";\r
-                    break;\r
-                case 3:\r
-                    ((VideoSpeedTrackbar)sender).CurrentSpeed = 1F;\r
-                    setVideoSpeed();\r
-                    lblPlaySpeed.Text = "Lejátszási sebesség: 1x";\r
-                    break;\r
-                case 4:\r
-                    ((VideoSpeedTrackbar)sender).CurrentSpeed = 2F;\r
-                    setVideoSpeed();\r
-                    lblPlaySpeed.Text = "Lejátszási sebesség: 2x";\r
-                    break;\r
-                case 5:\r
-                    ((VideoSpeedTrackbar)sender).CurrentSpeed = 3F;\r
-                    setVideoSpeed();\r
-                    lblPlaySpeed.Text = "Lejátszási sebesség: 3x";\r
-                    break;\r
-                case 6:\r
-                    ((VideoSpeedTrackbar)sender).CurrentSpeed = 5F;\r
-                    setVideoSpeed();\r
-                    lblPlaySpeed.Text = "Lejátszási sebesség: 5x";\r
-                    break;\r
-            }\r
-        }\r
-\r
-        private void setVideoSpeed()\r
-        {\r
-            //throw new NotImplementedException();\r
-        }\r
     }\r
 }
\ No newline at end of file