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

diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json
index eb24fa454b5ac79375979cde60da0ab0aa79c3ef..9c4d6417146d49dd7ff9c2f2a49042f410e4b0b0 100644 (file)
--- a/client/DxPlay/Configuration/dxplay.json
+++ b/client/DxPlay/Configuration/dxplay.json
@@ -7,11 +7,12 @@
   },\r
   "metadata": {\r
     "$type": "TrafficMetadata",\r
+    "uiFileName": "metadataprovider.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": 1000\r
+      "timeout": 500\r
     }\r
   }\r
 }\r

diff --git a/client/DxPlay/Configuration/metadataprovider.en b/client/DxPlay/Configuration/metadataprovider.en
new file mode 100644 (file)
index 0000000..3f488e8
--- /dev/null
+++ b/client/DxPlay/Configuration/metadataprovider.en
@@ -0,0 +1,27 @@
+{\r
+  "define-segment": "Define segment",\r
+  "break-segment": "Break segment",\r
+  "position-as-tcin": "Current position as TC in",\r
+  "position-as-tcout": "Current position as TC out",\r
+  "delete-segment": "Delete segment",\r
+  "segments": "Segments",\r
+  "no-input": "NO INPUT",\r
+  "start": "START",\r
+  "length": "LENGTH",\r
+  "tc-in": "TC in",\r
+  "tc-out": "TC out",\r
+  "optional": "Optional",\r
+  "comment": "Comment",\r
+  "starting": "STARTING",\r
+  "exiting": "EXITING",\r
+  "paused": "PAUSED",\r
+  "playing": "PLAYING",\r
+  "stopped": "STOPPED",\r
+  "completed": "COMPLETED",\r
+  "pause": "Pause",\r
+  "play": "Play",\r
+  "stop": "Stop",\r
+  "missing-traffic-configuration": "Missing PlanAir connection configuration.",\r
+  "error-traffic-connect": "Could not connect to PlanAir system, using: {0}",\r
+  "missing-traffic-variant": "Missing metadata for {0} in PlanAir system."\r
+}\r

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 730e8fa9419e2b598ba701ae16bd47123e0c8497..bb3c41293e90b0bda219cb506e8a5e49e599319a 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -246,6 +246,9 @@
     </Compile>\r
     <Content Include="DirectShowLib.dll" />\r
     <Content Include="maestro.ico" />\r
+    <None Include="Configuration\metadataprovider.en">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Configuration\dxplay.en">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r

diff --git a/client/DxPlay/DxPlaySettings.cs b/client/DxPlay/DxPlaySettings.cs
index c18c407715f94f19bd552c9945492b126da95842..d59d0b876315b6383da0d524798e361c72593c9b 100644 (file)
--- a/client/DxPlay/DxPlaySettings.cs
+++ b/client/DxPlay/DxPlaySettings.cs
@@ -5,7 +5,7 @@ using System.ComponentModel;
 namespace DxPlay {\r
     public class DxPlaySettings : UISettings {\r
         public Player Player { get; set; }\r
-        public MetadataProvider Metadata { get; set; }\r
+        public TrafficMetadata Metadata { get; set; }\r
         public BindingList<MovieSegment> Segments { get; set; }\r
         public bool IsStandalone { get; set; }\r
         public bool IsMaximized { get; set; }\r

diff --git a/client/DxPlay/Integration/Traffic.cs b/client/DxPlay/Integration/Traffic.cs
index f3e65ec21e486134c1afb473007107721b1157f1..680d77b05843f6e27dc0a985be9bdbd99f0114f3 100644 (file)
--- a/client/DxPlay/Integration/Traffic.cs
+++ b/client/DxPlay/Integration/Traffic.cs
@@ -1,7 +1,6 @@
 \r
 using LinkDotNet.MessageHandling.Contracts;\r
 using TrafficClient;\r
-using LinkDotNet.MessageHandling;\r
 using MaestroShared.Configuration;\r
 using System;\r
 using System.Linq;\r
@@ -12,14 +11,12 @@ using NLog;
 namespace DxPlay.Integration {\r
     public class Traffic {\r
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();\r
-        private IMessageBus messageBus = new MessageBus();\r
         private readonly DxPlaySettings settings;\r
         private readonly string id;\r
         private readonly Connection connection;\r
         public TrafficAPI Api { get; private set; }\r
 \r
-        public Traffic(DxPlaySettings settings, string id) {\r
-            messageBus.Subscribe<TrafficAPIMessage>(OnMessage);\r
+        public Traffic(DxPlaySettings settings, string id, IMessageBus messageBus) {\r
             connection = settings?.Metadata?.Server;\r
             if (connection == null)\r
                 throw new Exception(settings.Resource("missing-traffic-configuration", StringResource.MISSING_TRAFFIC_CONFIGURATION));\r
@@ -28,12 +25,6 @@ namespace DxPlay.Integration {
             this.id = id;\r
         }\r
 \r
-        private void OnMessage(IMessage message) {\r
-            string msg = string.Format(settings.Resource("error-traffic-connect", StringResource.ERROR_TRAFFIC_CONNECT), connection.Address.OriginalString);\r
-            throw new Exception(msg);\r
-            //MessageBox.Show(msg, "Connection error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
-        }\r
-\r
         public List<MovieSegment> LoadSegments() {\r
             var metadataType = MetadataTypeUtil.Guess(id);\r
             List<MovieSegment> result = null;\r

diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs
index 57fa05d06f433d13c4e67a2e45971c8fa1e7f7d5..ebaf9eb534b7c9113dbf772f7ba47a7c79a449bb 100644 (file)
--- a/client/DxPlay/Model/DxPlayModel.cs
+++ b/client/DxPlay/Model/DxPlayModel.cs
@@ -4,6 +4,9 @@ using System;
 using System.Collections.Generic;\r
 using System.ComponentModel;\r
 using System.Runtime.CompilerServices;\r
+using LinkDotNet.MessageHandling;\r
+using LinkDotNet.MessageHandling.Contracts;\r
+using TrafficClient;\r
 \r
 namespace DxPlay.Model {\r
     public class DxPlayModel {\r
@@ -16,12 +19,22 @@ namespace DxPlay.Model {
             IsSegmentEditorEnabled = true.Equals(settings?.Player?.SegmentEditor);\r
             IsMenuVisible = true.Equals(settings?.IsStandalone);\r
             Segments = settings.Segments ?? new BindingList<MovieSegment>();\r
+            messageBus.Subscribe<TrafficAPIMessage>(OnMessage);\r
+        }\r
+\r
+        private void OnMessage(IMessage message) {\r
+            string msg = string.Format(settings.Resource("error-traffic-connect", StringResource.ERROR_TRAFFIC_CONNECT), settings?.Metadata?.Server?.Address?.OriginalString);\r
+            throw new Exception(msg);\r
+            //MessageBox.Show(msg, "Connection error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
         }\r
 \r
         private void Notify([CallerMemberName] String propertyName = "") {\r
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));\r
         }\r
 \r
+        private IMessageBus messageBus = new MessageBus();\r
+        public IMessageBus MessageBus { get => messageBus; }\r
+\r
         private bool isSegmentEditorEnabled;\r
         public bool IsSegmentEditorEnabled {\r
             get {\r
@@ -66,7 +79,7 @@ namespace DxPlay.Model {
         internal void InitializeSegments(string id) {\r
             Segments.Clear();\r
             try {\r
-                traffic = new Traffic(settings, id);\r
+                traffic = new Traffic(settings, id, MessageBus);\r
                 List<MovieSegment> segments = traffic.LoadSegments();\r
                 if (segments != null)\r
                     segments.ForEach(s => Segments.Add(s));\r

diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs
index 9e1cefff40ac63676041c79df7b1607026da1b21..5fdb198b6512b253a5c619628b6ba03983c90657 100644 (file)
--- a/client/DxPlay/PlayerForm.Designer.cs
+++ b/client/DxPlay/PlayerForm.Designer.cs
@@ -237,7 +237,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(281, 442);\r
+            this.tpSegments.Size = new System.Drawing.Size(192, 30);\r
             this.tpSegments.TabIndex = 1;\r
             this.tpSegments.Text = "Segments";\r
             this.tpSegments.UseVisualStyleBackColor = true;\r
@@ -267,7 +267,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(275, 411);\r
+            this.dgSegments.Size = new System.Drawing.Size(186, 0);\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
@@ -288,7 +288,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(275, 25);\r
+            this.segmentActions.Size = new System.Drawing.Size(186, 25);\r
             this.segmentActions.TabIndex = 0;\r
             this.segmentActions.Text = "toolStrip1";\r
             // \r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 884a4f72517bf3c5aa0479ac87a4627ec08c51de..46a651de7c207e7370b3629321b78f416d0a2604 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using MaestroShared.Metadata;\r
 using NLog;\r
 using DxPlay.Model;\r
+using TrafficClient;\r
+using MaestroShared.Commons;\r
 \r
 namespace DxPlay {\r
 \r
@@ -64,6 +66,9 @@ namespace DxPlay {
                     mainSplit.Panel2.Hide();\r
             };\r
             mainSplit.DataBindings.Add(segmentEditorPanelBinding);\r
+            trafficBrowser.Parameters = new TrafficParameters {\r
+                Configuration = Settings.Metadata, MessageBus = model.MessageBus\r
+            };\r
         }\r
 \r
         public PlayerForm() {\r
@@ -158,7 +163,7 @@ namespace DxPlay {
                 try {\r
                     model.InitializeSegments(id);\r
                 } catch (Exception e) {\r
-                    MessageBox.Show(e.Message, null, MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MsgBox.Error(e.Message);\r
                     logger.Error(e);\r
                 }\r
             }\r

diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx
index ebe652a99d281ee7dba1f225e2bce0d60ba5c4bb..8c2e6ddd51d23a0f875c5da474a2ad37ffaebb95 100644 (file)
--- a/client/DxPlay/PlayerForm.resx
+++ b/client/DxPlay/PlayerForm.resx
@@ -176,7 +176,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAVgBAAFYAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index 434960740e4a5ddd9512585bd4c7a4b6aa71f69f..e7706c1e6234e4087a43bf5354189f873dd4c8f6 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -153,7 +153,7 @@ namespace MaestroShared.Configuration {
     public class NEXIOSource : Source {\r
     }\r
 \r
-    public class MetadataProvider {\r
+    public class MetadataProvider : UISettings {\r
         public Connection Server { get; set; }\r
     }\r
 \r