From 81c57cae76626ed936b829cbdc6b55b022ccc9eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 5 Aug 2020 14:25:15 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31917 --- client/AudioRecorder/MetadataSelectorForm.cs | 2 +- client/DxPlay/PlayerForm.cs | 2 +- client/Maestro/Configuration/editor-mv.json | 2 +- client/Maestro/MaestroForm.Metadata.cs | 4 ++-- client/Maestro/Properties/AssemblyInfo.cs | 4 ++-- client/MaestroShared/Metadata/Traffic.cs | 1 + client/MaestroShared/Properties/AssemblyInfo.cs | 4 ++-- client/MetadataSelector/MetadataIDSelector.cs | 2 +- client/PlanAIRClient/Properties/AssemblyInfo.cs | 4 ++-- client/PlanAIRClient/TrafficIDSelector.cs | 4 ++-- client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs | 1 + 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/client/AudioRecorder/MetadataSelectorForm.cs b/client/AudioRecorder/MetadataSelectorForm.cs index 09396f89..2547fe3f 100644 --- a/client/AudioRecorder/MetadataSelectorForm.cs +++ b/client/AudioRecorder/MetadataSelectorForm.cs @@ -83,7 +83,7 @@ namespace AudioRecorder { }; } - private void TrafficIDChangedEvent(string id, int variantID, string epizodeID, string text, List selected) { + private void TrafficIDChangedEvent(string id, int variantID, string serialID, string text, List selected) { if (id == null) SelectedMetadata = null; else { diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index d1189cb1..e14eb715 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -86,7 +86,7 @@ namespace DxPlay { } - private void OnSelectedIDChanged(string ID, int variantID, string epizodeID, string text, List selected) { + private void OnSelectedIDChanged(string ID, int variantID, string serialID, string text, List selected) { //logger.Info("Selected ID: " + ID); try { model.SelectedSegments = selected; diff --git a/client/Maestro/Configuration/editor-mv.json b/client/Maestro/Configuration/editor-mv.json index 6a1fcb20..5645a4dc 100644 --- a/client/Maestro/Configuration/editor-mv.json +++ b/client/Maestro/Configuration/editor-mv.json @@ -12,7 +12,7 @@ "$type": "UNCSource", "filter": "avi,wav,mxf,mts", "local": { - "address": "file://d:/!META_MXF", + "address": "file://d:/_video", "timeout": 1000 }, "remote": { diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 5e76f505..c6032a96 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -411,7 +411,7 @@ namespace Maestro { }; } - private void OnTrafficIDSelected(string id, int variantID, string epizodeID, string text, List selected) { + private void OnTrafficIDSelected(string id, int variantID, string serialID, string text, List selected) { btnRedefineSegments.Visible = false; if (id == null) { ArchiveMetadata = null; @@ -422,7 +422,7 @@ namespace Maestro { MetadataType metadataType = MetadataTypeUtil.Guess(id); SelectedMetadata = new MetadataInfo() { Kind = metadataType, - ID = btnUseEpisodeID.Checked ? epizodeID : id, + ID = btnUseEpisodeID.Checked ? serialID : id, MetadataText = text, VariantID = variantID, Selected = selected diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 6940efac..39d6e7ac 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.0.6")] -[assembly: AssemblyFileVersion("2.1.0.6")] +[assembly: AssemblyVersion("2.1.0.7")] +[assembly: AssemblyFileVersion("2.1.0.7")] diff --git a/client/MaestroShared/Metadata/Traffic.cs b/client/MaestroShared/Metadata/Traffic.cs index 7d939c14..3f079975 100644 --- a/client/MaestroShared/Metadata/Traffic.cs +++ b/client/MaestroShared/Metadata/Traffic.cs @@ -4,6 +4,7 @@ namespace MaestroShared.Metadata { public class TrafficItem { public bool Selected { get; set; } public string MediaID { get; set; } + public int SerialID { get; set; } public bool OK { get; set; } public string Title { get; set; } public DateTime? NextBroadcastDate { get; set; } diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 7f12ec86..207b1fe6 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.0.3")] -[assembly: AssemblyFileVersion("2.1.0.3")] +[assembly: AssemblyVersion("2.1.0.4")] +[assembly: AssemblyFileVersion("2.1.0.4")] diff --git a/client/MetadataSelector/MetadataIDSelector.cs b/client/MetadataSelector/MetadataIDSelector.cs index 737cbd6d..8bd2add0 100644 --- a/client/MetadataSelector/MetadataIDSelector.cs +++ b/client/MetadataSelector/MetadataIDSelector.cs @@ -141,7 +141,7 @@ namespace MaestroShared.Controls { textSelectedMetadata.Text = name; } - private void TrafficIDChangedEvent(string id, int variantID, string epizodeID, string text, List selected) { + private void TrafficIDChangedEvent(string id, int variantID, string serialID, string text, List selected) { octopusIDSelector.ClearSelection(); nativeOctopusIDSelector.ClearSelection(); ClearFreeMetadata(); diff --git a/client/PlanAIRClient/Properties/AssemblyInfo.cs b/client/PlanAIRClient/Properties/AssemblyInfo.cs index f1621051..7b96f724 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.1.1")] +[assembly: AssemblyFileVersion("1.0.1.1")] diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 9cc0cef2..253bbb36 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -11,7 +11,7 @@ using System.Text.RegularExpressions; using System.Windows.Forms; namespace TrafficClient { - public delegate void OnSelectedIDChanged(string ID, int variantID, string epizodeID, string text, List selected); + public delegate void OnSelectedIDChanged(string ID, int variantID, String serialID, string text, List selected); public partial class TrafficIDSelector : UserControl { public ITrafficAPI trafficAPI { get; private set; } @@ -182,7 +182,7 @@ namespace TrafficClient { if (selectedItems?.Count > 0) { btnNewVersion.Enabled = true; CreateVersionIfMissing(trafficItem); - IDChangedEvent?.Invoke(trafficItem.MediaID, trafficItem.VariantID, trafficItem.EpisodeID, trafficItem.Title, selectedItems); + IDChangedEvent?.Invoke(trafficItem.MediaID, trafficItem.VariantID, trafficItem.SerialID.ToString(), trafficItem.Title, selectedItems); } else { btnNewVersion.Enabled = false; IDChangedEvent?.Invoke(null, 0, null, null, null); diff --git a/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs b/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs index ee295355..d295bdc0 100644 --- a/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs +++ b/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs @@ -19,6 +19,7 @@ namespace TrafficClient.Workers { protected TrafficItem ToTrafficItem(PlanAirMaterialResult data) { var result = new TrafficItem() { + SerialID = data.v_ProgrammeID, MediaID = data.v_MediaID, EpisodeTitle = data.v_EpTitle, Title = data.v_ProgTitle, -- 2.54.0