From: Sweidan Omar <TFS\sweidan.omar>
Date: Mon, 17 Jan 2022 14:01:17 +0000 (+0000)
Subject: #310
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=e1a6555f3067daf50d5f74d1fca08afea531b2b2;p=mediacube.git

#310

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

diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs
index 59aa4a28..aa537608 100644
--- a/client/DxPlay/PlayerForm.Designer.cs
+++ b/client/DxPlay/PlayerForm.Designer.cs
@@ -91,8 +91,8 @@ namespace DxPlay {
             this.pVideo.Size = new System.Drawing.Size(478, 349);
             this.pVideo.TabIndex = 0;
             this.pVideo.TabStop = true;
-            this.pVideo.SizeChanged += new System.EventHandler(this.panel1_SizeChanged);
-            this.pVideo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown);
+            this.pVideo.SizeChanged += new System.EventHandler(this.Panel1_SizeChanged);
+            this.pVideo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseDown);
             // 
             // mainSplit
             // 
@@ -431,7 +431,7 @@ namespace DxPlay {
             this.menuOpenFile.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
             this.menuOpenFile.Size = new System.Drawing.Size(269, 26);
             this.menuOpenFile.Text = "Open file";
-            this.menuOpenFile.Click += new System.EventHandler(this.menuOpenFile_Click);
+            this.menuOpenFile.Click += new System.EventHandler(this.MenuOpenFile_Click);
             // 
             // menuApprove
             // 
@@ -474,7 +474,7 @@ namespace DxPlay {
             this.btnSave.TabIndex = 0;
             this.btnSave.Text = "Save";
             this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            this.btnSave.Click += new System.EventHandler(this.BtnSave_Click);
             // 
             // btnCancel
             // 
@@ -484,7 +484,7 @@ namespace DxPlay {
             this.btnCancel.TabIndex = 1;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            this.btnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
             // 
             // playerControls
             // 
diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 5c06b5ff..8ad19639 100644
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -1,3 +1,4 @@
+using DxPlay.Controls;
 using DxPlay.Model;
 using DxPlay.Properties;
 using MaestroShared.Commons;
@@ -116,7 +117,7 @@ namespace DxPlay
             catch (Exception e)
             {
                 MsgBox.Error(e.Message);
-                logger.Error(e);
+                logger.Error(e.StackTrace);
             }
         }
 
@@ -124,7 +125,7 @@ namespace DxPlay
         {
             InitializeComponent();
 
-            playerControls.Pause.Click += Pause_Click;
+            playerControls.Pause.Click += OnPause_Click;
             playerControls.Play.Click += OnPlayClick;
             playerControls.Stop.Click += OnStopClick;
             playerControls.Rewind.MouseDown += OnRewindMouseDown;
@@ -135,6 +136,7 @@ namespace DxPlay
             playerControls.StepBack.MouseUp += OnStepBackMouseUp;
             playerControls.StepForward.MouseUp += OnStepForwardMouseUp;
             playerControls.StepForward.MouseDown += OnStepForwardMouseDown;
+            playerControls.PlaySpeed.ValueChanged += OnPlaySpeedChanged;
 
 
             playerControls.TrackBar.MouseDown += OnTrackBarMouseDown;
@@ -143,12 +145,12 @@ namespace DxPlay
         }
 
 
-        private void Pause_Click(object sender, EventArgs e)
+        private void OnPause_Click(object sender, EventArgs e)
         {
             if (!isPauseButtonClicked)
             {
                 isPauseButtonClicked = true;
-                PlayOrPause();
+                Pause();
             }
         }
 
@@ -248,7 +250,7 @@ namespace DxPlay
                 catch (Exception e)
                 {
                     MsgBox.Error(e.Message);
-                    logger.Error(e);
+                    logger.Error(e.StackTrace);
                 }
             }
             model.IsRedefineSegments = redefine;
@@ -308,19 +310,15 @@ namespace DxPlay
         }
 
 
-        private void PlayOrPause()
+        private void Play()
         {
             if (m_play == null)
                 return;
-            if (m_play.State == GraphState.Playing)
-            {
-                Pause();
-                return;
-            }
             if (m_play.State == GraphState.Completed)
             {
                 m_play.Stop();
             }
+            SetVideoSpeed(playerControls.PlaySpeed.CurrentSpeed);
             m_play.Play();
         }
 
@@ -331,7 +329,7 @@ namespace DxPlay
 
         private void OnPlayClick(object sender, EventArgs e)
         {
-            PlayOrPause();
+            Play();
         }
 
         private void OnStopClick(object sender, EventArgs e)
@@ -510,10 +508,10 @@ namespace DxPlay
 
         private bool HandleHotKey(Keys keyCode)
         {
-            logger.Debug("Key pressed " + keyCode);
+            //logger.Debug("Key pressed " + keyCode);
             if (!ApplicationIsActivated() || trafficBrowser.ContainsFocus || openFileDialogOpened || dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus))
                 return false;
-            logger.Debug("Handling " + keyCode);
+            //logger.Debug("Handling " + keyCode);
             bool result = false;
             switch (keyCode)
             {
@@ -540,7 +538,7 @@ namespace DxPlay
                     result = true;
                     break;
                 case Keys.Space:
-                    PlayOrPause();
+                    Play();
                     result = true;
                     break;
                     //case Keys.I:
@@ -583,8 +581,8 @@ namespace DxPlay
 
         private void PlayerForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            //if (m_play != null)
-            //    m_play.Dispose();
+            if (m_play != null)
+                m_play.Dispose();
         }
 
         private void ProcessCommandLine()
@@ -681,5 +679,19 @@ namespace DxPlay
         {
             CloseForm();
         }
+        public void SetVideoSpeed(float value)
+        {
+            if (m_play != null)
+            {
+                m_play.SetPlaySpeed(value);
+            }
+        }
+        private void OnPlaySpeedChanged(object sender, System.EventArgs e)
+        {
+            int currentValue = (sender as VideoSpeedTrackbar).Value;
+            (sender as VideoSpeedTrackbar).CurrentSpeed = (sender as VideoSpeedTrackbar).AvailableSpeeds[currentValue];
+            SetVideoSpeed((sender as VideoSpeedTrackbar).CurrentSpeed);
+            playerControls.PlaySpeedLabel.Text = "x" + (sender as VideoSpeedTrackbar).CurrentSpeed.ToString();
+        }
     }
 }