#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 59aa4a286ce28475b9e7f6c9f64c3ed47a99cbef..aa53760875cd6e0bbf484efb67234a69dc215ed9 100644 (file)
--- 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);\r
             this.pVideo.TabIndex = 0;\r
             this.pVideo.TabStop = true;\r
-            this.pVideo.SizeChanged += new System.EventHandler(this.panel1_SizeChanged);\r
-            this.pVideo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDown);\r
+            this.pVideo.SizeChanged += new System.EventHandler(this.Panel1_SizeChanged);\r
+            this.pVideo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseDown);\r
             // \r
             // mainSplit\r
             // \r
@@ -431,7 +431,7 @@ namespace DxPlay {
             this.menuOpenFile.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
             this.menuOpenFile.Size = new System.Drawing.Size(269, 26);\r
             this.menuOpenFile.Text = "Open file";\r
-            this.menuOpenFile.Click += new System.EventHandler(this.menuOpenFile_Click);\r
+            this.menuOpenFile.Click += new System.EventHandler(this.MenuOpenFile_Click);\r
             // \r
             // menuApprove\r
             // \r
@@ -474,7 +474,7 @@ namespace DxPlay {
             this.btnSave.TabIndex = 0;\r
             this.btnSave.Text = "Save";\r
             this.btnSave.UseVisualStyleBackColor = true;\r
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);\r
+            this.btnSave.Click += new System.EventHandler(this.BtnSave_Click);\r
             // \r
             // btnCancel\r
             // \r
@@ -484,7 +484,7 @@ namespace DxPlay {
             this.btnCancel.TabIndex = 1;\r
             this.btnCancel.Text = "Cancel";\r
             this.btnCancel.UseVisualStyleBackColor = true;\r
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);\r
+            this.btnCancel.Click += new System.EventHandler(this.BtnCancel_Click);\r
             // \r
             // playerControls\r
             // \r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 5c06b5ff262f580f520376c154d1549310d31806..8ad19639a62d276e949fc0baa637af941bb5eab2 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -1,3 +1,4 @@
+using DxPlay.Controls;\r
 using DxPlay.Model;\r
 using DxPlay.Properties;\r
 using MaestroShared.Commons;\r
@@ -116,7 +117,7 @@ namespace DxPlay
             catch (Exception e)\r
             {\r
                 MsgBox.Error(e.Message);\r
-                logger.Error(e);\r
+                logger.Error(e.StackTrace);\r
             }\r
         }\r
 \r
@@ -124,7 +125,7 @@ namespace DxPlay
         {\r
             InitializeComponent();\r
 \r
-            playerControls.Pause.Click += Pause_Click;\r
+            playerControls.Pause.Click += OnPause_Click;\r
             playerControls.Play.Click += OnPlayClick;\r
             playerControls.Stop.Click += OnStopClick;\r
             playerControls.Rewind.MouseDown += OnRewindMouseDown;\r
@@ -135,6 +136,7 @@ namespace DxPlay
             playerControls.StepBack.MouseUp += OnStepBackMouseUp;\r
             playerControls.StepForward.MouseUp += OnStepForwardMouseUp;\r
             playerControls.StepForward.MouseDown += OnStepForwardMouseDown;\r
+            playerControls.PlaySpeed.ValueChanged += OnPlaySpeedChanged;\r
 \r
 \r
             playerControls.TrackBar.MouseDown += OnTrackBarMouseDown;\r
@@ -143,12 +145,12 @@ namespace DxPlay
         }\r
 \r
 \r
-        private void Pause_Click(object sender, EventArgs e)\r
+        private void OnPause_Click(object sender, EventArgs e)\r
         {\r
             if (!isPauseButtonClicked)\r
             {\r
                 isPauseButtonClicked = true;\r
-                PlayOrPause();\r
+                Pause();\r
             }\r
         }\r
 \r
@@ -248,7 +250,7 @@ namespace DxPlay
                 catch (Exception e)\r
                 {\r
                     MsgBox.Error(e.Message);\r
-                    logger.Error(e);\r
+                    logger.Error(e.StackTrace);\r
                 }\r
             }\r
             model.IsRedefineSegments = redefine;\r
@@ -308,19 +310,15 @@ namespace DxPlay
         }\r
 \r
 \r
-        private void PlayOrPause()\r
+        private void Play()\r
         {\r
             if (m_play == null)\r
                 return;\r
-            if (m_play.State == GraphState.Playing)\r
-            {\r
-                Pause();\r
-                return;\r
-            }\r
             if (m_play.State == GraphState.Completed)\r
             {\r
                 m_play.Stop();\r
             }\r
+            SetVideoSpeed(playerControls.PlaySpeed.CurrentSpeed);\r
             m_play.Play();\r
         }\r
 \r
@@ -331,7 +329,7 @@ namespace DxPlay
 \r
         private void OnPlayClick(object sender, EventArgs e)\r
         {\r
-            PlayOrPause();\r
+            Play();\r
         }\r
 \r
         private void OnStopClick(object sender, EventArgs e)\r
@@ -510,10 +508,10 @@ namespace DxPlay
 \r
         private bool HandleHotKey(Keys keyCode)\r
         {\r
-            logger.Debug("Key pressed " + keyCode);\r
+            //logger.Debug("Key pressed " + keyCode);\r
             if (!ApplicationIsActivated() || trafficBrowser.ContainsFocus || openFileDialogOpened || dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus))\r
                 return false;\r
-            logger.Debug("Handling " + keyCode);\r
+            //logger.Debug("Handling " + keyCode);\r
             bool result = false;\r
             switch (keyCode)\r
             {\r
@@ -540,7 +538,7 @@ namespace DxPlay
                     result = true;\r
                     break;\r
                 case Keys.Space:\r
-                    PlayOrPause();\r
+                    Play();\r
                     result = true;\r
                     break;\r
                     //case Keys.I:\r
@@ -583,8 +581,8 @@ namespace DxPlay
 \r
         private void PlayerForm_FormClosing(object sender, FormClosingEventArgs e)\r
         {\r
-            //if (m_play != null)\r
-            //    m_play.Dispose();\r
+            if (m_play != null)\r
+                m_play.Dispose();\r
         }\r
 \r
         private void ProcessCommandLine()\r
@@ -681,5 +679,19 @@ namespace DxPlay
         {\r
             CloseForm();\r
         }\r
+        public void SetVideoSpeed(float value)\r
+        {\r
+            if (m_play != null)\r
+            {\r
+                m_play.SetPlaySpeed(value);\r
+            }\r
+        }\r
+        private void OnPlaySpeedChanged(object sender, System.EventArgs e)\r
+        {\r
+            int currentValue = (sender as VideoSpeedTrackbar).Value;\r
+            (sender as VideoSpeedTrackbar).CurrentSpeed = (sender as VideoSpeedTrackbar).AvailableSpeeds[currentValue];\r
+            SetVideoSpeed((sender as VideoSpeedTrackbar).CurrentSpeed);\r
+            playerControls.PlaySpeedLabel.Text = "x" + (sender as VideoSpeedTrackbar).CurrentSpeed.ToString();\r
+        }\r
     }\r
 }\r