From: Bellai Ádám Date: Mon, 16 Oct 2017 09:03:31 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=3f07d7b9d6c9deaca5efc48126660b68ed59d60b;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30623 --- diff --git a/client/AudioRecorder/MainForm.Designer.cs b/client/AudioRecorder/MainForm.Designer.cs index bc203166..b3ee30fc 100644 --- a/client/AudioRecorder/MainForm.Designer.cs +++ b/client/AudioRecorder/MainForm.Designer.cs @@ -209,6 +209,7 @@ namespace AudioRecorder { this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "MainForm"; this.Text = "AudioRecorder"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); diff --git a/client/AudioRecorder/MainForm.resx b/client/AudioRecorder/MainForm.resx index ec5dbe3a..b056c637 100644 --- a/client/AudioRecorder/MainForm.resx +++ b/client/AudioRecorder/MainForm.resx @@ -180,4 +180,63 @@ 162 + + + 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 + AA/8AAA//wAAf/+AAf//4Af///gf/w== + + \ No newline at end of file diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json index 2933e813..b880cea0 100644 --- a/client/Maestro/Configuration/configuration-studio.json +++ b/client/Maestro/Configuration/configuration-studio.json @@ -59,6 +59,7 @@ "processor": "UNCTargetProcessor", "outputFormat": "%ID%", "tag": "Archiválás", + "saveSegments" : true, "createMetadata": true, "remote": { "address": "file://10.10.1.100/BRAAVOS/ARCHIVE" diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 5b39281d..6aca8966 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -14,7 +14,7 @@ using JobEngineClient; namespace Maestro { public partial class MaestroForm { private MetadataInfo selectedMetadata; - private List segments = new List(); + private List segments; private MediaCubeApi mediaCubeApi; private ArchiveMetadata archiveMetadatamodel; private BindingList movieSegments; @@ -27,6 +27,7 @@ namespace Maestro { selectedMetadata = value; textSelectedMetadata.Text = selectedMetadata.ID; movieSegments = null; + segments = null; } } diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index 8fbc5258..f17730f0 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -10,6 +10,8 @@ using System.Text.RegularExpressions; using TrafficClient; using OctopusClient; using JobEngineClient; +using DxPlay; +using System.ComponentModel; namespace Maestro { @@ -50,40 +52,54 @@ namespace Maestro { Dock = DockStyle.Top }; checkBox.CheckStateChanged += (s, e) => { - if (checkBox.Checked) { - List processors = new List(); - foreach (DataGridViewRow actualRow in selectedRows) { - string fileName = actualRow.Cells[1].Value as string; - string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor); - Type type = Type.GetType(typeName); - ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName); - string id = selectedMetadata == null ? textSelectedMetadata.Text : selectedMetadata.ID; - TargetProcessorParameter processorParameter = new TargetProcessorParameter() { - ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadatamodel), - Client = trafficIDSelector.trafficAPI, - ID = id, - InputFileName = selectedFile.Name, - MediaCubeApi = mediaCubeApi, - Segments = new List(segments), - SourceConfig = Configuration.Source, - TargetConfig = target, - VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID - }; - object[] parameters = new object[] { this, processorParameter }; - ITargetProcessor processor = (ITargetProcessor)Activator.CreateInstance(type, parameters); - processors.Add(processor); - } - currentProcessors.Add(checkBox, processors); - } else - currentProcessors.Remove(checkBox); - btnExecute.Enabled = currentProcessors.Count > 0; + OnChecked(checkBox, target); }; - panelActions.Controls.Add(checkBox); + panelActions.Controls.Add(checkBox); panelActions.RowCount = panelActions.Controls.Count; } + private void OnChecked(object sender, Target target) { + CheckBox checkBox = sender as CheckBox; + if (checkBox == null) + return; + if (checkBox.Checked) { + List processors = new List(); + foreach (DataGridViewRow actualRow in selectedRows) { + string fileName = actualRow.Cells[1].Value as string; + string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor); + Type type = Type.GetType(typeName); + ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName); + string id = selectedMetadata == null ? textSelectedMetadata.Text : selectedMetadata.ID; + if (target.SaveSegments && segments == null) { + segments = trafficIDSelector.trafficAPI.GetSegments(selectedMetadata.VariantID); + if (segments == null) { + //todo error report küldés? + } + + } + TargetProcessorParameter processorParameter = new TargetProcessorParameter() { + ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadatamodel), + Client = trafficIDSelector.trafficAPI, + ID = id, + InputFileName = selectedFile.Name, + MediaCubeApi = mediaCubeApi, + Segments = new List(segments), + SourceConfig = Configuration.Source, + TargetConfig = target, + VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID + }; + object[] parameters = new object[] { this, processorParameter }; + ITargetProcessor processor = (ITargetProcessor)Activator.CreateInstance(type, parameters); + processors.Add(processor); + } + currentProcessors.Add(checkBox, processors); + } else + currentProcessors.Remove(checkBox); + btnExecute.Enabled = currentProcessors.Count > 0; + } + private ISourceItem GetSourceItemFromBindingSource(string actual) { ISourceItem result = null; foreach (ISourceItem actualSource in bindingSource) {