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

diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj
index 631bac362cc9cff163ab36d1b472de794bb22906..235a09c18b009f8f34cdfe094fc4bca8c342717d 100644 (file)
--- a/client/AudioRecorder/AudioRecorder.csproj
+++ b/client/AudioRecorder/AudioRecorder.csproj
@@ -195,6 +195,7 @@
   <ItemGroup>\r
     <Content Include="maestro.ico" />\r
     <None Include="Resources\ic_refresh_black_24dp_1x.png" />\r
+    <None Include="Resources\bs-user-logo.png" />\r
     <Content Include="Resources\pause.png" />\r
     <Content Include="Resources\record.png" />\r
     <Content Include="Resources\stop.png" />\r

diff --git a/client/AudioRecorder/Configuration/audiorecorder.json b/client/AudioRecorder/Configuration/audiorecorder.json
index 32bb81e65a06f42e7b2871beeadf993ef34fd4ee..f44fe6853bf672abec4c33b7620e049429c4a838 100644 (file)
--- a/client/AudioRecorder/Configuration/audiorecorder.json
+++ b/client/AudioRecorder/Configuration/audiorecorder.json
@@ -20,13 +20,13 @@
   "metadatas": [\r
     {\r
       "$type": "NativeOctopusMetadata",\r
-      "uiFileName": "audiorecorder.en",\r
       "server": {\r
-        "address": " http://10.10.1.11/api/v1/",\r
-        "userName": "mam",\r
-        "password": "fPLnV9N5gc7aC9ICvspjzJkGLnTWxAgEhwGOrXilAiD8+/IXviRlNJA0lrZ3ZX+7WG5EE3ZlaIitAhRGk+QIPGEOF3fEJCBJI2I9NN1e2JGi/my3WwXt0fu7dgbMxVid",\r
+        "address": " http://10.10.0.30/api/v1/",\r
+        "userName": "maestro",\r
+        "password": "GS2YlUmEJ1d2M9W4uLXB0OVimdprXHpgDqvUkUPUvhniMLU237kZQOY0pieKyvx0yGpmB1ZuBvoqqLGDSVBmUFNNhp+8CO6yJN4hWNvQJegUZBfINwkHMxKrMXnd9ws0",\r
         "timeout": 3000\r
-      }\r
+      },\r
+      "uiFileName": "audiorecorder.en"\r
     }\r
   ]\r
 }
\ No newline at end of file

diff --git a/client/AudioRecorder/MainForm.Designer.cs b/client/AudioRecorder/MainForm.Designer.cs
index 74292bb1a4d0bcc8726c35baec1093924bcd0dab..af36a0b7789fc274b94c86e0280d01d8e687f07b 100644 (file)
--- a/client/AudioRecorder/MainForm.Designer.cs
+++ b/client/AudioRecorder/MainForm.Designer.cs
@@ -34,10 +34,11 @@ namespace AudioRecorder {
             this.pauseButton = new System.Windows.Forms.Button();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.tbVolume = new System.Windows.Forms.TrackBar();\r
-            this.pmVolume = new Ernzo.WinForms.Controls.PeakMeterCtrl();\r
             this.playButton = new System.Windows.Forms.Button();\r
             this.groupBox3 = new System.Windows.Forms.GroupBox();\r
             this.txtRecordFilePath = new System.Windows.Forms.TextBox();\r
+            this.panel1 = new System.Windows.Forms.Panel();\r
+            this.pmVolume = new Ernzo.WinForms.Controls.PeakMeterCtrl();\r
             this.groupBox1.SuspendLayout();\r
             this.groupBox2.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.tbVolume)).BeginInit();\r
@@ -51,9 +52,9 @@ namespace AudioRecorder {
             this.recordButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;\r
             this.recordButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.recordButton.Image = ((System.Drawing.Image)(resources.GetObject("recordButton.Image")));\r
-            this.recordButton.Location = new System.Drawing.Point(33, 79);\r
+            this.recordButton.Location = new System.Drawing.Point(32, 79);\r
             this.recordButton.Name = "recordButton";\r
-            this.recordButton.Size = new System.Drawing.Size(181, 56);\r
+            this.recordButton.Size = new System.Drawing.Size(219, 56);\r
             this.recordButton.TabIndex = 0;\r
             this.recordButton.Text = "Record";\r
             this.recordButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;\r
@@ -68,9 +69,9 @@ namespace AudioRecorder {
             this.stopButton.Enabled = false;\r
             this.stopButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));\r
-            this.stopButton.Location = new System.Drawing.Point(33, 180);\r
+            this.stopButton.Location = new System.Drawing.Point(32, 180);\r
             this.stopButton.Name = "stopButton";\r
-            this.stopButton.Size = new System.Drawing.Size(181, 38);\r
+            this.stopButton.Size = new System.Drawing.Size(219, 38);\r
             this.stopButton.TabIndex = 1;\r
             this.stopButton.Text = "Stop      ";\r
             this.stopButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;\r
@@ -83,7 +84,7 @@ namespace AudioRecorder {
             this.timecodeLabel.Font = new System.Drawing.Font("Calibri", 28F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.timecodeLabel.Location = new System.Drawing.Point(3, 16);\r
             this.timecodeLabel.Name = "timecodeLabel";\r
-            this.timecodeLabel.Size = new System.Drawing.Size(241, 46);\r
+            this.timecodeLabel.Size = new System.Drawing.Size(278, 46);\r
             this.timecodeLabel.TabIndex = 2;\r
             this.timecodeLabel.Text = "00:00:00:00";\r
             this.timecodeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
@@ -93,7 +94,7 @@ namespace AudioRecorder {
             this.btnSelectAudio.BackColor = System.Drawing.Color.White;\r
             this.btnSelectAudio.Location = new System.Drawing.Point(9, 19);\r
             this.btnSelectAudio.Name = "btnSelectAudio";\r
-            this.btnSelectAudio.Size = new System.Drawing.Size(312, 23);\r
+            this.btnSelectAudio.Size = new System.Drawing.Size(352, 23);\r
             this.btnSelectAudio.TabIndex = 3;\r
             this.btnSelectAudio.Text = "Select audio";\r
             this.btnSelectAudio.UseVisualStyleBackColor = false;\r
@@ -107,7 +108,7 @@ namespace AudioRecorder {
             this.groupBox1.Controls.Add(this.timecodeLabel);\r
             this.groupBox1.Location = new System.Drawing.Point(15, 12);\r
             this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Size = new System.Drawing.Size(247, 240);\r
+            this.groupBox1.Size = new System.Drawing.Size(284, 240);\r
             this.groupBox1.TabIndex = 5;\r
             this.groupBox1.TabStop = false;\r
             // \r
@@ -119,9 +120,9 @@ namespace AudioRecorder {
             this.pauseButton.Enabled = false;\r
             this.pauseButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold);\r
             this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));\r
-            this.pauseButton.Location = new System.Drawing.Point(33, 142);\r
+            this.pauseButton.Location = new System.Drawing.Point(32, 142);\r
             this.pauseButton.Name = "pauseButton";\r
-            this.pauseButton.Size = new System.Drawing.Size(181, 32);\r
+            this.pauseButton.Size = new System.Drawing.Size(219, 32);\r
             this.pauseButton.TabIndex = 3;\r
             this.pauseButton.Text = "Pause  ";\r
             this.pauseButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;\r
@@ -132,7 +133,7 @@ namespace AudioRecorder {
             // \r
             this.groupBox2.Controls.Add(this.tbVolume);\r
             this.groupBox2.Controls.Add(this.pmVolume);\r
-            this.groupBox2.Location = new System.Drawing.Point(272, 12);\r
+            this.groupBox2.Location = new System.Drawing.Point(308, 12);\r
             this.groupBox2.Name = "groupBox2";\r
             this.groupBox2.Size = new System.Drawing.Size(75, 240);\r
             this.groupBox2.TabIndex = 6;\r
@@ -152,24 +153,6 @@ namespace AudioRecorder {
             this.tbVolume.TickStyle = System.Windows.Forms.TickStyle.Both;\r
             this.tbVolume.ValueChanged += new System.EventHandler(this.OnVolumeChanged);\r
             // \r
-            // pmVolume\r
-            // \r
-            this.pmVolume.BandsCount = 1;\r
-            this.pmVolume.ColorHigh = System.Drawing.Color.Red;\r
-            this.pmVolume.ColorHighBack = System.Drawing.Color.White;\r
-            this.pmVolume.ColorMedium = System.Drawing.Color.Yellow;\r
-            this.pmVolume.ColorMediumBack = System.Drawing.Color.White;\r
-            this.pmVolume.ColorNormal = System.Drawing.Color.Green;\r
-            this.pmVolume.ColorNormalBack = System.Drawing.Color.White;\r
-            this.pmVolume.FalloffColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));\r
-            this.pmVolume.GridColor = System.Drawing.Color.Gainsboro;\r
-            this.pmVolume.LEDCount = 17;\r
-            this.pmVolume.Location = new System.Drawing.Point(6, 19);\r
-            this.pmVolume.Name = "pmVolume";\r
-            this.pmVolume.Size = new System.Drawing.Size(15, 207);\r
-            this.pmVolume.TabIndex = 12;\r
-            this.pmVolume.Text = "pmVolume";\r
-            // \r
             // playButton\r
             // \r
             this.playButton.BackColor = System.Drawing.Color.White;\r
@@ -178,7 +161,7 @@ namespace AudioRecorder {
             this.playButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.playButton.Image = ((System.Drawing.Image)(resources.GetObject("playButton.Image")));\r
             this.playButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.playButton.Location = new System.Drawing.Point(250, 46);\r
+            this.playButton.Location = new System.Drawing.Point(290, 46);\r
             this.playButton.Name = "playButton";\r
             this.playButton.Size = new System.Drawing.Size(71, 23);\r
             this.playButton.TabIndex = 9;\r
@@ -194,7 +177,7 @@ namespace AudioRecorder {
             this.groupBox3.Controls.Add(this.playButton);\r
             this.groupBox3.Location = new System.Drawing.Point(15, 258);\r
             this.groupBox3.Name = "groupBox3";\r
-            this.groupBox3.Size = new System.Drawing.Size(332, 80);\r
+            this.groupBox3.Size = new System.Drawing.Size(367, 80);\r
             this.groupBox3.TabIndex = 10;\r
             this.groupBox3.TabStop = false;\r
             // \r
@@ -203,15 +186,44 @@ namespace AudioRecorder {
             this.txtRecordFilePath.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.txtRecordFilePath.Location = new System.Drawing.Point(10, 46);\r
             this.txtRecordFilePath.Name = "txtRecordFilePath";\r
-            this.txtRecordFilePath.Size = new System.Drawing.Size(233, 23);\r
+            this.txtRecordFilePath.Size = new System.Drawing.Size(274, 23);\r
             this.txtRecordFilePath.TabIndex = 10;\r
             // \r
+            // panel1\r
+            // \r
+            this.panel1.BackgroundImage = global::AudioRecorder.Properties.Resources.bs_user_logo;\r
+            this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+            this.panel1.Location = new System.Drawing.Point(0, 344);\r
+            this.panel1.Name = "panel1";\r
+            this.panel1.Size = new System.Drawing.Size(399, 55);\r
+            this.panel1.TabIndex = 11;\r
+            // \r
+            // pmVolume\r
+            // \r
+            this.pmVolume.BandsCount = 1;\r
+            this.pmVolume.ColorHigh = System.Drawing.Color.Red;\r
+            this.pmVolume.ColorHighBack = System.Drawing.Color.White;\r
+            this.pmVolume.ColorMedium = System.Drawing.Color.Yellow;\r
+            this.pmVolume.ColorMediumBack = System.Drawing.Color.White;\r
+            this.pmVolume.ColorNormal = System.Drawing.Color.Green;\r
+            this.pmVolume.ColorNormalBack = System.Drawing.Color.White;\r
+            this.pmVolume.FalloffColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));\r
+            this.pmVolume.GridColor = System.Drawing.Color.Gainsboro;\r
+            this.pmVolume.LEDCount = 17;\r
+            this.pmVolume.Location = new System.Drawing.Point(6, 19);\r
+            this.pmVolume.Name = "pmVolume";\r
+            this.pmVolume.Size = new System.Drawing.Size(15, 207);\r
+            this.pmVolume.TabIndex = 12;\r
+            this.pmVolume.Text = "pmVolume";\r
+            // \r
             // MainForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.Color.White;\r
-            this.ClientSize = new System.Drawing.Size(363, 352);\r
+            this.ClientSize = new System.Drawing.Size(399, 399);\r
+            this.Controls.Add(this.panel1);\r
             this.Controls.Add(this.groupBox3);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox1);\r
@@ -248,6 +260,7 @@ namespace AudioRecorder {
         private Ernzo.WinForms.Controls.PeakMeterCtrl pmVolume;\r
         private System.Windows.Forms.TrackBar tbVolume;\r
         private System.Windows.Forms.TextBox txtRecordFilePath;\r
+        private System.Windows.Forms.Panel panel1;\r
     }\r
 }\r
 \r

diff --git a/client/AudioRecorder/Program.cs b/client/AudioRecorder/Program.cs
index 5b168483bc3120dfe337cd8b01c0e3692bb4fa9f..84a7a7f0401ba91ee493ba32506e48a3023e5a51 100644 (file)
--- a/client/AudioRecorder/Program.cs
+++ b/client/AudioRecorder/Program.cs
@@ -1,6 +1,5 @@
 using MaestroShared.Configuration;\r
 using System;\r
-using System.Collections.Generic;\r
 using System.Windows.Forms;\r
 \r
 namespace AudioRecorder {\r

diff --git a/client/AudioRecorder/Properties/Resources.Designer.cs b/client/AudioRecorder/Properties/Resources.Designer.cs
index d543edb092efa785953cf5d8b1bc6f776077df14..fc729285821f82addaeadbc69d409240f09b4bf4 100644 (file)
--- a/client/AudioRecorder/Properties/Resources.Designer.cs
+++ b/client/AudioRecorder/Properties/Resources.Designer.cs
@@ -60,6 +60,16 @@ namespace AudioRecorder.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        /// </summary>\r
+        internal static System.Drawing.Bitmap bs_user_logo {\r
+            get {\r
+                object obj = ResourceManager.GetObject("bs-user-logo", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Mégsem.\r
         /// </summary>\r

diff --git a/client/AudioRecorder/Properties/Resources.resx b/client/AudioRecorder/Properties/Resources.resx
index a03ecf13fe0b45a1fb5fe0f9b7e050968fbd1921..7f9af9914d1eb2fb9c5421b1963547f9d1fd662f 100644 (file)
--- a/client/AudioRecorder/Properties/Resources.resx
+++ b/client/AudioRecorder/Properties/Resources.resx
@@ -117,23 +117,23 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <data name="RECORD" xml:space="preserve">\r
+    <value>Felvétel</value>\r
+  </data>\r
+  <data name="PLAY" xml:space="preserve">\r
+    <value>Lejátszás</value>\r
+  </data>\r
   <data name="CANCEL" xml:space="preserve">\r
     <value>Mégsem</value>\r
   </data>\r
-  <data name="CHOOSEINPUTTITLE" xml:space="preserve">\r
-    <value>Válasszon mikrofont</value>\r
-  </data>\r
   <data name="DONE" xml:space="preserve">\r
     <value>Rendben</value>\r
   </data>\r
   <data name="PAUSE" xml:space="preserve">\r
     <value>Szunet</value>\r
   </data>\r
-  <data name="PLAY" xml:space="preserve">\r
-    <value>Lejátszás</value>\r
-  </data>\r
-  <data name="RECORD" xml:space="preserve">\r
-    <value>Felvétel</value>\r
+  <data name="CHOOSEINPUTTITLE" xml:space="preserve">\r
+    <value>Válasszon mikrofont</value>\r
   </data>\r
   <data name="SELECTORTITLE" xml:space="preserve">\r
     <value>Azonosító kiválasztása</value>\r
@@ -141,4 +141,8 @@
   <data name="STOP" xml:space="preserve">\r
     <value>Leállítás</value>\r
   </data>\r
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="bs-user-logo" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\bs-user-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/client/AudioRecorder/Resources/bs-user-logo.png b/client/AudioRecorder/Resources/bs-user-logo.png
new file mode 100644 (file)
index 0000000..50e8075
Binary files /dev/null and b/client/AudioRecorder/Resources/bs-user-logo.png differ

diff --git a/client/DxPlay/Configuration/dxplay - Copy.json b/client/DxPlay/Configuration/dxplay - Copy.json
new file mode 100644 (file)
index 0000000..cc6f5e6
--- /dev/null
+++ b/client/DxPlay/Configuration/dxplay - Copy.json
@@ -0,0 +1,19 @@
+{\r
+  "targetDirectory": "DONE",\r
+  "uiFileName": "dxplay.en",\r
+  "isMaximized": true,\r
+  "player": {\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "metadata": {\r
+    "$type": "TrafficMetadata",\r
+    "uiFileName": "dxplay.en",\r
+    "server": {\r
+      "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+      "userName": "MAM",\r
+      "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+      "timeout": 10000\r
+    }\r
+  }\r
+}\r

diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json
index 921bee091d5a6e155b43fb428d9d52c16782e5e9..0bb643a17830c48c873adfdb29d742e81cf78aaa 100644 (file)
--- a/client/DxPlay/Configuration/dxplay.json
+++ b/client/DxPlay/Configuration/dxplay.json
@@ -9,11 +9,12 @@
   "metadata": {\r
     "$type": "TrafficMetadata",\r
     "uiFileName": "dxplay.en",\r
+    "functionName": "dbo.clIFsp_KRCS_MAM",\r
     "server": {\r
-      "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
-      "userName": "MAM",\r
-      "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
-      "timeout": 1000\r
+      "address": "Data Source=10.101.0.45;Initial Catalog=PA_KRCS;Persist Security Info=True;",\r
+      "userName": "mediacube",\r
+      "password": "znCf1a/nDdf2YnUe9s9QjNdMQKygO1ELTypS/MkLs9ZnX9kPcYxoibZptO8Lmpem0Mj5YWWjsgMYTNIQJ80qD5DtsWNSEIwkje+lQkpmNpzKVLO3nZS4KrmyhX5QfqT+",\r
+      "timeout": 10000\r
     }\r
   }\r
 }\r

diff --git a/client/DxPlay/Controls/PlayerControls.Designer.cs b/client/DxPlay/Controls/PlayerControls.Designer.cs
index 6d68cf4416f3300dab83c4458001a4e83d5ffcba..f0bf4b9c7a0936ed5a88e9f8c50514e7e09e41c7 100644 (file)
--- a/client/DxPlay/Controls/PlayerControls.Designer.cs
+++ b/client/DxPlay/Controls/PlayerControls.Designer.cs
@@ -185,13 +185,16 @@
             // buttonsPanel\r
             // \r
             this.buttonsPanel.AutoSize = true;\r
+            this.buttonsPanel.BackgroundImage = global::DxPlay.Properties.Resources.bs_user_logo;\r
+            this.buttonsPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.buttonsPanel.Controls.Add(this.btnPlay);\r
             this.buttonsPanel.Controls.Add(this.btnStop);\r
             this.buttonsPanel.Controls.Add(this.btnPause);\r
+            this.buttonsPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.buttonsPanel.Location = new System.Drawing.Point(0, 56);\r
             this.buttonsPanel.Margin = new System.Windows.Forms.Padding(0);\r
             this.buttonsPanel.Name = "buttonsPanel";\r
-            this.buttonsPanel.Size = new System.Drawing.Size(180, 60);\r
+            this.buttonsPanel.Size = new System.Drawing.Size(835, 60);\r
             this.buttonsPanel.TabIndex = 20;\r
             // \r
             // btnPlay\r

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 2816111ae43cb8655847133195a7533bb40091b9..7f66a192db2deff02162f294f695ef83fa084435 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -235,6 +235,10 @@
     </Compile>\r
     <Content Include="DirectShowLib.dll" />\r
     <Content Include="maestro.ico" />\r
+    <None Include="Configuration\dxplay - Copy.json">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
+    <None Include="Resources\bs-user-logo.png" />\r
     <None Include="Configuration\dxplay.en">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r

diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs
index 5034f1dedb1bd7b8a3bbdefc94d2e9bb0ef62808..638a315af04bbba9cd378a887896f7c45a398fc3 100644 (file)
--- a/client/DxPlay/PlayerForm.Designer.cs
+++ b/client/DxPlay/PlayerForm.Designer.cs
@@ -37,7 +37,6 @@ namespace DxPlay {
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
             this.tabEditor = new System.Windows.Forms.TabControl();\r
             this.tpMetadata = new System.Windows.Forms.TabPage();\r
-            this.trafficBrowser = new TrafficClient.TrafficIDSelector();\r
             this.tpSegments = new System.Windows.Forms.TabPage();\r
             this.dgSegments = new System.Windows.Forms.DataGridView();\r
             this.bsSegments = new System.Windows.Forms.BindingSource(this.components);\r
@@ -50,13 +49,14 @@ namespace DxPlay {
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
             this.tbDeleteSegment = new System.Windows.Forms.ToolStripButton();\r
             this.imagesTabEdit = new System.Windows.Forms.ImageList(this.components);\r
-            this.btnToggleSegmentEditor = new MaestroShared.Controls.NoFocusCueButton();\r
             this.pMetadataDisplay = new System.Windows.Forms.TableLayoutPanel();\r
-            this.btnApprove = new MaestroShared.Controls.NoFocusCueButton();\r
             this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
             this.txtSelectedID = new System.Windows.Forms.TextBox();\r
             this.mainMenu = new System.Windows.Forms.MenuStrip();\r
             this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.trafficBrowser = new TrafficClient.TrafficIDSelector();\r
+            this.btnToggleSegmentEditor = new MaestroShared.Controls.NoFocusCueButton();\r
+            this.btnApprove = new MaestroShared.Controls.NoFocusCueButton();\r
             this.menuOpenFile = new DxPlay.Controls.BindableToolStripMenuItem();\r
             this.menuApprove = new DxPlay.Controls.BindableToolStripMenuItem();\r
             this.playerControls = new DxPlay.Controls.PlayerControls();\r
@@ -79,6 +79,7 @@ namespace DxPlay {
             // pVideo\r
             // \r
             this.pVideo.BackColor = System.Drawing.Color.Black;\r
+            this.pVideo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.pVideo.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.pVideo.Location = new System.Drawing.Point(0, 0);\r
             this.pVideo.Name = "pVideo";\r
@@ -164,17 +165,6 @@ namespace DxPlay {
             this.tpMetadata.TabIndex = 0;\r
             this.tpMetadata.Text = "Metadata";\r
             // \r
-            // trafficBrowser\r
-            // \r
-            this.trafficBrowser.BackColor = System.Drawing.Color.White;\r
-            this.trafficBrowser.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.trafficBrowser.IDChangedEvent = null;\r
-            this.trafficBrowser.Location = new System.Drawing.Point(3, 3);\r
-            this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0);\r
-            this.trafficBrowser.Name = "trafficBrowser";\r
-            this.trafficBrowser.Size = new System.Drawing.Size(278, 371);\r
-            this.trafficBrowser.TabIndex = 0;\r
-            // \r
             // tpSegments\r
             // \r
             this.tpSegments.Controls.Add(this.dgSegments);\r
@@ -184,7 +174,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(284, 377);\r
             this.tpSegments.TabIndex = 1;\r
             this.tpSegments.Text = "Segments";\r
             this.tpSegments.UseVisualStyleBackColor = true;\r
@@ -214,7 +204,7 @@ namespace DxPlay {
             this.dgSegments.Name = "dgSegments";\r
             this.dgSegments.RowHeadersVisible = false;\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(278, 346);\r
             this.dgSegments.TabIndex = 1;\r
             this.dgSegments.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgSegments_CellContentClick);\r
             this.dgSegments.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgSegments_CellMouseDoubleClick);\r
@@ -235,7 +225,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(278, 25);\r
             this.segmentActions.TabIndex = 0;\r
             this.segmentActions.Text = "toolStrip1";\r
             // \r
@@ -311,22 +301,6 @@ namespace DxPlay {
             this.imagesTabEdit.Images.SetKeyName(0, "round_publish_black_24dp.png");\r
             this.imagesTabEdit.Images.SetKeyName(1, "ic_playlist_add_check_black_24dp_1x.png");\r
             // \r
-            // btnToggleSegmentEditor\r
-            // \r
-            this.btnToggleSegmentEditor.BackColor = System.Drawing.Color.White;\r
-            this.btnToggleSegmentEditor.FlatAppearance.BorderSize = 0;\r
-            this.btnToggleSegmentEditor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btnToggleSegmentEditor.Image = ((System.Drawing.Image)(resources.GetObject("btnToggleSegmentEditor.Image")));\r
-            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.TabIndex = 0;\r
-            this.btnToggleSegmentEditor.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
-            this.btnToggleSegmentEditor.UseVisualStyleBackColor = false;\r
-            this.btnToggleSegmentEditor.Visible = false;\r
-            this.btnToggleSegmentEditor.Click += new System.EventHandler(this.OnToggleSegmentEditor);\r
-            // \r
             // pMetadataDisplay\r
             // \r
             this.pMetadataDisplay.AutoSize = true;\r
@@ -346,24 +320,6 @@ namespace DxPlay {
             this.pMetadataDisplay.Size = new System.Drawing.Size(319, 63);\r
             this.pMetadataDisplay.TabIndex = 5;\r
             // \r
-            // btnApprove\r
-            // \r
-            this.btnApprove.AutoSize = true;\r
-            this.btnApprove.BackColor = System.Drawing.Color.White;\r
-            this.btnApprove.FlatAppearance.BorderSize = 0;\r
-            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(217, 29);\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.TabIndex = 17;\r
-            this.btnApprove.Text = "Approve";\r
-            this.btnApprove.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
-            this.btnApprove.UseVisualStyleBackColor = false;\r
-            this.btnApprove.Click += new System.EventHandler(this.OnApprove);\r
-            // \r
             // labelSelectedMetadata\r
             // \r
             this.labelSelectedMetadata.AutoSize = true;\r
@@ -408,6 +364,51 @@ namespace DxPlay {
             this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);\r
             this.fileToolStripMenuItem.Text = "File";\r
             // \r
+            // trafficBrowser\r
+            // \r
+            this.trafficBrowser.BackColor = System.Drawing.Color.White;\r
+            this.trafficBrowser.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.trafficBrowser.IDChangedEvent = null;\r
+            this.trafficBrowser.Location = new System.Drawing.Point(3, 3);\r
+            this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0);\r
+            this.trafficBrowser.Name = "trafficBrowser";\r
+            this.trafficBrowser.Size = new System.Drawing.Size(278, 371);\r
+            this.trafficBrowser.TabIndex = 0;\r
+            // \r
+            // btnToggleSegmentEditor\r
+            // \r
+            this.btnToggleSegmentEditor.BackColor = System.Drawing.Color.White;\r
+            this.btnToggleSegmentEditor.FlatAppearance.BorderSize = 0;\r
+            this.btnToggleSegmentEditor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btnToggleSegmentEditor.Image = ((System.Drawing.Image)(resources.GetObject("btnToggleSegmentEditor.Image")));\r
+            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.TabIndex = 0;\r
+            this.btnToggleSegmentEditor.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
+            this.btnToggleSegmentEditor.UseVisualStyleBackColor = false;\r
+            this.btnToggleSegmentEditor.Visible = false;\r
+            this.btnToggleSegmentEditor.Click += new System.EventHandler(this.OnToggleSegmentEditor);\r
+            // \r
+            // btnApprove\r
+            // \r
+            this.btnApprove.AutoSize = true;\r
+            this.btnApprove.BackColor = System.Drawing.Color.White;\r
+            this.btnApprove.FlatAppearance.BorderSize = 0;\r
+            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(217, 29);\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.TabIndex = 17;\r
+            this.btnApprove.Text = "Approve";\r
+            this.btnApprove.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
+            this.btnApprove.UseVisualStyleBackColor = false;\r
+            this.btnApprove.Click += new System.EventHandler(this.OnApprove);\r
+            // \r
             // menuOpenFile\r
             // \r
             this.menuOpenFile.Name = "menuOpenFile";\r
@@ -427,6 +428,8 @@ namespace DxPlay {
             // playerControls\r
             // \r
             this.playerControls.AutoSize = true;\r
+            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, 513);\r
             this.playerControls.Margin = new System.Windows.Forms.Padding(0);\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index c70f627de537a3353116b68083412252adac1dbd..02d5f39bb5a2a25542180455dba11122e7fe69d4 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -7,6 +7,8 @@ using NLog;
 using DxPlay.Model;\r
 using MaestroShared.Commons;\r
 using DxPlay.Properties;\r
+using System.Diagnostics;\r
+using System.Runtime.InteropServices;\r
 \r
 namespace DxPlay {\r
 \r
@@ -288,10 +290,29 @@ namespace DxPlay {
                 e.SuppressKeyPress = true;\r
             }\r
         }\r
+        public static bool ApplicationIsActivated() {\r
+            var activatedHandle = GetForegroundWindow();\r
+            if (activatedHandle == IntPtr.Zero) {\r
+                return false;       // No window is currently activated\r
+            }\r
+\r
+            var procId = Process.GetCurrentProcess().Id;\r
+            int activeProcId;\r
+            GetWindowThreadProcessId(activatedHandle, out activeProcId);\r
+\r
+            return activeProcId == procId;\r
+        }\r
+\r
+\r
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]\r
+        private static extern IntPtr GetForegroundWindow();\r
+\r
+        [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
             logger.Debug("Key pressed " + keyCode);\r
-            if (trafficBrowser.ContainsFocus || openFileDialogOpened || dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus))\r
+            if (!ApplicationIsActivated() || trafficBrowser.ContainsFocus || openFileDialogOpened || dgSegments.IsCurrentCellInEditMode || (m_play != null && !m_play.IsFullscreen() && !ContainsFocus))\r
                 return true;\r
             logger.Debug("Handling " + keyCode);\r
             bool result = false;\r

diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx
index 48f49eaf27b207e2efab9e93d7ba83ef1f7610aa..101f0fd0ec9ef0e32213b6eef110a335d31dc10c 100644 (file)
--- a/client/DxPlay/PlayerForm.resx
+++ b/client/DxPlay/PlayerForm.resx
@@ -173,7 +173,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAVABAQFQAQEBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAQFoAQEBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index ab23c59234ebb45797e18fa0f4c6478a3e458a1a..cd9c2e9273ea4821ca39c808da2f97ad59b83b76 100644 (file)
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -72,8 +72,23 @@ namespace DxPlay {
             logger.Debug("Add VideoMixingRenderer9 to graph");\r
             IBaseFilter videoRenderer = (IBaseFilter)new VideoMixingRenderer9();\r
             DsError.ThrowExceptionForHR(graphBuilder.AddFilter(videoRenderer, "Video Mixing Renderer 9"));\r
-\r
             logger.Debug("Connect SampleGrabber -> VideoMixingRenderer9");\r
+\r
+            try {\r
+                FilterGraphTools.ConnectFilters(graphBuilder, sampleGrabber, "Output", videoRenderer, "VMR Input0", true);\r
+            } catch (Exception e) {\r
+                logger.Error(e);\r
+                graphBuilder.RemoveFilter(videoRenderer);\r
+                logger.Info("Trying default VideoRenderer instead Video Mixing Renderer 9");\r
+                AddSimpleRenderer(graphBuilder, sampleGrabber);\r
+            }\r
+            return videoRenderer;\r
+        }\r
+\r
+        private IBaseFilter AddSimpleRenderer(IGraphBuilder graphBuilder, IBaseFilter sampleGrabber) {\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

diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs
index ae4b10944aa01ec1fdce94e4c99c2469cc248950..c682d60cc6061c14130720db1db50632aebe2286 100644 (file)
--- a/client/DxPlay/Properties/Resources.Designer.cs
+++ b/client/DxPlay/Properties/Resources.Designer.cs
@@ -69,6 +69,16 @@ namespace DxPlay.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.\r
+        /// </summary>\r
+        internal static System.Drawing.Bitmap bs_user_logo {\r
+            get {\r
+                object obj = ResourceManager.GetObject("bs-user-logo", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Megjegyzés.\r
         /// </summary>\r

diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx
index 8df717b3242900fd1656afe1c6d257562d4d289e..76f6644ab6b0abf5ed06b928a30a98c1f2f2a52b 100644 (file)
--- a/client/DxPlay/Properties/Resources.resx
+++ b/client/DxPlay/Properties/Resources.resx
@@ -117,110 +117,113 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <data name="ERRORINVALIDTCOUT" xml:space="preserve">\r
+    <value>A kilépő nem lehet a belépő előtt.</value>\r
+  </data>\r
   <data name="POSITIONASTCIN" xml:space="preserve">\r
     <value>Aktuális pozíció belépőként</value>\r
   </data>\r
-  <data name="POSITIONASTCOUT" xml:space="preserve">\r
-    <value>Aktuális pozíció kilépőként</value>\r
-  </data>\r
-  <data name="TCIN" xml:space="preserve">\r
-    <value>Belépő</value>\r
-  </data>\r
-  <data name="OPTIONAL" xml:space="preserve">\r
-    <value>Elhagyható</value>\r
-  </data>\r
-  <data name="ERRORTRAFFICCONNECT" xml:space="preserve">\r
-    <value>Nem tudok kapcsolódni a PlanAir rendszerhez ezen az útvonalon: {0}</value>\r
-  </data>\r
-  <data name="LENGTH" xml:space="preserve">\r
-    <value>Hossz</value>\r
-  </data>\r
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
-  <data name="ic_pause_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="NOINPUT" xml:space="preserve">\r
+    <value>NINCS BEMENET</value>\r
   </data>\r
-  <data name="ic_play_arrow_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="EXITING" xml:space="preserve">\r
+    <value>Kilépés</value>\r
   </data>\r
-  <data name="ic_stop_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="METADATA" xml:space="preserve">\r
+    <value>Metaadat</value>\r
   </data>\r
   <data name="START" xml:space="preserve">\r
     <value>Kezdés</value>\r
   </data>\r
-  <data name="EXITING" xml:space="preserve">\r
-    <value>Kilépés</value>\r
-  </data>\r
-  <data name="TCOUT" xml:space="preserve">\r
-    <value>Kilépő</value>\r
-  </data>\r
   <data name="STOP" xml:space="preserve">\r
     <value>Leállítás</value>\r
   </data>\r
-  <data name="PLAYING" xml:space="preserve">\r
-    <value>Lejátszás</value>\r
+  <data name="LENGTH" xml:space="preserve">\r
+    <value>Hossz</value>\r
   </data>\r
-  <data name="lgs" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\resources\lgs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="APPROVE" xml:space="preserve">\r
+    <value>Kész</value>\r
   </data>\r
-  <data name="STOPPED" xml:space="preserve">\r
-    <value>Megállítva</value>\r
+  <data name="SEGMENTS" xml:space="preserve">\r
+    <value>Szegmensek</value>\r
   </data>\r
-  <data name="COMMENT" xml:space="preserve">\r
-    <value>Megjegyzés</value>\r
+  <data name="OPTIONAL" xml:space="preserve">\r
+    <value>Elhagyható</value>\r
   </data>\r
   <data name="MISSINGTRAFFICCONFIGURATION" xml:space="preserve">\r
     <value>Nem található a PlanAir rendszer kapcsolódási információja a dxplay.json állományban.</value>\r
   </data>\r
-  <data name="MISSINGTRAFFICVARIANT" xml:space="preserve">\r
-    <value>Nem található az {0} azonosító a PlanAir rendszerben.</value>\r
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="lgs" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\resources\lgs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="NOINPUT" xml:space="preserve">\r
-    <value>NINCS BEMENET</value>\r
+  <data name="PAUSE" xml:space="preserve">\r
+    <value>Szünet</value>\r
   </data>\r
-  <data name="SEGMENTS" xml:space="preserve">\r
-    <value>Szegmensek</value>\r
+  <data name="ERRORTRAFFICCONNECT" xml:space="preserve">\r
+    <value>Nem tudok kapcsolódni a PlanAir rendszerhez ezen az útvonalon: {0}</value>\r
   </data>\r
   <data name="DEFINESEGMENT" xml:space="preserve">\r
     <value>Szegmens definiálása</value>\r
   </data>\r
-  <data name="SPLITSEGMENT" xml:space="preserve">\r
-    <value>Szegmens szétvágása</value>\r
+  <data name="COMMENT" xml:space="preserve">\r
+    <value>Megjegyzés</value>\r
   </data>\r
-  <data name="DELETESEGMENT" xml:space="preserve">\r
-    <value>Szegmens törlése</value>\r
+  <data name="ic_play_arrow_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="PAUSE" xml:space="preserve">\r
-    <value>Szünet</value>\r
+  <data name="PLAY" xml:space="preserve">\r
+    <value>Lejátszás</value>\r
   </data>\r
-  <data name="PAUSED" xml:space="preserve">\r
-    <value>Szüneteltetett</value>\r
+  <data name="ERRORSEGMENTCOLLISION" xml:space="preserve">\r
+    <value>A szegmensek között nem lehet átfedés.</value>\r
+  </data>\r
+  <data name="STOPPED" xml:space="preserve">\r
+    <value>Megállítva</value>\r
   </data>\r
   <data name="COMPLETED" xml:space="preserve">\r
     <value>Vége</value>\r
   </data>\r
-  <data name="PLAY" xml:space="preserve">\r
+  <data name="PAUSED" xml:space="preserve">\r
+    <value>Szüneteltetett</value>\r
+  </data>\r
+  <data name="POSITIONASTCOUT" xml:space="preserve">\r
+    <value>Aktuális pozíció kilépőként</value>\r
+  </data>\r
+  <data name="PLAYING" xml:space="preserve">\r
     <value>Lejátszás</value>\r
   </data>\r
-  <data name="METADATA" xml:space="preserve">\r
-    <value>Metaadat</value>\r
+  <data name="TCIN" xml:space="preserve">\r
+    <value>Belépő</value>\r
   </data>\r
-  <data name="APPROVE" xml:space="preserve">\r
-    <value>Kész</value>\r
+  <data name="ic_stop_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="OPEN" xml:space="preserve">\r
-    <value>Megnyitás</value>\r
+  <data name="MISSINGTRAFFICVARIANT" xml:space="preserve">\r
+    <value>Nem található az {0} azonosító a PlanAir rendszerben.</value>\r
   </data>\r
   <data name="ERRORCREATESEGMENT" xml:space="preserve">\r
     <value>Az utolsó szegmens az anyag végéig tart, így nem hozható létre új szegmens.</value>\r
   </data>\r
+  <data name="SPLITSEGMENT" xml:space="preserve">\r
+    <value>Szegmens szétvágása</value>\r
+  </data>\r
+  <data name="TCOUT" xml:space="preserve">\r
+    <value>Kilépő</value>\r
+  </data>\r
+  <data name="ic_pause_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="DELETESEGMENT" xml:space="preserve">\r
+    <value>Szegmens törlése</value>\r
+  </data>\r
+  <data name="OPEN" xml:space="preserve">\r
+    <value>Megnyitás</value>\r
+  </data>\r
   <data name="ERRORINVALIDTCIN" xml:space="preserve">\r
     <value>A belépő nem lehet a kilépő után.</value>\r
   </data>\r
-  <data name="ERRORINVALIDTCOUT" xml:space="preserve">\r
-    <value>A kilépő nem lehet a belépő előtt.</value>\r
-  </data>\r
-  <data name="ERRORSEGMENTCOLLISION" xml:space="preserve">\r
-    <value>A szegmensek között nem lehet átfedés.</value>\r
+  <data name="bs-user-logo" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\bs-user-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
 </root>
\ No newline at end of file

diff --git a/client/DxPlay/Resources/bs-user-logo.png b/client/DxPlay/Resources/bs-user-logo.png
new file mode 100644 (file)
index 0000000..50e8075
Binary files /dev/null and b/client/DxPlay/Resources/bs-user-logo.png differ

diff --git a/client/IntegrationTests/PlanAIRTests.cs b/client/IntegrationTests/PlanAIRTests.cs
index 3999eb5f29d2918f9703e655ef52f22f15ac2402..ee32640022e9b9c804a6faeb9d1753e63e556c3b 100644 (file)
--- a/client/IntegrationTests/PlanAIRTests.cs
+++ b/client/IntegrationTests/PlanAIRTests.cs
@@ -19,7 +19,7 @@ namespace IntegrationTests {
 \r
         [TestInitialize]\r
         public void initialize() {\r
-            sut = new TrafficAPI(CONNECTION_STRING, USER_NAME, PASSWORD, TIMEOUT, null);\r
+            sut = new TrafficAPI(CONNECTION_STRING, USER_NAME, PASSWORD, TIMEOUT, null, null);\r
         }\r
 \r
         [TestMethod]\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index 1b46ebd5600faf191f574eacd48e933cf226cb6c..00e5f631622b5623afab69e25757267f715493db 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -183,6 +183,8 @@ namespace MaestroShared.Configuration {
 \r
     public class TrafficMetadata : MetadataProvider {\r
         public ProjectSettings ProjectSettings { get; set; }\r
+        public string FunctionName { get; set; }\r
+\r
     }\r
 \r
     public class MediaCubeMetadata : MetadataProvider {\r

diff --git a/client/MaestroShared/Metadata/MetadataType.cs b/client/MaestroShared/Metadata/MetadataType.cs
index f5bf35c1cfa6b63fc0e3097e6d4b4daca97dc9de..42627eb10f09c0d357538783ea2248492efa8f37 100644 (file)
--- a/client/MaestroShared/Metadata/MetadataType.cs
+++ b/client/MaestroShared/Metadata/MetadataType.cs
@@ -9,6 +9,7 @@ namespace MaestroShared.Metadata {
     public class MetadataTypeUtil {\r
         private const string REGEXP_TRAFFICMATERIALID = "^M{1}[0-9]{6}[A-Z]{1}$";\r
         private const string REGEXP_TRAFFICADID = "^R{1}[0-9]{6}[A-Z]{1}$";\r
+        private const string REGEXP_TRAFFICALTERNATEADID = "^C{1}[0-9]{6}[A-Z]{1}$";\r
         private const string REGEXP_TRAFFICPROMOID = "^P{1}[0-9]{6}[A-Z]{1}$";\r
         private const string REGEXP_OCTOPUSSTORYID = "^[0-9]+$";\r
         private const string REGEXP_OCTOPUSPLACEHOLDERID = "^[0-9]+_[0-9]+$";\r
@@ -31,6 +32,10 @@ namespace MaestroShared.Metadata {
             if (match.Success)\r
                 return MetadataType.TrafficAD;\r
 \r
+            match = Regex.Match(id, REGEXP_TRAFFICALTERNATEADID);\r
+            if (match.Success)\r
+                return MetadataType.TrafficAD;\r
+\r
             match = Regex.Match(id, REGEXP_OCTOPUSSTORYID);\r
             if (match.Success)\r
                 return MetadataType.OctopusStory;\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 17e3fb33a9f32d6e66d259e785e6b53d59f8751b..903f8fd7d27e5288b54eed5468ee88077763b7c2 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -1,6 +1,5 @@
 using System;\r
 using System.Collections.Generic;\r
-using System.Data;\r
 using System.Data.SqlClient;\r
 using NLog;\r
 using TrafficClient.Workers;\r
@@ -18,16 +17,18 @@ namespace TrafficClient {
         private PromoWorker promoWorker;\r
         private ADWorker adWorker;\r
         private SegmentWorker segmentWorker;\r
+        private readonly string functionName;\r
 \r
-        public TrafficAPI(string connString, string user, string password, int timeout, IMessageBus messageBus) {\r
+        public TrafficAPI(string connString, string user, string password, int timeout, string functionName, IMessageBus messageBus) {\r
             var correctedTimeout = timeout < 1000 ? 1000 : timeout;\r
             connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, correctedTimeout / 1000);\r
             connection = new SqlConnection(connectionString);\r
             cliFSPReader = new CliFSPReader();\r
-            materialWorker = new MaterialWorker(connection, cliFSPReader, messageBus);\r
-            promoWorker = new PromoWorker(connection, cliFSPReader, messageBus);\r
-            adWorker = new ADWorker(connection, cliFSPReader, messageBus);\r
-            segmentWorker = new SegmentWorker(connection, cliFSPReader, messageBus);\r
+            materialWorker = new MaterialWorker(connection, cliFSPReader, functionName, messageBus);\r
+            promoWorker = new PromoWorker(connection, cliFSPReader, functionName, messageBus);\r
+            adWorker = new ADWorker(connection, cliFSPReader, functionName, messageBus);\r
+            segmentWorker = new SegmentWorker(connection, cliFSPReader, functionName, messageBus);\r
+            this.functionName = functionName;\r
         }\r
 \r
         public List<TrafficItem> GetMaterials(string strParam, bool problematic, DateTime? from = null, DateTime? to = null) {\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index d292e904832705722e7991b7def2bdd23a19bb31..391782fb29e7cdfff8cc8440481ff32c2a76e4dd 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -43,7 +43,7 @@ namespace TrafficClient {
                 parameters = value;\r
                 var server = parameters.Configuration?.Server;\r
                 if (server != null && server.Address != null)\r
-                    trafficAPI = new TrafficAPI(server.Address.OriginalString, server.UserName, server.Password, server.Timeout, value.MessageBus);\r
+                    trafficAPI = new TrafficAPI(server.Address.OriginalString, server.UserName, server.Password, server.Timeout, parameters.Configuration?.FunctionName, value.MessageBus);\r
                 RefreshResults();\r
             }\r
         }\r

diff --git a/client/PlanAIRClient/Workers/ADWorker.cs b/client/PlanAIRClient/Workers/ADWorker.cs
index e47cc2b73eaebf032fc170453a8cdc9964a75cd9..40498b501c7a14332edc851d2bdac0ee17060b79 100644 (file)
--- a/client/PlanAIRClient/Workers/ADWorker.cs
+++ b/client/PlanAIRClient/Workers/ADWorker.cs
@@ -10,8 +10,8 @@ namespace TrafficClient.Workers {
 \r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
 \r
-        public ADWorker(SqlConnection connection, CliFSPReader cliFSPReader, IMessageBus messageBus) :\r
-            base(connection, cliFSPReader, messageBus) {\r
+        public ADWorker(SqlConnection connection, CliFSPReader cliFSPReader, string functionName, IMessageBus messageBus) :\r
+            base(connection, cliFSPReader, functionName, messageBus) {\r
         }\r
 \r
         private TrafficItem ToTrafficItem(clIFsp_EC_MAMAdvertismentResult data) {\r
@@ -36,7 +36,7 @@ namespace TrafficClient.Workers {
             List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     //cmd.Parameters.AddWithValue("@Operation", 3001);\r
                     cmd.Parameters.AddWithValue("@Operation", 3002);\r
@@ -83,7 +83,7 @@ namespace TrafficClient.Workers {
             try {\r
                 TryConnect();\r
                 int options = ok ? 1 : 0;\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 3100);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r
@@ -105,7 +105,7 @@ namespace TrafficClient.Workers {
             List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 3001);\r
                     cmd.Parameters.AddWithValue("@@@Options", 0);\r

diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs
index 3c516c76ba8fed1afc58e16d212568cdbaf190ac..9b1f19b976e7657c9463352eb7367556d37a925e 100644 (file)
--- a/client/PlanAIRClient/Workers/MaterialWorker.cs
+++ b/client/PlanAIRClient/Workers/MaterialWorker.cs
@@ -11,8 +11,8 @@ namespace TrafficClient.Workers {
 \r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
 \r
-        public MaterialWorker(SqlConnection connection, CliFSPReader cliFSPReader, IMessageBus messageBus) \r
-            : base(connection, cliFSPReader, messageBus) {\r
+        public MaterialWorker(SqlConnection connection, CliFSPReader cliFSPReader, string functionName, IMessageBus messageBus) \r
+            : base(connection, cliFSPReader, functionName, messageBus) {\r
         }\r
 \r
         private TrafficItem ToTrafficItem(clIFsp_EC_MAMBradocastResult data) {\r
@@ -46,7 +46,7 @@ namespace TrafficClient.Workers {
             List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1002);\r
                     if (problematic)\r
@@ -86,7 +86,7 @@ namespace TrafficClient.Workers {
             List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1002);\r
                     cmd.Parameters.AddWithValue("@@@Options", 0);\r
@@ -116,7 +116,7 @@ namespace TrafficClient.Workers {
             TrafficVersion result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1105);\r
                     cmd.Parameters.AddWithValue("@@@Options", DBNull.Value);\r
@@ -150,7 +150,7 @@ namespace TrafficClient.Workers {
             try {\r
                 TryConnect();\r
                 int options = ok ? 1 : 0;\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1100);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r

diff --git a/client/PlanAIRClient/Workers/PromoWorker.cs b/client/PlanAIRClient/Workers/PromoWorker.cs
index fc9161a48efd94e449c41664f7b7297c1430cf2f..4fa6b06c02c0318cdbd0901614741869690bb1d3 100644 (file)
--- a/client/PlanAIRClient/Workers/PromoWorker.cs
+++ b/client/PlanAIRClient/Workers/PromoWorker.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Data;\r
 using System.Data.SqlClient;\r
 using NLog;\r
-using System.Drawing;\r
 using System.Diagnostics;\r
 using LinkDotNet.MessageHandling.Contracts;\r
 \r
@@ -12,8 +11,8 @@ namespace TrafficClient.Workers {
 \r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
 \r
-        public PromoWorker(SqlConnection connection, CliFSPReader cliFSPReader, IMessageBus messageBus)\r
-            : base(connection, cliFSPReader, messageBus) {\r
+        public PromoWorker(SqlConnection connection, CliFSPReader cliFSPReader, string functionName, IMessageBus messageBus)\r
+            : base(connection, cliFSPReader, functionName, messageBus) {\r
         }\r
 \r
         private TrafficItem ToTrafficItem(clIFsp_EC_MAMPromotionalResult data) {\r
@@ -42,7 +41,7 @@ namespace TrafficClient.Workers {
             List<TrafficItem> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     //cmd.Parameters.AddWithValue("@Operation", 2001);\r
                     cmd.Parameters.AddWithValue("@Operation", 2002);\r
@@ -80,7 +79,7 @@ namespace TrafficClient.Workers {
             try {\r
                 TryConnect();\r
                 int options = ok ? 1 : 0;\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 2100);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r
@@ -102,7 +101,7 @@ namespace TrafficClient.Workers {
             List<TrafficItemMetadata> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 2002);\r
                     cmd.Parameters.AddWithValue("@@@Options", 0);\r

diff --git a/client/PlanAIRClient/Workers/SegmentWorker.cs b/client/PlanAIRClient/Workers/SegmentWorker.cs
index b986d1f3fa4d52b7747f9930092242f0a3fca1a1..8bc4c9943e1faed744c121a82a2c21c66a53eab5 100644 (file)
--- a/client/PlanAIRClient/Workers/SegmentWorker.cs
+++ b/client/PlanAIRClient/Workers/SegmentWorker.cs
@@ -11,8 +11,8 @@ namespace TrafficClient.Workers {
 \r
         private static Logger logger = LogManager.GetCurrentClassLogger();\r
 \r
-        public SegmentWorker(SqlConnection connection, CliFSPReader cliFSPReader, IMessageBus messageBus) :\r
-            base(connection, cliFSPReader, messageBus) {\r
+        public SegmentWorker(SqlConnection connection, CliFSPReader cliFSPReader, string functionName, IMessageBus messageBus) :\r
+            base(connection, cliFSPReader, functionName, messageBus) {\r
         }\r
 \r
         private MovieSegment ToSegment(clIFsp_EC_MAMPromotionalResult item) {\r
@@ -42,7 +42,7 @@ namespace TrafficClient.Workers {
             List<MovieSegment> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1010);\r
                     cmd.Parameters.AddWithValue("@@@Options", DBNull.Value);\r
@@ -69,7 +69,7 @@ namespace TrafficClient.Workers {
         public void DeleteMaterialSegments(int itemID) {\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1110);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r
@@ -89,7 +89,7 @@ namespace TrafficClient.Workers {
         public void DeleteMaterialSegment(int itemID, int segmentID) {\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1111);\r
                     cmd.Parameters.AddWithValue("@@ItemID", itemID);\r
@@ -113,7 +113,7 @@ namespace TrafficClient.Workers {
                 comment = DBNull.Value;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     int optionalParam = segment.Optional ? 1 : 0;\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 1115);\r
@@ -140,7 +140,7 @@ namespace TrafficClient.Workers {
                 comment = DBNull.Value;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     int optionalParam = segment.Optional ? 1 : 0;\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 3100);\r
@@ -166,7 +166,7 @@ namespace TrafficClient.Workers {
                 comment = DBNull.Value;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     int optionalParam = segment.Optional ? 1 : 0;\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 2100);\r
@@ -190,7 +190,7 @@ namespace TrafficClient.Workers {
             List<MovieSegment> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 2001);\r
                     cmd.Parameters.AddWithValue("@@@Options", 0);\r
@@ -222,7 +222,7 @@ namespace TrafficClient.Workers {
             List<MovieSegment> result = null;\r
             try {\r
                 TryConnect();\r
-                using (SqlCommand cmd = new SqlCommand("dbo.clIFsp_EC_MAM", connection)) {\r
+                using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", 3001);\r
                     cmd.Parameters.AddWithValue("@@@Options", 0);\r

diff --git a/client/PlanAIRClient/Workers/TrafficWorker.cs b/client/PlanAIRClient/Workers/TrafficWorker.cs
index f9ecafc46341f10ef4f01c631f7dae6359508796..9d30dea7e7d6444357babaaeb9f703776a9bd627 100644 (file)
--- a/client/PlanAIRClient/Workers/TrafficWorker.cs
+++ b/client/PlanAIRClient/Workers/TrafficWorker.cs
@@ -9,11 +9,13 @@ namespace TrafficClient.Workers {
 \r
         protected IMessageBus messageBus;\r
         protected CliFSPReader cliFSPReader;\r
+        private readonly string functionName;\r
         protected SqlConnection connection;\r
 \r
-        public TrafficWorker(SqlConnection connection, CliFSPReader cliFSPReader, IMessageBus messageBus) {\r
+        public TrafficWorker(SqlConnection connection, CliFSPReader cliFSPReader, string functionName, IMessageBus messageBus) {\r
             this.connection = connection;\r
             this.cliFSPReader = cliFSPReader;\r
+            this.functionName = functionName;\r
             this.messageBus = messageBus;\r
         }\r
 \r
@@ -30,6 +32,10 @@ namespace TrafficClient.Workers {
                 messageBus.Send(new TrafficAPIMessage("Sikertelen kapcsolódás a TRAFFIC rendszerhez."));\r
         }\r
 \r
+        protected SqlCommand CreateCommmad() {\r
+            string name = functionName ?? "dbo.clIFsp_EC_MAM";\r
+            return new SqlCommand(name, connection);\r
+        }\r
 \r
     }\r
 }\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java
index 518beb9864bd84491200132fd2d65a13eb7fcf29..55d64b9ade73afd06cc3c38be2eaf7ab25007e94 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java
@@ -192,13 +192,18 @@ public class CopyForArchiveNEXIOMaterialsStep extends JobStep {
                DBCollection clips = db.getCollection(NEXIOCLIPS);\r
                BasicDBObject clip = (BasicDBObject) clips.findOne(new BasicDBObject(LONGNAMEID, mosID));\r
                if (clip == null) {\r
-                       logger.debug("File NOT exists {}", mosID);\r
+                       logger.debug("File NOT exists: {}", mosID);\r
                        return null;\r
                        //throw new Exception(String.format("File NOT exists %s", mosID));\r
                } else {\r
-                       logger.debug("File exists {}", mosID);\r
+                       logger.debug("File exists: {}", mosID);\r
                }\r
                long duration = NoSQLUtils.asLong(clip, DURATION);\r
+\r
+               if (duration == 0) {\r
+                       logger.debug("File exists with 0 length: {}", mosID);\r
+                       return null;\r
+               }\r
                return new FileArchive(mosID, duration);\r
        }\r
 \r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
index 043a098ad3f90eb31a4867a2fb719244be81c05a..9137d1bcbd54b23f6e4c3fd6450ad87b04e3e97c 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java
@@ -214,12 +214,19 @@ public class CopyForArchiveNEXIORecordingsStep extends JobStep {
                }\r
 \r
                if (clipName.startsWith("1900_")) {\r
-                       String clipNameNext = clipName.replace("1900_", "1905_");\r
+                       String clipNameNext = clipName.replace("1900_", "1908_");\r
                        scheduledStart = getScheduledStart(clipNameNext, recordDate);\r
                        rundown = octopusAPI.getRundown(scheduledStart);\r
                        if (rundown == null) {\r
-                               logger.error(systemMarker, "A '{}' anyaghoz nem található tükör '{}' kezdéssel, ezért nem archiválható.", clipName, scheduledStart);\r
-                               return null;\r
+                               Calendar calendar = CalendarUtils.createCalendar(scheduledStart);\r
+                               int dow = calendar.get(Calendar.DAY_OF_WEEK);\r
+                               if (dow == Calendar.SATURDAY || dow == Calendar.SUNDAY) {\r
+                                       logger.info(systemMarker, "A '{}' anyaghoz nem található tükör '{}' kezdéssel, de a hétvégi kivétel miatt archiválható.", clipName,\r
+                                                       scheduledStart);\r
+                               } else {\r
+                                       logger.error(systemMarker, "A '{}' anyaghoz nem található tükör '{}' kezdéssel, ezért nem archiválható.", clipName, scheduledStart);\r
+                                       return null;\r
+                               }\r
                        }\r
 \r
                        RundownArchive item2 = null;\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
index 2318509c97064c8cbfa60c081b1fc858588334bc..cd14224dcc65721d6d668a4c0ca6538dd1b85142 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.java
@@ -24,7 +24,6 @@ import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
-import user.jobengine.server.JobRuntime;\r
 \r
 public class DeleteNEXIOMaterialsStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -33,14 +32,14 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
        private static final String LONGNAMEID = "longnameid";\r
        private static final String EXTAGENCY = "extagency";\r
        private StoreUri sourceUri;\r
-       private JobRuntime jobRuntime;\r
+       private IJobRuntime jobRuntime;\r
 \r
        private void delete(String name) {\r
                RemoteFile remoteFile = null;\r
                try {\r
                        remoteFile = sourceUri.getRemoteFile(name);\r
                        if (remoteFile == null) {\r
-                               logger.warn(jobRuntime.getMarker(), "A '{}' fájl már nem található a NEXIO szerveren", name);\r
+                               logger.warn(jobRuntime.getMarker(), "A '{}' fájl már nem található meg a NEXIO szerveren", name);\r
                                return;\r
                        }\r
                        sourceUri.delete(remoteFile);\r
@@ -53,6 +52,7 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
        @StepEntry\r
        public Object[] execute(int port, String userName, String password, String filterAgencies, int gracePeriodDays, boolean notificationOnly,\r
                        IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               this.jobRuntime = jobRuntime;\r
                String nexioHost = System.getProperty("nexio.host");\r
                if (StringUtils.isBlank(nexioHost)) {\r
                        logger.error(jobRuntime.getMarker(), "A 'nexio.host' rendszer paraméter nem található.");\r
@@ -96,8 +96,8 @@ public class DeleteNEXIOMaterialsStep extends JobStep {
                        Date killdate = clip.getDate(KILLDATE);\r
                        if (notificationOnly)\r
                                logger.info(jobRuntime.getMarker(), "Az {} fájl törölhető. Lejárt: {} ", name, df.format(killdate));\r
-                       //                      else\r
-                       //                              delete(name);\r
+                       else\r
+                               delete(name);\r
                        i++;\r
                        setProgress(i * 100 / clips.size());\r
                }\r

diff --git a/server/user.jobengine.executors/test-deploy-steps-to-bsh-bkup.bat b/server/user.jobengine.executors/test-deploy-steps-to-bsh-bkup.bat
index 023f98145321c2128acc2010e6a8eaca0bab4aaf..4d0256ce44eef5ebc47261ff7d15b299381b9185 100644 (file)
--- a/server/user.jobengine.executors/test-deploy-steps-to-bsh-bkup.bat
+++ b/server/user.jobengine.executors/test-deploy-steps-to-bsh-bkup.bat
@@ -9,6 +9,9 @@ SET REMOTE_STEPS_LOCATION=/opt/test-mediacube/configuration/executors/user
 \r
 SET LOCAL_TEMPLATES_LOCATION=jobtemplates\r
 SET REMOTE_TEMPLATES_LOCATION=/opt/test-mediacube/configuration/jobtemplates\r
+\r
+SET LOCAL_CONFIG_LOCATION=config\r
+SET REMOTE_CONFIG_LOCATION=/opt/test-mediacube/configuration/executors\r
  \r
        ECHO *** Deploy steps to server %REMOTE_HOST% ***\r
        WinSCP.com /command ^\r
@@ -26,5 +29,12 @@ SET REMOTE_TEMPLATES_LOCATION=/opt/test-mediacube/configuration/jobtemplates
        "synchronize remote" ^\r
        "exit"\r
 \r
+       ECHO *** Deploy config to server %REMOTE_HOST% ***\r
+       WinSCP.com /command ^\r
+       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
+       "lcd %LOCAL_CONFIG_LOCATION%" ^\r
+       "cd %REMOTE_CONFIG_LOCATION%" ^\r
+       "synchronize remote -filemask=config.xml" ^\r
+       "exit"\r
+\r
 @ECHO ON\r
- \r