git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorSweidan Omar <TFS\sweidan.omar>
Thu, 13 Jan 2022 00:06:48 +0000 (00:06 +0000)
committerSweidan Omar <TFS\sweidan.omar>
Thu, 13 Jan 2022 00:06:48 +0000 (00:06 +0000)
client/DxPlay/PlayerForm.Designer.cs
client/DxPlay/PlayerForm.cs
client/DxPlay/PlayerForm.resx
client/DxPlay/PlayerGraph.cs

index 181d0b384bab849b7aeab716373a4ad695f69d55..59aa4a286ce28475b9e7f6c9f64c3ed47a99cbef 100644 (file)
@@ -29,8 +29,6 @@ namespace DxPlay {
         private void InitializeComponent() {\r
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlayerForm));\r
             this.pVideo = new System.Windows.Forms.Panel();\r
             this.mainSplit = new System.Windows.Forms.SplitContainer();\r
@@ -90,7 +88,7 @@ namespace DxPlay {
             this.pVideo.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.pVideo.Location = new System.Drawing.Point(0, 0);\r
             this.pVideo.Name = "pVideo";\r
-            this.pVideo.Size = new System.Drawing.Size(478, 385);\r
+            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
@@ -101,7 +99,7 @@ namespace DxPlay {
             this.mainSplit.BackColor = System.Drawing.Color.Black;\r
             this.mainSplit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.mainSplit.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.mainSplit.Location = new System.Drawing.Point(0, 24);\r
+            this.mainSplit.Location = new System.Drawing.Point(0, 28);\r
             this.mainSplit.Name = "mainSplit";\r
             // \r
             // mainSplit.Panel1\r
@@ -113,7 +111,7 @@ namespace DxPlay {
             this.mainSplit.Panel2.Controls.Add(this.tableLayoutPanel1);\r
             this.mainSplit.Panel2.Controls.Add(this.pMetadataDisplay);\r
             this.mainSplit.Panel2MinSize = 300;\r
-            this.mainSplit.Size = new System.Drawing.Size(784, 387);\r
+            this.mainSplit.Size = new System.Drawing.Size(784, 351);\r
             this.mainSplit.SplitterDistance = 480;\r
             this.mainSplit.TabIndex = 20;\r
             // \r
@@ -123,7 +121,7 @@ namespace DxPlay {
             this.panelPlayer.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.panelPlayer.Location = new System.Drawing.Point(0, 0);\r
             this.panelPlayer.Name = "panelPlayer";\r
-            this.panelPlayer.Size = new System.Drawing.Size(478, 385);\r
+            this.panelPlayer.Size = new System.Drawing.Size(478, 349);\r
             this.panelPlayer.TabIndex = 0;\r
             // \r
             // tableLayoutPanel1\r
@@ -139,7 +137,7 @@ namespace DxPlay {
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
             this.tableLayoutPanel1.RowCount = 1;\r
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 322);\r
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 277);\r
             this.tableLayoutPanel1.TabIndex = 4;\r
             // \r
             // tabEditor\r
@@ -150,13 +148,13 @@ namespace DxPlay {
             this.tabEditor.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.tabEditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.tabEditor.ImageList = this.imagesTabEdit;\r
-            this.tabEditor.Location = new System.Drawing.Point(23, 4);\r
+            this.tabEditor.Location = new System.Drawing.Point(28, 4);\r
             this.tabEditor.Margin = new System.Windows.Forms.Padding(0, 4, 4, 4);\r
             this.tabEditor.Multiline = true;\r
             this.tabEditor.Name = "tabEditor";\r
             this.tabEditor.Padding = new System.Drawing.Point(10, 5);\r
             this.tabEditor.SelectedIndex = 0;\r
-            this.tabEditor.Size = new System.Drawing.Size(271, 314);\r
+            this.tabEditor.Size = new System.Drawing.Size(266, 269);\r
             this.tabEditor.TabIndex = 2;\r
             // \r
             // tpMetadata\r
@@ -168,7 +166,7 @@ namespace DxPlay {
             this.tpMetadata.Location = new System.Drawing.Point(4, 4);\r
             this.tpMetadata.Name = "tpMetadata";\r
             this.tpMetadata.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tpMetadata.Size = new System.Drawing.Size(263, 275);\r
+            this.tpMetadata.Size = new System.Drawing.Size(258, 199);\r
             this.tpMetadata.TabIndex = 0;\r
             this.tpMetadata.Text = "Metadata";\r
             // \r
@@ -181,7 +179,7 @@ namespace DxPlay {
             this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0);\r
             this.trafficBrowser.Name = "trafficBrowser";\r
             this.trafficBrowser.Parameters = null;\r
-            this.trafficBrowser.Size = new System.Drawing.Size(257, 269);\r
+            this.trafficBrowser.Size = new System.Drawing.Size(252, 193);\r
             this.trafficBrowser.TabIndex = 0;\r
             // \r
             // tpSegments\r
@@ -193,7 +191,7 @@ namespace DxPlay {
             this.tpSegments.Location = new System.Drawing.Point(4, 4);\r
             this.tpSegments.Name = "tpSegments";\r
             this.tpSegments.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tpSegments.Size = new System.Drawing.Size(192, 30);\r
+            this.tpSegments.Size = new System.Drawing.Size(258, 199);\r
             this.tpSegments.TabIndex = 1;\r
             this.tpSegments.Text = "Segments";\r
             this.tpSegments.UseVisualStyleBackColor = true;\r
@@ -206,40 +204,25 @@ namespace DxPlay {
             this.dgSegments.AutoGenerateColumns = false;\r
             this.dgSegments.BackgroundColor = System.Drawing.Color.White;\r
             this.dgSegments.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgSegments.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             this.dgSegments.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgSegments.DataSource = this.bsSegments;\r
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));\r
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));\r
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgSegments.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));\r
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));\r
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgSegments.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.dgSegments.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgSegments.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2;\r
-            this.dgSegments.Location = new System.Drawing.Point(3, 28);\r
+            this.dgSegments.Location = new System.Drawing.Point(3, 32);\r
             this.dgSegments.MultiSelect = false;\r
             this.dgSegments.Name = "dgSegments";\r
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgSegments.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;\r
             this.dgSegments.RowHeadersVisible = false;\r
+            this.dgSegments.RowHeadersWidth = 51;\r
             this.dgSegments.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
-            this.dgSegments.Size = new System.Drawing.Size(186, 0);\r
+            this.dgSegments.Size = new System.Drawing.Size(252, 164);\r
             this.dgSegments.TabIndex = 1;\r
             this.dgSegments.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.OnSegmentsCellBeginEdit);\r
             this.dgSegments.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellContentClick);\r
@@ -254,6 +237,7 @@ namespace DxPlay {
             // \r
             this.segmentActions.AutoSize = false;\r
             this.segmentActions.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
+            this.segmentActions.ImageScalingSize = new System.Drawing.Size(20, 20);\r
             this.segmentActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.tbDefineSegment,\r
             this.toolStripSeparator2,\r
@@ -265,7 +249,7 @@ namespace DxPlay {
             this.segmentActions.Location = new System.Drawing.Point(3, 3);\r
             this.segmentActions.Name = "segmentActions";\r
             this.segmentActions.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
-            this.segmentActions.Size = new System.Drawing.Size(186, 25);\r
+            this.segmentActions.Size = new System.Drawing.Size(252, 29);\r
             this.segmentActions.TabIndex = 0;\r
             this.segmentActions.Text = "toolStrip1";\r
             // \r
@@ -276,14 +260,14 @@ namespace DxPlay {
             this.tbDefineSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tbDefineSegment.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tbDefineSegment.Name = "tbDefineSegment";\r
-            this.tbDefineSegment.Size = new System.Drawing.Size(23, 22);\r
+            this.tbDefineSegment.Size = new System.Drawing.Size(29, 26);\r
             this.tbDefineSegment.Text = "toolStripButton5";\r
             this.tbDefineSegment.Click += new System.EventHandler(this.OnDefineOneSegmentClick);\r
             // \r
             // toolStripSeparator2\r
             // \r
             this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 29);\r
             // \r
             // tbPositionAsTCIn\r
             // \r
@@ -292,7 +276,7 @@ namespace DxPlay {
             this.tbPositionAsTCIn.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tbPositionAsTCIn.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tbPositionAsTCIn.Name = "tbPositionAsTCIn";\r
-            this.tbPositionAsTCIn.Size = new System.Drawing.Size(23, 22);\r
+            this.tbPositionAsTCIn.Size = new System.Drawing.Size(29, 26);\r
             this.tbPositionAsTCIn.Text = "toolStripButton1";\r
             this.tbPositionAsTCIn.Click += new System.EventHandler(this.OnActualPositionToTCInToolStripMenuItem1Click);\r
             // \r
@@ -303,7 +287,7 @@ namespace DxPlay {
             this.tbSplitSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tbSplitSegment.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tbSplitSegment.Name = "tbSplitSegment";\r
-            this.tbSplitSegment.Size = new System.Drawing.Size(23, 22);\r
+            this.tbSplitSegment.Size = new System.Drawing.Size(29, 26);\r
             this.tbSplitSegment.Text = "toolStripButton4";\r
             this.tbSplitSegment.Click += new System.EventHandler(this.OnSplitSegmentAtCurrentPositionClick);\r
             // \r
@@ -314,14 +298,14 @@ namespace DxPlay {
             this.tbPositionAsTCOut.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tbPositionAsTCOut.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tbPositionAsTCOut.Name = "tbPositionAsTCOut";\r
-            this.tbPositionAsTCOut.Size = new System.Drawing.Size(23, 22);\r
+            this.tbPositionAsTCOut.Size = new System.Drawing.Size(29, 26);\r
             this.tbPositionAsTCOut.Text = "toolStripButton2";\r
             this.tbPositionAsTCOut.Click += new System.EventHandler(this.OnActualPositionToTCOutToolStripMenuItem1Click);\r
             // \r
             // toolStripSeparator1\r
             // \r
             this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 29);\r
             // \r
             // tbDeleteSegment\r
             // \r
@@ -330,7 +314,7 @@ namespace DxPlay {
             this.tbDeleteSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.tbDeleteSegment.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.tbDeleteSegment.Name = "tbDeleteSegment";\r
-            this.tbDeleteSegment.Size = new System.Drawing.Size(23, 22);\r
+            this.tbDeleteSegment.Size = new System.Drawing.Size(29, 26);\r
             this.tbDeleteSegment.Text = "toolStripButton3";\r
             this.tbDeleteSegment.Click += new System.EventHandler(this.OnDeleteSegmentClick);\r
             // \r
@@ -350,7 +334,7 @@ namespace DxPlay {
             this.btnToggleSegmentEditor.Location = new System.Drawing.Point(0, 4);\r
             this.btnToggleSegmentEditor.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0);\r
             this.btnToggleSegmentEditor.Name = "btnToggleSegmentEditor";\r
-            this.btnToggleSegmentEditor.Size = new System.Drawing.Size(23, 63);\r
+            this.btnToggleSegmentEditor.Size = new System.Drawing.Size(28, 72);\r
             this.btnToggleSegmentEditor.TabIndex = 0;\r
             this.btnToggleSegmentEditor.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnToggleSegmentEditor.UseVisualStyleBackColor = false;\r
@@ -366,13 +350,13 @@ namespace DxPlay {
             this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 0);\r
             this.pMetadataDisplay.Controls.Add(this.txtSelectedID, 0, 1);\r
             this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.pMetadataDisplay.Location = new System.Drawing.Point(0, 322);\r
+            this.pMetadataDisplay.Location = new System.Drawing.Point(0, 277);\r
             this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0);\r
             this.pMetadataDisplay.Name = "pMetadataDisplay";\r
             this.pMetadataDisplay.RowCount = 2;\r
             this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
             this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.pMetadataDisplay.Size = new System.Drawing.Size(298, 63);\r
+            this.pMetadataDisplay.Size = new System.Drawing.Size(298, 72);\r
             this.pMetadataDisplay.TabIndex = 5;\r
             // \r
             // btnApprove\r
@@ -384,10 +368,10 @@ namespace DxPlay {
             this.btnApprove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnApprove.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.btnApprove.Image = ((System.Drawing.Image)(resources.GetObject("btnApprove.Image")));\r
-            this.btnApprove.Location = new System.Drawing.Point(196, 29);\r
+            this.btnApprove.Location = new System.Drawing.Point(187, 32);\r
             this.btnApprove.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0);\r
             this.btnApprove.Name = "btnApprove";\r
-            this.btnApprove.Size = new System.Drawing.Size(102, 30);\r
+            this.btnApprove.Size = new System.Drawing.Size(111, 30);\r
             this.btnApprove.TabIndex = 17;\r
             this.btnApprove.Text = "Approve";\r
             this.btnApprove.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
@@ -404,7 +388,7 @@ namespace DxPlay {
             this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 0);\r
             this.labelSelectedMetadata.Name = "labelSelectedMetadata";\r
             this.labelSelectedMetadata.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5);\r
-            this.labelSelectedMetadata.Size = new System.Drawing.Size(190, 25);\r
+            this.labelSelectedMetadata.Size = new System.Drawing.Size(181, 28);\r
             this.labelSelectedMetadata.TabIndex = 13;\r
             this.labelSelectedMetadata.Text = "Selected metadata";\r
             // \r
@@ -414,18 +398,19 @@ namespace DxPlay {
             this.txtSelectedID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.txtSelectedID.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.txtSelectedID.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.txtSelectedID.Location = new System.Drawing.Point(3, 28);\r
+            this.txtSelectedID.Location = new System.Drawing.Point(3, 31);\r
             this.txtSelectedID.Name = "txtSelectedID";\r
-            this.txtSelectedID.Size = new System.Drawing.Size(190, 32);\r
+            this.txtSelectedID.Size = new System.Drawing.Size(181, 38);\r
             this.txtSelectedID.TabIndex = 12;\r
             // \r
             // mainMenu\r
             // \r
+            this.mainMenu.ImageScalingSize = new System.Drawing.Size(20, 20);\r
             this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.fileToolStripMenuItem});\r
             this.mainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.mainMenu.Name = "mainMenu";\r
-            this.mainMenu.Size = new System.Drawing.Size(784, 24);\r
+            this.mainMenu.Size = new System.Drawing.Size(784, 28);\r
             this.mainMenu.TabIndex = 21;\r
             this.mainMenu.Text = "menuStrip1";\r
             // \r
@@ -437,14 +422,14 @@ namespace DxPlay {
             this.toolStripSeparator3,\r
             this.menuRedefineSegments});\r
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";\r
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);\r
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);\r
             this.fileToolStripMenuItem.Text = "File";\r
             // \r
             // menuOpenFile\r
             // \r
             this.menuOpenFile.Name = "menuOpenFile";\r
             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(215, 22);\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
             // \r
@@ -452,20 +437,20 @@ namespace DxPlay {
             // \r
             this.menuApprove.Name = "menuApprove";\r
             this.menuApprove.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));\r
-            this.menuApprove.Size = new System.Drawing.Size(215, 22);\r
+            this.menuApprove.Size = new System.Drawing.Size(269, 26);\r
             this.menuApprove.Text = "Approve";\r
             this.menuApprove.Click += new System.EventHandler(this.OnApprove);\r
             // \r
             // toolStripSeparator3\r
             // \r
             this.toolStripSeparator3.Name = "toolStripSeparator3";\r
-            this.toolStripSeparator3.Size = new System.Drawing.Size(212, 6);\r
+            this.toolStripSeparator3.Size = new System.Drawing.Size(266, 6);\r
             // \r
             // menuRedefineSegments\r
             // \r
             this.menuRedefineSegments.Name = "menuRedefineSegments";\r
             this.menuRedefineSegments.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));\r
-            this.menuRedefineSegments.Size = new System.Drawing.Size(215, 22);\r
+            this.menuRedefineSegments.Size = new System.Drawing.Size(269, 26);\r
             this.menuRedefineSegments.Text = "Redefine segments";\r
             this.menuRedefineSegments.Click += new System.EventHandler(this.OnRedefineSegments);\r
             // \r
@@ -475,17 +460,17 @@ namespace DxPlay {
             this.flowLayoutPanel1.Controls.Add(this.btnSave);\r
             this.flowLayoutPanel1.Controls.Add(this.btnCancel);\r
             this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 532);\r
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 528);\r
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";\r
             this.flowLayoutPanel1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;\r
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(784, 29);\r
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(784, 33);\r
             this.flowLayoutPanel1.TabIndex = 23;\r
             // \r
             // btnSave\r
             // \r
-            this.btnSave.Location = new System.Drawing.Point(706, 3);\r
+            this.btnSave.Location = new System.Drawing.Point(691, 3);\r
             this.btnSave.Name = "btnSave";\r
-            this.btnSave.Size = new System.Drawing.Size(75, 23);\r
+            this.btnSave.Size = new System.Drawing.Size(90, 27);\r
             this.btnSave.TabIndex = 0;\r
             this.btnSave.Text = "Save";\r
             this.btnSave.UseVisualStyleBackColor = true;\r
@@ -493,9 +478,9 @@ namespace DxPlay {
             // \r
             // btnCancel\r
             // \r
-            this.btnCancel.Location = new System.Drawing.Point(625, 3);\r
+            this.btnCancel.Location = new System.Drawing.Point(595, 3);\r
             this.btnCancel.Name = "btnCancel";\r
-            this.btnCancel.Size = new System.Drawing.Size(75, 23);\r
+            this.btnCancel.Size = new System.Drawing.Size(90, 27);\r
             this.btnCancel.TabIndex = 1;\r
             this.btnCancel.Text = "Cancel";\r
             this.btnCancel.UseVisualStyleBackColor = true;\r
@@ -507,16 +492,16 @@ namespace DxPlay {
             this.playerControls.BackColor = System.Drawing.Color.Transparent;\r
             this.playerControls.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.playerControls.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.playerControls.Location = new System.Drawing.Point(0, 411);\r
+            this.playerControls.Location = new System.Drawing.Point(0, 379);\r
             this.playerControls.Margin = new System.Windows.Forms.Padding(0);\r
             this.playerControls.Name = "playerControls";\r
-            this.playerControls.Size = new System.Drawing.Size(784, 121);\r
+            this.playerControls.Size = new System.Drawing.Size(784, 149);\r
             this.playerControls.TabIndex = 22;\r
             // \r
             // PlayerForm\r
             // \r
             this.AllowDrop = true;\r
-            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);\r
+            this.AutoScaleBaseSize = new System.Drawing.Size(6, 15);\r
             this.BackColor = System.Drawing.Color.White;\r
             this.ClientSize = new System.Drawing.Size(784, 561);\r
             this.Controls.Add(this.mainSplit);\r
@@ -525,7 +510,7 @@ namespace DxPlay {
             this.Controls.Add(this.flowLayoutPanel1);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.KeyPreview = true;\r
-            this.MinimumSize = new System.Drawing.Size(640, 480);\r
+            this.MinimumSize = new System.Drawing.Size(768, 554);\r
             this.Name = "PlayerForm";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "MediaCube Player";\r
@@ -599,5 +584,4 @@ namespace DxPlay {
         private System.Windows.Forms.SplitContainer mainSplit;\r
         private System.Windows.Forms.Panel pVideo;\r
     }\r
-}\r
-\r
+}
\ No newline at end of file
index b17625f4a3cadaf8e0cf912feaec07aa4280d3b3..4265ff769c7d93fc318a1949b36f0aa7cc8671d6 100644 (file)
@@ -1,6 +1,7 @@
 using DxPlay.Model;\r
 using DxPlay.Properties;\r
 using MaestroShared.Commons;\r
+using MaestroShared.Controls;\r
 using MaestroShared.Metadata;\r
 using NLog;\r
 using System;\r
@@ -9,10 +10,13 @@ using System.Diagnostics;
 using System.IO;\r
 using System.Runtime.InteropServices;\r
 using System.Windows.Forms;\r
+using Logger = NLog.Logger;\r
 \r
-namespace DxPlay {\r
+namespace DxPlay\r
+{\r
 \r
-    public partial class PlayerForm : Form {\r
+    public partial class PlayerForm : Form\r
+    {\r
         private const string TITLE = "MediaCube Player";\r
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();\r
         private const string DEFAULT_FILE_FILTER = "MXF files (*.MXF)|*.MXF";\r
@@ -27,11 +31,14 @@ namespace DxPlay {
         private bool isPauseButtonClicked = false;\r
 \r
         private DxPlaySettings settings;\r
-        public DxPlaySettings Settings {\r
-            get {\r
+        public DxPlaySettings Settings\r
+        {\r
+            get\r
+            {\r
                 return settings;\r
             }\r
-            set {\r
+            set\r
+            {\r
                 settings = value ?? throw new NullReferenceException("DxPlaySettings");\r
                 Model = new DxPlayModel(value);\r
                 //default 1 kell legyen: HTV uj szegmens = elozo szegmens vege + 1\r
@@ -41,9 +48,11 @@ namespace DxPlay {
         }\r
 \r
         private DxPlayModel model;\r
-        public DxPlayModel Model {\r
+        public DxPlayModel Model\r
+        {\r
             get { return model; }\r
-            set {\r
+            set\r
+            {\r
                 model = value ?? throw new NullReferenceException("DxPlayModel");\r
                 ApplyModel();\r
             }\r
@@ -62,7 +71,8 @@ namespace DxPlay {
 \r
         public bool openFileDialogOpened;\r
 \r
-        private void ApplyModel() {\r
+        private void ApplyModel()\r
+        {\r
             bsSegments.DataSource = model.Segments;\r
             dgSegments.AutoGenerateColumns = true;\r
             mainMenu.DataBindings.Add(new Binding("Visible", model, "IsMenuVisible", false, DataSourceUpdateMode.Never));\r
@@ -70,11 +80,14 @@ namespace DxPlay {
             menuApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never));\r
             //menuRedefineSegments.DataBindings.Add(new Binding("Enabled", model, "IsRedefineSegmentsEnabled", false, DataSourceUpdateMode.Never));\r
 \r
-            if (model.IsMenuVisible) {\r
+            if (model.IsMenuVisible)\r
+            {\r
                 btnApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never));\r
                 tpSegments.DataBindings.Add(new Binding("Enabled", model, "IsSegmentEditorVisible", false, DataSourceUpdateMode.Never));\r
                 txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never));\r
-            } else {\r
+            }\r
+            else\r
+            {\r
                 pMetadataDisplay.Visible = false;\r
                 tabEditor.TabPages.Remove(tpMetadata);\r
             }\r
@@ -91,19 +104,24 @@ namespace DxPlay {
 \r
         }\r
 \r
-        private void OnSelectedIDChanged(string ID, int variantID, string serialID, string text, List<TrafficItem> selected) {\r
+        private void OnSelectedIDChanged(string ID, int variantID, string serialID, string text, List<TrafficItem> selected)\r
+        {\r
             //logger.Info("Selected ID: " + ID);\r
-            try {\r
+            try\r
+            {\r
                 model.SelectedSegments = selected;\r
                 model.VariantID = variantID;\r
                 model.ID = ID;\r
-            } catch (Exception e) {\r
+            }\r
+            catch (Exception e)\r
+            {\r
                 MsgBox.Error(e.Message);\r
                 logger.Error(e);\r
             }\r
         }\r
 \r
-        public PlayerForm() {\r
+        public PlayerForm()\r
+        {\r
             InitializeComponent();\r
 \r
             playerControls.Pause.Click += Pause_Click;\r
@@ -118,11 +136,17 @@ namespace DxPlay {
             playerControls.StepForward.MouseUp += OnStepForwardMouseUp;\r
             playerControls.StepForward.MouseDown += OnStepForwardMouseDown;\r
 \r
+\r
             playerControls.TrackBar.MouseDown += OnTrackBarMouseDown;\r
             playerControls.TrackBar.MouseUp += OnTrackBarMouseUp;\r
             playerControls.TrackBar.Scroll += OnTrackBarScroll;\r
         }\r
 \r
+        private void OnPlaySpeedValueChanged(object sender, EventArgs e)\r
+        {\r
+            Console.WriteLine(sender.GetType());\r
+        }\r
+\r
         private void Pause_Click(object sender, EventArgs e)\r
         {\r
             if (!isPauseButtonClicked)\r
@@ -132,7 +156,8 @@ namespace DxPlay {
             }\r
         }\r
 \r
-        private void InitializeTexts() {\r
+        private void InitializeTexts()\r
+        {\r
             tpMetadata.Text = Settings.Resource("METADATA", Resources.METADATA);\r
             tpSegments.Text = Settings.Resource("SEGMENTS", Resources.SEGMENTS);\r
             tbPositionAsTCIn.Text = Settings.Resource("POSITIONASTCIN", Resources.POSITIONASTCIN);\r
@@ -157,14 +182,17 @@ namespace DxPlay {
             playerControls.Duration.Text = Settings.Resource("LENGTH", Resources.LENGTH);\r
         }\r
 \r
-        private void CloseForm() {\r
+        private void CloseForm()\r
+        {\r
             m_play?.Dispose();\r
             Close();\r
         }\r
 \r
-        private void Cueue() {\r
+        private void Cueue()\r
+        {\r
             m_play = null;\r
-            try {\r
+            try\r
+            {\r
                 //m_mediaDescription = MediaDetector.GetDescription(selectedFile);\r
                 m_mediaDescription = new MediaDescription() { fileName = model.CurrentFile.FullName };\r
 \r
@@ -175,26 +203,32 @@ namespace DxPlay {
                     throw new Exception(model.CurrentFile.FullName);\r
 \r
                 m_play.PlayEvent += new DxPlayEvent(OnPlayEvent);\r
-                if (m_mediaDescription != null) {\r
+                if (m_mediaDescription != null)\r
+                {\r
                     playerControls.TrackBar.Maximum = m_mediaDescription.Duration.Frames;\r
                     playerControls.StartTC.Text = m_mediaDescription.FirstFrame.ToString();\r
                     playerControls.EndTC.Text = m_mediaDescription.Duration.ToString();\r
                 }\r
-            } catch (Exception ce) {\r
+            }\r
+            catch (Exception ce)\r
+            {\r
                 MessageBox.Show("Az Ã¡llomány nem tölthetõ be. A rendszer Ã¼zenete: " + ce.Message, "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                 CloseForm();\r
             }\r
         }\r
 \r
-        private void Form1_DragEnter(object sender, DragEventArgs e) {\r
-            if (e.Data.GetDataPresent(DataFormats.FileDrop)) {\r
+        private void Form1_DragEnter(object sender, DragEventArgs e)\r
+        {\r
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))\r
+            {\r
                 string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);\r
                 if (files.Length == 1)\r
                     e.Effect = DragDropEffects.Copy;\r
             }\r
         }\r
 \r
-        public void OpenFile(FileInfo fileInfo, bool redefine) {\r
+        public void OpenFile(FileInfo fileInfo, bool redefine)\r
+        {\r
             logger.Debug("Open {0}", fileInfo.FullName);\r
 \r
             if (m_play != null)\r
@@ -204,15 +238,19 @@ namespace DxPlay {
             model.CurrentFile = fileInfo;\r
             Cueue();\r
 \r
-            if (model.IsMenuVisible) {\r
+            if (model.IsMenuVisible)\r
+            {\r
                 tabEditor.SelectedTab = tpMetadata;\r
                 trafficBrowser.ClearLookup();\r
                 openFileDialog.InitialDirectory = fileInfo.Directory.FullName;\r
                 openFileDialog.Filter = DEFAULT_FILE_FILTER;\r
                 string id = fileInfo.Name.Replace(fileInfo.Extension, "");\r
-                try {\r
+                try\r
+                {\r
                     model.Lookup(id);\r
-                } catch (Exception e) {\r
+                }\r
+                catch (Exception e)\r
+                {\r
                     MsgBox.Error(e.Message);\r
                     logger.Error(e);\r
                 }\r
@@ -228,51 +266,63 @@ namespace DxPlay {
         }\r
 \r
 \r
-        private void Form1_DragDrop(object sender, DragEventArgs e) {\r
+        private void Form1_DragDrop(object sender, DragEventArgs e)\r
+        {\r
             string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);\r
             FileInfo fileInfo = new FileInfo(files[0]);\r
             OpenFile(fileInfo, false);\r
         }\r
 \r
-        private void panel1_MouseDown(object sender, MouseEventArgs e) {\r
-            if (m_play != null && e.Button == MouseButtons.Left) {\r
+        private void panel1_MouseDown(object sender, MouseEventArgs e)\r
+        {\r
+            if (m_play != null && e.Button == MouseButtons.Left)\r
+            {\r
                 DateTime currentClick = DateTime.Now;\r
-                if ((currentClick - lastClick).TotalMilliseconds < 300) {\r
+                if ((currentClick - lastClick).TotalMilliseconds < 300)\r
+                {\r
                     m_play.ToggleFullscreen();\r
                     logger.Debug("Fullscreen");\r
-                } else\r
+                }\r
+                else\r
                     lastClick = currentClick;\r
             }\r
         }\r
 \r
-        private void panel1_SizeChanged(object sender, EventArgs e) {\r
+        private void panel1_SizeChanged(object sender, EventArgs e)\r
+        {\r
             if (m_play != null)\r
                 m_play.UpdateVideoWindow();\r
         }\r
 \r
-        private void OnTrackBarMouseDown(object sender, MouseEventArgs e) {\r
+        private void OnTrackBarMouseDown(object sender, MouseEventArgs e)\r
+        {\r
             trackBarAtUser = true;\r
             lastClick = DateTime.Now;\r
         }\r
 \r
-        private void OnTrackBarMouseUp(object sender, MouseEventArgs e) {\r
+        private void OnTrackBarMouseUp(object sender, MouseEventArgs e)\r
+        {\r
             trackBarAtUser = false;\r
         }\r
 \r
-        private void OnTrackBarScroll(object sender, ScrollEventArgs e) {\r
+        private void OnTrackBarScroll(object sender, ScrollEventArgs e)\r
+        {\r
             if (m_play != null)\r
                 m_play.Seek(playerControls.TrackBar.Value);\r
         }\r
 \r
 \r
-        private void PlayOrPause() {\r
+        private void PlayOrPause()\r
+        {\r
             if (m_play == null)\r
                 return;\r
-            if (m_play.State == GraphState.Playing) {\r
+            if (m_play.State == GraphState.Playing)\r
+            {\r
                 Pause();\r
                 return;\r
             }\r
-            if (m_play.State == GraphState.Completed) {\r
+            if (m_play.State == GraphState.Completed)\r
+            {\r
                 m_play.Stop();\r
             }\r
             m_play.Play();\r
@@ -293,27 +343,35 @@ namespace DxPlay {
             }\r
         }\r
 \r
-        private void UpdatePlayButton() {\r
-            if (m_play.State == GraphState.Playing) {\r
+        private void UpdatePlayButton()\r
+        {\r
+            if (m_play.State == GraphState.Playing)\r
+            {\r
                 playerControls.Play.Image = Resources.ic_pause_black_24dp_2x;\r
                 tooltips.SetToolTip(playerControls.Play, Settings.Resource("PAUSE", Resources.PAUSE));\r
-            } else {\r
+            }\r
+            else\r
+            {\r
                 playerControls.Play.Image = Resources.ic_play_arrow_black_24dp_2x;\r
                 tooltips.SetToolTip(playerControls.Play, Settings.Resource("PLAY", Resources.PLAY));\r
             }\r
         }\r
 \r
-        private void Pause() {\r
+        private void Pause()\r
+        {\r
             m_play.Pause();\r
             UpdatePlayButton();\r
         }\r
 \r
-        private void OnPlayClick(object sender, EventArgs e) {\r
+        private void OnPlayClick(object sender, EventArgs e)\r
+        {\r
             PlayOrPause();\r
         }\r
 \r
-        private void OnStopClick(object sender, EventArgs e) {\r
-            if (m_play != null && m_play.State != GraphState.Stopped) {\r
+        private void OnStopClick(object sender, EventArgs e)\r
+        {\r
+            if (m_play != null && m_play.State != GraphState.Stopped)\r
+            {\r
                 m_play.Stop();\r
             }\r
         }\r
@@ -321,70 +379,92 @@ namespace DxPlay {
 \r
         private bool buttonDown;\r
 \r
-        private void OnRewindMouseUp(object sender, MouseEventArgs e) {\r
+        private void OnRewindMouseUp(object sender, MouseEventArgs e)\r
+        {\r
             buttonDown = false;\r
         }\r
 \r
-        private void OnRewindMouseDown(object sender, MouseEventArgs e) {\r
+        private void OnRewindMouseDown(object sender, MouseEventArgs e)\r
+        {\r
             buttonDown = true;\r
-            do {\r
-                m_play.Rewind(10);\r
-                Application.DoEvents();             \r
+            do\r
+            {\r
+                if (m_play != null && m_play.State == GraphState.Playing)\r
+                {\r
+                    m_play.Rewind(10);\r
+                    Application.DoEvents();\r
+                }\r
             } while (buttonDown);\r
         }\r
 \r
-        private void OnForwardMouseUp(object sender, MouseEventArgs e) {\r
+        private void OnForwardMouseUp(object sender, MouseEventArgs e)\r
+        {\r
             buttonDown = false;\r
         }\r
 \r
-        private void OnForwardMouseDown(object sender, EventArgs e) {\r
+        private void OnForwardMouseDown(object sender, EventArgs e)\r
+        {\r
             buttonDown = true;\r
-            do {\r
-                m_play.Forward(10);\r
-                Application.DoEvents();                \r
+            do\r
+            {\r
+                if (m_play != null && m_play.State == GraphState.Playing)\r
+                {\r
+                    m_play.Forward(10);\r
+                    Application.DoEvents();\r
+                }\r
             } while (buttonDown);\r
         }\r
 \r
-        private void OnStepBackMouseUp(object sender, MouseEventArgs e) {\r
+        private void OnStepBackMouseUp(object sender, MouseEventArgs e)\r
+        {\r
             buttonDown = false;\r
         }\r
 \r
-        private void OnStepBackMouseDown(object sender, MouseEventArgs e) {\r
+        private void OnStepBackMouseDown(object sender, MouseEventArgs e)\r
+        {\r
             buttonDown = true;\r
-            do {\r
+            do\r
+            {\r
                 m_play.Rewind(1);\r
                 Application.DoEvents();\r
             } while (buttonDown);\r
         }\r
 \r
-        private void OnStepForwardMouseUp(object sender, MouseEventArgs e) {\r
+        private void OnStepForwardMouseUp(object sender, MouseEventArgs e)\r
+        {\r
             buttonDown = false;\r
         }\r
 \r
-        private void OnStepForwardMouseDown(object sender, EventArgs e) {\r
+        private void OnStepForwardMouseDown(object sender, EventArgs e)\r
+        {\r
             buttonDown = true;\r
-            do {\r
+            do\r
+            {\r
                 m_play.Forward(1);\r
                 Application.DoEvents();\r
             } while (buttonDown);\r
         }\r
 \r
-        private void Rewind() {\r
+        private void Rewind()\r
+        {\r
             if (m_play == null)\r
                 return;\r
             int step = ModifierKeys.HasFlag(Keys.Control) ? 10 : 1;\r
             m_play.Rewind(step);\r
         }\r
 \r
-        private void Forward() {\r
+        private void Forward()\r
+        {\r
             if (m_play == null)\r
                 return;\r
             int step = ModifierKeys.HasFlag(Keys.Control) ? 10 : 1;\r
             m_play.Forward(step);\r
         }\r
 \r
-        private void PlayerForm_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) {\r
-            if (e.KeyCode == Keys.Left || e.KeyCode == Keys.Right || e.KeyCode == Keys.Space || e.KeyCode == Keys.Escape) {\r
+        private void PlayerForm_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)\r
+        {\r
+            if (e.KeyCode == Keys.Left || e.KeyCode == Keys.Right || e.KeyCode == Keys.Space || e.KeyCode == Keys.Escape)\r
+            {\r
                 e.IsInputKey = false;\r
             }\r
         }\r
@@ -399,7 +479,8 @@ namespace DxPlay {
         //    }\r
         //}\r
 \r
-        private void PlayerForm_Load(object sender, EventArgs e) {\r
+        private void PlayerForm_Load(object sender, EventArgs e)\r
+        {\r
             //DisableHotKeysDefaults(this.Controls);\r
 \r
             InterceptKeys.Start();\r
@@ -416,24 +497,29 @@ namespace DxPlay {
             trafficBrowser.BackColor = BackColor;\r
 \r
             //Csak standalone modban\r
-            if (Model.IsMenuVisible) {\r
+            if (Model.IsMenuVisible)\r
+            {\r
                 trafficBrowser.IDChangedEvent += OnSelectedIDChanged;\r
                 model.InitializeTrafficIntegration(trafficBrowser);\r
             }\r
         }\r
 \r
-        private void PlayerForm_KeyDown(object sender, KeyEventArgs e) {\r
+        private void PlayerForm_KeyDown(object sender, KeyEventArgs e)\r
+        {\r
             if (dgSegments.IsCurrentCellInEditMode)\r
                 return;\r
-            if (e.KeyCode == Keys.Left || e.KeyCode == Keys.Right || e.KeyCode == Keys.Space || e.KeyCode == Keys.Escape) {\r
+            if (e.KeyCode == Keys.Left || e.KeyCode == Keys.Right || e.KeyCode == Keys.Space || e.KeyCode == Keys.Escape)\r
+            {\r
                 e.Handled = true;\r
                 e.SuppressKeyPress = true;\r
             }\r
         }\r
 \r
-        public static bool ApplicationIsActivated() {\r
+        public static bool ApplicationIsActivated()\r
+        {\r
             var activatedHandle = GetForegroundWindow();\r
-            if (activatedHandle == IntPtr.Zero) {\r
+            if (activatedHandle == IntPtr.Zero)\r
+            {\r
                 return false;       // No window is currently activated\r
             }\r
 \r
@@ -450,15 +536,18 @@ namespace DxPlay {
         [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]\r
         private static extern int GetWindowThreadProcessId(IntPtr handle, out int processId);\r
 \r
-        private bool HandleHotKey(Keys keyCode) {\r
+        private bool HandleHotKey(Keys keyCode)\r
+        {\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
             bool result = false;\r
-            switch (keyCode) {\r
+            switch (keyCode)\r
+            {\r
                 case Keys.Return:\r
-                    if (m_play != null && ModifierKeys.HasFlag(Keys.Shift)) {\r
+                    if (m_play != null && ModifierKeys.HasFlag(Keys.Shift))\r
+                    {\r
                         m_play.ToggleFullscreen();\r
                         result = true;\r
                     }\r
@@ -495,7 +584,8 @@ namespace DxPlay {
             return result;\r
         }\r
 \r
-        private void OnPlayEvent() {\r
+        private void OnPlayEvent()\r
+        {\r
             if (!IsHandleCreated || Disposing || IsDisposed || m_play == null)\r
                 return;\r
 \r
@@ -521,24 +611,29 @@ namespace DxPlay {
 \r
         }\r
 \r
-        private void PlayerForm_FormClosing(object sender, FormClosingEventArgs e) {\r
+        private void PlayerForm_FormClosing(object sender, FormClosingEventArgs e)\r
+        {\r
             //if (m_play != null)\r
             //    m_play.Dispose();\r
         }\r
 \r
-        private void ProcessCommandLine() {\r
+        private void ProcessCommandLine()\r
+        {\r
             String[] arguments = Environment.GetCommandLineArgs();\r
-            if (arguments.Length > 1) {\r
+            if (arguments.Length > 1)\r
+            {\r
                 FileInfo fi = new FileInfo(arguments[1]);\r
                 if (fi.Exists)\r
                     OpenFile(fi, false);\r
             }\r
         }\r
 \r
-        private void PlayerForm_Shown(object sender, EventArgs e) {\r
+        private void PlayerForm_Shown(object sender, EventArgs e)\r
+        {\r
             logger.Debug("PlayerForm_Shown");\r
             InitializeTexts();\r
-            if (true.Equals(Settings?.Player?.SegmentEditor) && true.Equals(Settings?.IsStandalone)) {\r
+            if (true.Equals(Settings?.Player?.SegmentEditor) && true.Equals(Settings?.IsStandalone))\r
+            {\r
                 mainMenu.Visible = true;\r
             }\r
 \r
@@ -548,25 +643,29 @@ namespace DxPlay {
                 m_play.Play();\r
         }\r
 \r
-        private void PlayerForm_FormClosed(object sender, FormClosedEventArgs e) {\r
+        private void PlayerForm_FormClosed(object sender, FormClosedEventArgs e)\r
+        {\r
             InterceptKeys.Stop();\r
             if (m_play != null)\r
                 m_play.Dispose();\r
         }\r
 \r
 \r
-        private void menuOpenFile_Click(object sender, EventArgs e) {\r
+        private void menuOpenFile_Click(object sender, EventArgs e)\r
+        {\r
             openFileDialogOpened = true;\r
             if (openFileDialog.ShowDialog() == DialogResult.OK)\r
                 OpenFile(new FileInfo(openFileDialog.FileName), false);\r
             openFileDialogOpened = false;\r
         }\r
 \r
-        private void OnApprove(object sender, EventArgs e) {\r
+        private void OnApprove(object sender, EventArgs e)\r
+        {\r
             if (m_play == null)\r
                 return;\r
 \r
-            try {\r
+            try\r
+            {\r
 \r
                 m_play.Seek(0);\r
                 m_play.Dispose();\r
@@ -582,16 +681,20 @@ namespace DxPlay {
                 btnApprove.Text = Settings.Resource("APPROVE", Resources.APPROVE);\r
                 model.IsRedefineSegments = false;\r
 \r
-            } catch (Exception ex) {\r
+            }\r
+            catch (Exception ex)\r
+            {\r
                 logger.Error(ex);\r
                 MsgBox.Error(ex.Message);\r
             }\r
 \r
         }\r
 \r
-        private void OnRedefineSegments(object sender, EventArgs e) {\r
+        private void OnRedefineSegments(object sender, EventArgs e)\r
+        {\r
             openFileDialogOpened = true;\r
-            if (openFileDialog.ShowDialog() == DialogResult.OK) {\r
+            if (openFileDialog.ShowDialog() == DialogResult.OK)\r
+            {\r
                 model.RedefineSegmentMediaID = Path.GetFileNameWithoutExtension(openFileDialog.FileName);\r
                 model.IsRedefineSegments = true;\r
                 OpenFile(new FileInfo(openFileDialog.FileName), true);\r
@@ -601,12 +704,14 @@ namespace DxPlay {
             btnApprove.Text = Settings.Resource("REDEFINE", Resources.REDEFINE);\r
         }\r
 \r
-        private void btnSave_Click(object sender, EventArgs e) {\r
+        private void btnSave_Click(object sender, EventArgs e)\r
+        {\r
             settings.Segments = model.Segments;\r
             CloseForm();\r
         }\r
 \r
-        private void btnCancel_Click(object sender, EventArgs e) {\r
+        private void btnCancel_Click(object sender, EventArgs e)\r
+        {\r
             CloseForm();\r
         }\r
     }\r
index 9a2c493651db043466172da00be0b015975ec6d3..45243086c47fe235fb9510f2279964e79ea5a15b 100644 (file)
   <data name="tbDefineSegment.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC8SURBVDhP1ZO9DcIwFISfqKGjpaENG4S/GZiEOiWMkR2Y\r
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAC8SURBVDhP1ZO9DcIwFISfqKGjpaENG4S/GZiEOiWMkR2Y\r
         gREo2IEVaBDcOXnS48m24lRw0qf4nHeXxFLkZ3UC15GcQVAF3uAGYoM5mGF2BWTfG15LpdmdNb6Ib3ro\r
         lkkNKtJ9fgJLY9KZrTWpIvICLZgDq+Ii8gQNsNKZjTW5ogtYAq/BRXcQDjIhza6t8UVTMOmWSX0V8aBo\r
         joA3SmCG2RrIDDz6jTEwy46gBfBPi4WIn2M2K/9fKX8hkQ9xw2LrlhXH8QAAAABJRU5ErkJggg==\r
   <data name="tbPositionAsTCIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABOSURBVDhPYxgFVAWOUJoiUALE/4HYB8wjE8AMmQbmkQmo\r
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABOSURBVDhPYxgFVAWOUJoiUALE/4HYB8wjE8AMmQbmkQmo\r
         asg8MI8C0ADEMIMYQQKUgG4gpoqrQABmGEXhBAMww3zBPAqBG5QeBWQBBgYAaigQp+qpuEkAAAAASUVO\r
         RK5CYII=\r
 </value>\r
   <data name="tbSplitSegment.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABlSURBVDhPYxjZ4AAUUwxGDUIFFUDcD2HCATaDQGoKIEzs\r
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABlSURBVDhPYxjZ4AAUUwxGDUIFFUDcD2HCATaDQGoKIEzs\r
         oIGRkfE/kEY2DN2gfqiaBggXN+hGMwzZIJgh3RAuYQAzrB2IYQa1k2oIDMAM+wHC5BoCA2DDKDUEBkAG\r
         UGzIkAUMDABv+SVD4UMwTwAAAABJRU5ErkJggg==\r
 </value>\r
   <data name="tbPositionAsTCOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABOSURBVDhPYxgFFAMnKE0R8APi/0BcAuZRCKYBMdUMmwfE\r
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABOSURBVDhPYxgFFAMnKE0R8APi/0BcAuZRCKYBMdUMmwfE\r
         VDGMEYiXADHFhoEMgrmqASRADkA2pBskQC6giiH+QEyxITDgBqVHAcWAgQEAtZ4QxOLkcD0AAAAASUVO\r
         RK5CYII=\r
 </value>\r
   <data name="tbDeleteSegment.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABvSURBVDhPYxhZwBVK4wOOUBoncAPi/0DcDuZhByA5kBon\r
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABvSURBVDhPYxhZwBVK4wOOUBoncAPi/0DcDuZhByA5kBon\r
         MA8P6AdiXIbBDAGpIQpgM4xkQ2AAZlg9EDdA2SQbAgPTgBhkAEWGgADMVRQZBDME5C2yvQYzhKLAxmYI\r
         DBBtGFUTJDFZhBg1wwMwMAAAvx8nVwi8b+UAAAAASUVORK5CYII=\r
 </value>\r
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAgFoAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAZABAgGQAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
index 921010f61a518a6c4a9c094ee196eefccdda8c6f..beee83bcfeaf1e731b84896795b73d336a67b1a5 100644 (file)
@@ -5,8 +5,10 @@ using NLog;
 using System;\r
 using System.Runtime.InteropServices;\r
 \r
-namespace DxPlay {\r
-    public class PlayerGraph : FilterGraph, IDisposable {\r
+namespace DxPlay\r
+{/*lejatsztasi sebesseg megkeresese */\r
+    public class PlayerGraph : FilterGraph, IDisposable\r
+    {\r
 #if DEBUG\r
         private DsROTEntry m_DsRot;\r
 #endif\r
@@ -20,8 +22,10 @@ namespace DxPlay {
 \r
         private bool isDisposed;\r
 \r
-        public PlayerGraph(string fileName, IntPtr handle, VideoRendererType rendererType) {\r
-            try {\r
+        public PlayerGraph(string fileName, IntPtr handle, VideoRendererType rendererType)\r
+        {\r
+            try\r
+            {\r
                 MediaSeeking = this as IMediaSeeking;\r
                 MediaControl = this as IMediaControl;\r
                 MediaEvent = this as IMediaEvent;\r
@@ -35,14 +39,16 @@ namespace DxPlay {
 \r
                 IBaseFilter splitter = AddSplitter(graphBuilder, sourceFilter);\r
                 bool audioOnly = true;\r
-                if (DsFindPin.ByName(splitter, "Video") != null) {\r
+                if (DsFindPin.ByName(splitter, "Video") != null)\r
+                {\r
                     audioOnly = false;\r
                     IBaseFilter videoDecoder = AddVideoDecoder(graphBuilder, splitter);\r
                     EnableDeinterlace(videoDecoder);\r
                     IBaseFilter sampleGrabber = AddSampleGrabber(graphBuilder, videoDecoder);\r
                     SampleGrabber = (ISampleGrabber)sampleGrabber;\r
 \r
-                    switch (rendererType) {\r
+                    switch (rendererType)\r
+                    {\r
                         case VideoRendererType.VM7:\r
                             AddVM7Renderer(graphBuilder, sampleGrabber);\r
                             break;\r
@@ -62,38 +68,49 @@ namespace DxPlay {
                     FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output");\r
                     ConfigureSimpleRenderer(handle);\r
 \r
-                } else {\r
+                }\r
+                else\r
+                {\r
                     logger.Warn("Video pin not available");\r
                 }\r
-                if (DsFindPin.ByName(splitter, "Audio") != null) {\r
+                if (DsFindPin.ByName(splitter, "Audio") != null)\r
+                {\r
                     IBaseFilter audioDecoder = AddAudioDecoder(graphBuilder, splitter);\r
-                    if (audioOnly) {\r
+                    if (audioOnly)\r
+                    {\r
                         throw new Exception("Audio only file is not supported.");\r
                         //IBaseFilter sampleGrabber = AddSampleGrabber(graphBuilder, audioDecoder);\r
                         //SampleGrabber = (ISampleGrabber)sampleGrabber;\r
                         //FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output");\r
-                    } else\r
+                    }\r
+                    else\r
                         FilterGraphTools.RenderPin(graphBuilder, audioDecoder, "Output");\r
-                } else {\r
+                }\r
+                else\r
+                {\r
                     logger.Warn("Audio pin not available");\r
                 }\r
 \r
                 SearchAudioTracks(splitter);\r
 \r
-            } catch (Exception e) {\r
+            }\r
+            catch (Exception e)\r
+            {\r
                 logger.Error(e.Message);\r
                 throw e;\r
             }\r
         }\r
 \r
-        private void EnableDeinterlace(IBaseFilter videoDecoder) {\r
+        private void EnableDeinterlace(IBaseFilter videoDecoder)\r
+        {\r
             logger.Debug("Enable YADIF deinterlace");\r
             ILAVVideoSettings settings = (ILAVVideoSettings)videoDecoder;\r
             settings.SetSWDeintMode(LAVSWDeintModes.SWDeintMode_YADIF);\r
             settings.SetSWDeintOutput(LAVDeintOutput.DeintOutput_FramePer2Field);\r
         }\r
 \r
-        private IBaseFilter AddAudioDecoder(IGraphBuilder graphBuilder, IBaseFilter splitter) {\r
+        private IBaseFilter AddAudioDecoder(IGraphBuilder graphBuilder, IBaseFilter splitter)\r
+        {\r
             logger.Debug("Add LAVAudio to graph");\r
             IBaseFilter audioDecoder = null;\r
             audioDecoder = LoadAudioDecoder(graphBuilder);\r
@@ -105,20 +122,24 @@ namespace DxPlay {
             return audioDecoder;\r
         }\r
 \r
-        private IBaseFilter AddVM9Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+        private IBaseFilter AddVM9Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber)\r
+        {\r
             logger.Debug("Add VideoMixingRenderer9 to graph");\r
             IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer9();\r
             DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 9"));\r
             logger.Debug("Connect SampleGrabber -> VideoMixingRenderer9");\r
 \r
-            try {\r
+            try\r
+            {\r
                 //IVMRFilterConfig9 filterConfig = (IVMRFilterConfig9) videoRenderer;\r
                 //filterConfig.SetRenderingMode(VMR9Mode.Windowless);\r
                 //WindowlessControl = (IVMRWindowlessControl9) videoRenderer;\r
                 //WindowlessControl.SetVideoClippingWindow(handle);\r
                 //WindowlessControl.SetAspectRatioMode(VMR9AspectRatioMode.LetterBox);\r
                 FilterGraphTools.ConnectFilters(graphBuilder, sampleGrabber, "Output", videoRenderer, "VMR Input0", true);\r
-            } catch (Exception e) {\r
+            }\r
+            catch (Exception e)\r
+            {\r
                 logger.Error(e);\r
                 graphBuilder.RemoveFilter(videoRenderer);\r
                 logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 9");\r
@@ -128,20 +149,24 @@ namespace DxPlay {
             return videoRenderer;\r
         }\r
 \r
-        private IBaseFilter AddVM7Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+        private IBaseFilter AddVM7Renderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber)\r
+        {\r
             logger.Debug("Add VideoMixingRenderer7 to graph");\r
             IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer();\r
             DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 7"));\r
             logger.Debug("Connect SampleGrabber -> VideoMixingRenderer7");\r
 \r
-            try {\r
+            try\r
+            {\r
                 //IVMRFilterConfig9 filterConfig = (IVMRFilterConfig9) videoRenderer;\r
                 //filterConfig.SetRenderingMode(VMR9Mode.Windowless);\r
                 //WindowlessControl = (IVMRWindowlessControl9) videoRenderer;\r
                 //WindowlessControl.SetVideoClippingWindow(handle);\r
                 //WindowlessControl.SetAspectRatioMode(VMR9AspectRatioMode.LetterBox);\r
                 FilterGraphTools.ConnectFilters(graphBuilder, sampleGrabber, "Output", videoRenderer, "VMR Input0", true);\r
-            } catch (Exception e) {\r
+            }\r
+            catch (Exception e)\r
+            {\r
                 logger.Error(e);\r
                 graphBuilder.RemoveFilter(videoRenderer);\r
                 logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 7");\r
@@ -151,7 +176,8 @@ namespace DxPlay {
             return videoRenderer;\r
         }\r
 \r
-        private void ConfigureSimpleRenderer(IntPtr handle) {\r
+        private void ConfigureSimpleRenderer(IntPtr handle)\r
+        {\r
             // Set the output window\r
             int hr;\r
 \r
@@ -170,14 +196,16 @@ namespace DxPlay {
             DsError.ThrowExceptionForHR(hr);\r
         }\r
 \r
-        private IBaseFilter AddDefaultRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+        private IBaseFilter AddDefaultRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber)\r
+        {\r
             logger.Debug("Add default VideoRenderer to graph");\r
             IBaseFilter videoRenderer = (IBaseFilter)new VideoRendererDefault();\r
             DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "VideoRendererDefault"));\r
             //FilterGraphTools.ConnectFilters(graphBuilder, sampleGrabber, "Output", videoRenderer, "VMR Input0", true);\r
             return videoRenderer;\r
         }\r
-        private IBaseFilter AddEVRRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\r
+        private IBaseFilter AddEVRRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber)\r
+        {\r
             logger.Debug("Add EVR VideoRenderer to graph");\r
             IBaseFilter videoRenderer = (IBaseFilter)new EnhancedVideoRenderer();\r
             DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "EnhancedVideoRenderer"));\r
@@ -185,7 +213,8 @@ namespace DxPlay {
             return videoRenderer;\r
         }\r
 \r
-        private IBaseFilter AddSampleGrabber(IGraphBuilder graphBuilder, IBaseFilter videoDecoder) {\r
+        private IBaseFilter AddSampleGrabber(IGraphBuilder graphBuilder, IBaseFilter videoDecoder)\r
+        {\r
             logger.Debug("Add SampleGrabber to graph");\r
             IBaseFilter grabber = (IBaseFilter)new SampleGrabber();\r
             DsError.ThrowExceptionForHR(graphBuilder.AddFilter(grabber, "Sample Grabber"));\r
@@ -194,7 +223,8 @@ namespace DxPlay {
             return grabber;\r
         }\r
 \r
-        private IBaseFilter AddVideoDecoder(IGraphBuilder graphBuilder, IBaseFilter splitter) {\r
+        private IBaseFilter AddVideoDecoder(IGraphBuilder graphBuilder, IBaseFilter splitter)\r
+        {\r
             logger.Debug("Add LAVVideo to graph");\r
             IBaseFilter videoDecoder = LoadVideoDecoder(graphBuilder);\r
 \r
@@ -206,7 +236,8 @@ namespace DxPlay {
             return videoDecoder;\r
         }\r
 \r
-        private IBaseFilter AddSplitter(IGraphBuilder graphBuilder, IBaseFilter sourceFilter) {\r
+        private IBaseFilter AddSplitter(IGraphBuilder graphBuilder, IBaseFilter sourceFilter)\r
+        {\r
             logger.Debug("Add LAVSplitter to graph");\r
             IBaseFilter splitter = LoadSplitter(graphBuilder);\r
             if (splitter == null)\r
@@ -216,14 +247,18 @@ namespace DxPlay {
             return splitter;\r
         }\r
 \r
-        private void SearchAudioTracks(IBaseFilter splitter) {\r
+        private void SearchAudioTracks(IBaseFilter splitter)\r
+        {\r
             IAMStreamSelect amStreamSelect = (IAMStreamSelect)splitter;\r
-            if (amStreamSelect != null) {\r
+            if (amStreamSelect != null)\r
+            {\r
                 amStreamSelect.Count(out int count);\r
                 int audioCount = 0;\r
-                for (int i = 0; i < count; i++) {\r
+                for (int i = 0; i < count; i++)\r
+                {\r
                     amStreamSelect.Info(i, out AMMediaType ppmt, out AMStreamSelectInfoFlags pdwFlags, out int plcid, out int pdwGroup, out string ppszName, out object ppObject, out object ppUnk);\r
-                    if (ppmt.majorType == MediaType.Audio) {\r
+                    if (ppmt.majorType == MediaType.Audio)\r
+                    {\r
                         logger.Debug("Found audio channel");\r
                         audioCount++;\r
                     }\r
@@ -237,7 +272,8 @@ namespace DxPlay {
             }\r
         }\r
 \r
-        private IBaseFilter LoadVideoDecoder(IGraphBuilder graphBuilder) {\r
+        private IBaseFilter LoadVideoDecoder(IGraphBuilder graphBuilder)\r
+        {\r
             IBaseFilter videoDecoder = null;\r
             ILAVVideoSettings lavVideoSettings;\r
             videoDecoder = FilterProvider.GetVideoFilter(out lavVideoSettings);\r
@@ -248,7 +284,8 @@ namespace DxPlay {
             return videoDecoder;\r
         }\r
 \r
-        private IBaseFilter LoadAudioDecoder(IGraphBuilder graphBuilder) {\r
+        private IBaseFilter LoadAudioDecoder(IGraphBuilder graphBuilder)\r
+        {\r
             IBaseFilter audioDecoder = null;\r
             ILAVAudioSettings lavAudioSettings;\r
             ILAVAudioStatus lavAudioStatus;\r
@@ -260,7 +297,8 @@ namespace DxPlay {
             return audioDecoder;\r
         }\r
 \r
-        private IBaseFilter LoadSplitter(IGraphBuilder graphBuilder) {\r
+        private IBaseFilter LoadSplitter(IGraphBuilder graphBuilder)\r
+        {\r
             IBaseFilter splitter = null;\r
             ILAVSplitterSettings lavSplitterSettings;\r
             splitter = FilterProvider.GetSplitter(out lavSplitterSettings);\r
@@ -273,8 +311,10 @@ namespace DxPlay {
         }\r
 \r
         // Shut down capture\r
-        public void Dispose() {\r
-            lock (this) {\r
+        public void Dispose()\r
+        {\r
+            lock (this)\r
+            {\r
                 if (isDisposed)\r
                     return;\r
                 logger.Debug("Dispose");\r
@@ -283,7 +323,8 @@ namespace DxPlay {
                     m_DsRot.Dispose();\r
 #endif\r
                 IMediaControl mediaCtrl = (IMediaControl)this;\r
-                if (mediaCtrl != null) {\r
+                if (mediaCtrl != null)\r
+                {\r
                     mediaCtrl.Stop();\r
                     IGraphBuilder graphBuilder = (IGraphBuilder)mediaCtrl;\r
                     FilterGraphTools.DisconnectAllPins(graphBuilder);\r