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

diff --git a/client/AudioRecorder/MetadataSelectorForm.cs b/client/AudioRecorder/MetadataSelectorForm.cs
index 09396f89418d007e237606d5049b7acac0da8e15..2547fe3fd673dd218546d37237dad4720e115410 100644 (file)
--- a/client/AudioRecorder/MetadataSelectorForm.cs
+++ b/client/AudioRecorder/MetadataSelectorForm.cs
@@ -83,7 +83,7 @@ namespace AudioRecorder {
                 };\r
         }\r
 \r
-        private void TrafficIDChangedEvent(string id, int variantID, string epizodeID, string text, List<TrafficItem> selected) {\r
+        private void TrafficIDChangedEvent(string id, int variantID, string serialID, string text, List<TrafficItem> selected) {\r
             if (id == null)\r
                 SelectedMetadata = null;\r
             else {\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index d1189cb1648bd7929aaec7e248b6e5d700524950..e14eb715b51f253f7d7ba0015e315812dd1349a4 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -86,7 +86,7 @@ namespace DxPlay {
 \r
         }\r
 \r
-        private void OnSelectedIDChanged(string ID, int variantID, string epizodeID, string text, List<TrafficItem> selected) {\r
+        private void OnSelectedIDChanged(string ID, int variantID, string serialID, string text, List<TrafficItem> selected) {\r
             //logger.Info("Selected ID: " + ID);\r
             try {\r
                 model.SelectedSegments = selected;\r

diff --git a/client/Maestro/Configuration/editor-mv.json b/client/Maestro/Configuration/editor-mv.json
index 6a1fcb2054e83a3d3c9e53b6560207a73c1ddf2f..5645a4dce399fc335bf6df02e59ba8e03ac11f70 100644 (file)
--- a/client/Maestro/Configuration/editor-mv.json
+++ b/client/Maestro/Configuration/editor-mv.json
@@ -12,7 +12,7 @@
                "$type": "UNCSource",\r
                "filter": "avi,wav,mxf,mts",\r
                "local": {\r
-                       "address": "file://d:/!META_MXF",\r
+                       "address": "file://d:/_video",\r
                        "timeout": 1000\r
                },\r
                "remote": {\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 5e76f505bb50f6afcf925d0d42688eab7c3b5342..c6032a96f377df0e7a70f3b278d6453ae1be237d 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -411,7 +411,7 @@ namespace Maestro {
             };\r
         }\r
 \r
-        private void OnTrafficIDSelected(string id, int variantID, string epizodeID, string text, List<TrafficItem> selected) {\r
+        private void OnTrafficIDSelected(string id, int variantID, string serialID, string text, List<TrafficItem> selected) {\r
             btnRedefineSegments.Visible = false;\r
             if (id == null) {\r
                 ArchiveMetadata = null;\r
@@ -422,7 +422,7 @@ namespace Maestro {
             MetadataType metadataType = MetadataTypeUtil.Guess(id);\r
             SelectedMetadata = new MetadataInfo() {\r
                 Kind = metadataType,\r
-                ID = btnUseEpisodeID.Checked ? epizodeID : id,\r
+                ID = btnUseEpisodeID.Checked ? serialID : id,\r
                 MetadataText = text,\r
                 VariantID = variantID,\r
                 Selected = selected\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index 6940efaccca8180612aaaa411a83e2e3007288e6..39d6e7ac1b566f5e09686b572716c4c4bbde7fa1 100644 (file)
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.0.6")]\r
-[assembly: AssemblyFileVersion("2.1.0.6")]\r
+[assembly: AssemblyVersion("2.1.0.7")]\r
+[assembly: AssemblyFileVersion("2.1.0.7")]\r

diff --git a/client/MaestroShared/Metadata/Traffic.cs b/client/MaestroShared/Metadata/Traffic.cs
index 7d939c142525adfc1068199165ddf4cd42b1c2f6..3f079975f3a7adfcaf280f0fc852e4434daaafa1 100644 (file)
--- a/client/MaestroShared/Metadata/Traffic.cs
+++ b/client/MaestroShared/Metadata/Traffic.cs
@@ -4,6 +4,7 @@ namespace MaestroShared.Metadata {
     public class TrafficItem {\r
         public bool Selected { get; set; }\r
         public string MediaID { get; set; }\r
+        public int SerialID { get; set; }\r
         public bool OK { get; set; }\r
         public string Title { get; set; }\r
         public DateTime? NextBroadcastDate { get; set; }\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 7f12ec86fc04cddb45d14cac65077d9e0d505453..207b1fe65033d0a5648bcbfc31dd4701d1a44340 100644 (file)
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.0.3")]\r
-[assembly: AssemblyFileVersion("2.1.0.3")]\r
+[assembly: AssemblyVersion("2.1.0.4")]\r
+[assembly: AssemblyFileVersion("2.1.0.4")]\r

diff --git a/client/MetadataSelector/MetadataIDSelector.cs b/client/MetadataSelector/MetadataIDSelector.cs
index 737cbd6d3beb6b14c63688f4aef776d8ee15937f..8bd2add0b567a5c255e56a211c1ab8ca833d9f3d 100644 (file)
--- a/client/MetadataSelector/MetadataIDSelector.cs
+++ b/client/MetadataSelector/MetadataIDSelector.cs
@@ -141,7 +141,7 @@ namespace MaestroShared.Controls {
             textSelectedMetadata.Text = name;\r
         }\r
 \r
-        private void TrafficIDChangedEvent(string id, int variantID, string epizodeID, string text, List<TrafficItem> selected) {\r
+        private void TrafficIDChangedEvent(string id, int variantID, string serialID, string text, List<TrafficItem> selected) {\r
             octopusIDSelector.ClearSelection();\r
             nativeOctopusIDSelector.ClearSelection();\r
             ClearFreeMetadata();\r

diff --git a/client/PlanAIRClient/Properties/AssemblyInfo.cs b/client/PlanAIRClient/Properties/AssemblyInfo.cs
index f1621051a4de46f8ff1bc77beec01e5cb13561f3..7b96f724e2c3b9888a8f303813ed6306b99edb9e 100644 (file)
--- a/client/PlanAIRClient/Properties/AssemblyInfo.cs
+++ b/client/PlanAIRClient/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.1.0")]\r
-[assembly: AssemblyFileVersion("1.0.1.0")]\r
+[assembly: AssemblyVersion("1.0.1.1")]\r
+[assembly: AssemblyFileVersion("1.0.1.1")]\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 9cc0cef2b613659aebbef324d6676ff797c66171..253bbb36995bd4024158b4590a6bfcd95eb9eac6 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -11,7 +11,7 @@ using System.Text.RegularExpressions;
 using System.Windows.Forms;\r
 \r
 namespace TrafficClient {\r
-    public delegate void OnSelectedIDChanged(string ID, int variantID, string epizodeID, string text, List<TrafficItem> selected);\r
+    public delegate void OnSelectedIDChanged(string ID, int variantID, String serialID, string text, List<TrafficItem> selected);\r
 \r
     public partial class TrafficIDSelector : UserControl {\r
         public ITrafficAPI trafficAPI { get; private set; }\r
@@ -182,7 +182,7 @@ namespace TrafficClient {
             if (selectedItems?.Count > 0) {\r
                 btnNewVersion.Enabled = true;\r
                 CreateVersionIfMissing(trafficItem);\r
-                IDChangedEvent?.Invoke(trafficItem.MediaID, trafficItem.VariantID, trafficItem.EpisodeID, trafficItem.Title, selectedItems);\r
+                IDChangedEvent?.Invoke(trafficItem.MediaID, trafficItem.VariantID, trafficItem.SerialID.ToString(), trafficItem.Title, selectedItems);\r
             } else {\r
                 btnNewVersion.Enabled = false;\r
                 IDChangedEvent?.Invoke(null, 0, null, null, null);\r

diff --git a/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs b/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs
index ee2953557861d2b93279e1ed372140b9340ab24c..d295bdc0827cd8b148c43554d99ddbd741e29428 100644 (file)
--- a/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs
+++ b/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs
@@ -19,6 +19,7 @@ namespace TrafficClient.Workers {
 \r
         protected TrafficItem ToTrafficItem(PlanAirMaterialResult data) {\r
             var result = new TrafficItem() {\r
+                SerialID = data.v_ProgrammeID,\r
                 MediaID = data.v_MediaID,\r
                 EpisodeTitle = data.v_EpTitle,\r
                 Title = data.v_ProgTitle,\r