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

diff --git a/client/AudioRecorder/MainForm.Designer.cs b/client/AudioRecorder/MainForm.Designer.cs
index bc203166b05c68f4e73338aa7ad57ba5e5ecf7c1..b3ee30fc398369d72054c467ba82ed81626f808a 100644 (file)
--- a/client/AudioRecorder/MainForm.Designer.cs
+++ b/client/AudioRecorder/MainForm.Designer.cs
@@ -209,6 +209,7 @@ namespace AudioRecorder {
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox1);\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;\r
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.Name = "MainForm";\r
             this.Text = "AudioRecorder";\r
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);\r

diff --git a/client/AudioRecorder/MainForm.resx b/client/AudioRecorder/MainForm.resx
index ec5dbe3a154f8966561b3b74bd29bb04ba392615..b056c6376e2484a0cd9a17e0d19a403681eb74b4 100644 (file)
--- a/client/AudioRecorder/MainForm.resx
+++ b/client/AudioRecorder/MainForm.resx
@@ -180,4 +180,63 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>162</value>\r
   </metadata>\r
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARFBgtNUE3QVA4QlE0PEcVGBwB\r
+        AQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAICgwsND48RlZYY3R3hZp3hZpXY3U7RlYsMz4JCgwAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAUjKTE7RVVPWWucq8La4/Hf\r
+        183e18za4/GercRQW2w7RVUkKjMEBAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAABAQEYHCI5Q1JETl+EkqbS4PPd0bjDjTK5cwC6dADEji/e0LXU4vSGlKlFT2A6Q1Ma\r
+        HSMBAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOEBQzPUk+SFhteY3C0ujh\r
+        39bInFK4cgC5dAC8egC+ewC9dwC7dQDIm07h3tTE0+lve48+SVk1PUoPEhUAAAAAAAAAAAAAAAAAAAAA\r
+        AAAAAAAAAAAAAAAAAAAHCAorMj07RlZaZXesu9Th5+vRsXe5dwi5cgC9ewC/fQC/fQC/fAC/ewC7eAC4\r
+        cQC7eAbQr3Ph5uqwv9ZbZ3k7RlYsMz4HCQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAYHCE9R1dLVmeVo7rb\r
+        5vTezJ7Hjx29dwC9egDAfgDAfgC/fQC/fAC/fAC+ewC6dwC6dwC6dgC5cQC9gRrWv5rb5/SYp71MV2g9\r
+        R1caHiQAAAAAAAAAAAAAAAAAAAALDhI/Sllwe4/P3fHj28HQojnJiQDKjQDJjQDFhgDCgwDAgAC/fQC+\r
+        fAC+fAC8eQC5dgC5dwC6dwC7eAC7dgC2bwC/ijbd0r7R3/Jzf5I/SloMDxMAAAAAAAAAAAAODg8sNkNk\r
+        b4Lf6vvaumbJigDJiQDLjgDLjwDMkADHiQDGiADGhwDEhQDBgQC/fQC6dwC5dgC5dwC6dwC6dwC8eAC8\r
+        egC3cQCzbQDKo2Dg6vpnc4UsNkUQEBEAAAAAAAA4Oj0yPU2xwN3gyYzNjQDKjgDKjgDKjQDHiwDLjwDJ\r
+        jADFhwDGhwDHiADGhwDBgwC/fwC/fQC/fQC/fQC/fQC9ewC7egC+fQC7eAC2awDUtoS2xeAzPk48PkIA\r
+        AAAAAABQU1k+SVrO2fHUpzXNkgDMkQLKjADBiQekdw6teQDKjgDGiADGhwDGhwC7hAqebwusdADCgQDC\r
+        fgDBfwDAfQCzeg2YZgiqbwC/fQC6dADEjS7Q2/FAS1xTV10AAAAAAABRVVs/S1zP2e/YrUHOkgDNkwHI\r
+        jAPWzbbN1N+bcxbEiQDJjADFhgDFiQnX1MvGyc+YagvBgwDDgQC/ewC+ghPY2dy/vLuVYQS9fAC8dgDD\r
+        jCvQ2u5BTl9TV14AAAAAAABQVFk/SlvP2e7ctlTTnRLOlALKkQjd4eff7f+jgC3BhgDMjwDFhQDHkBjf\r
+        5/ra5f2ddBvChgDKjQDBfwDEkCrh7v/U3OyYZw28egC+eQDDjCzQ2u5BTV5TV10AAAAAAABQVFk/SlvP\r
+        2e7ctVPWoh7UnxXNlQvb3eDd6v+ifivAhQDNkQDHhwDGjhjf6P3a5v+qgBvIjADMkADGhwDIlSjg7P/S\r
+        2OaaaQy8egC+egDEjSzQ2u5BTV5TV10AAAAAAABQVFk/SlvP2e7ctlTVohzVoh7VqDLc4OPc6f+mhS/F\r
+        jgPRmQfNkgTJjQbZzrHUzLbBigfMkADMkADKiwDIlSjg6//S2eadbgzBggDCgADHkizQ2u5BTV5TV10A\r
+        AAAAAABQVFk/SlvP2e7btVPWoyHZrT3ZsUvd4ufb6f+oijLKmAbQnAnAjgGvfgCmdgGidAKhcAClcAC0\r
+        ewDFiQDLmSjg6//S2eacbgzChADGhQDOnCzQ2u5BTF5TV10AAAAAAABQVFk/SlvO2O3ctlnarkHbsUvZ\r
+        sUve4+nc6f+lhSq3hgC7m0DBtpDLy8PP0tbO0tbHx8K0qYyZejaVYwC3iiHh7P/S2eacbQzBgwDHhwDO\r
+        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\r
+        AA/8AAA//wAAf/+AAf//4Af///gf/w==\r
+</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json
index 2933e81373c347caef3ee457334de1b35992b665..b880cea0cdbda251345f71aa1a4d03ac6572fefc 100644 (file)
--- a/client/Maestro/Configuration/configuration-studio.json
+++ b/client/Maestro/Configuration/configuration-studio.json
@@ -59,6 +59,7 @@
       "processor": "UNCTargetProcessor",\r
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
+         "saveSegments" : true,\r
       "createMetadata": true,\r
       "remote": {\r
         "address": "file://10.10.1.100/BRAAVOS/ARCHIVE"\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 5b39281d13cc0d1a83954d087447b5469c175baf..6aca8966637b4f5b3236390b63a92f613c109c67 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -14,7 +14,7 @@ using JobEngineClient;
 namespace Maestro {\r
     public partial class MaestroForm {\r
         private MetadataInfo selectedMetadata;\r
-        private List<Segment> segments = new List<Segment>();\r
+        private List<Segment> segments;\r
         private MediaCubeApi mediaCubeApi;\r
         private ArchiveMetadata archiveMetadatamodel;\r
         private BindingList<MovieSegment> movieSegments;\r
@@ -27,6 +27,7 @@ namespace Maestro {
                 selectedMetadata = value;\r
                 textSelectedMetadata.Text = selectedMetadata.ID;\r
                 movieSegments = null;\r
+                segments = null;\r
             }\r
         }\r
 \r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index 8fbc5258aa15c1c8d4d82171c308042e1b2988b1..f17730f0bfe5b323c666deb18611687be41dd5cf 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -10,6 +10,8 @@ using System.Text.RegularExpressions;
 using TrafficClient;\r
 using OctopusClient;\r
 using JobEngineClient;\r
+using DxPlay;\r
+using System.ComponentModel;\r
 \r
 namespace Maestro {\r
 \r
@@ -50,40 +52,54 @@ namespace Maestro {
                 Dock = DockStyle.Top\r
             };\r
             checkBox.CheckStateChanged += (s, e) => {\r
-                if (checkBox.Checked) {\r
-                    List<ITargetProcessor> processors = new List<ITargetProcessor>();\r
-                    foreach (DataGridViewRow actualRow in selectedRows) {\r
-                        string fileName = actualRow.Cells[1].Value as string;\r
-                        string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor);\r
-                        Type type = Type.GetType(typeName);\r
-                        ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName);\r
-                        string id = selectedMetadata == null ? textSelectedMetadata.Text : selectedMetadata.ID;\r
-                        TargetProcessorParameter processorParameter = new TargetProcessorParameter() {\r
-                            ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadatamodel),\r
-                            Client = trafficIDSelector.trafficAPI,\r
-                            ID = id,\r
-                            InputFileName = selectedFile.Name,\r
-                            MediaCubeApi = mediaCubeApi,\r
-                            Segments = new List<Segment>(segments),\r
-                            SourceConfig = Configuration.Source,\r
-                            TargetConfig = target,\r
-                            VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID\r
-                        };\r
-                        object[] parameters = new object[] { this, processorParameter };\r
-                        ITargetProcessor processor = (ITargetProcessor)Activator.CreateInstance(type, parameters);\r
-                        processors.Add(processor);\r
-                    }\r
-                    currentProcessors.Add(checkBox, processors);\r
-                } else\r
-                    currentProcessors.Remove(checkBox);\r
-                btnExecute.Enabled = currentProcessors.Count > 0;\r
+                OnChecked(checkBox, target);\r
             };\r
 \r
-            panelActions.Controls.Add(checkBox);\r
+                panelActions.Controls.Add(checkBox);\r
             panelActions.RowCount = panelActions.Controls.Count;\r
 \r
         }\r
 \r
+        private void OnChecked(object sender, Target target) {\r
+            CheckBox checkBox = sender as CheckBox;\r
+            if (checkBox == null)\r
+                return;\r
+            if (checkBox.Checked) {\r
+                List<ITargetProcessor> processors = new List<ITargetProcessor>();\r
+                foreach (DataGridViewRow actualRow in selectedRows) {\r
+                    string fileName = actualRow.Cells[1].Value as string;\r
+                    string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor);\r
+                    Type type = Type.GetType(typeName);\r
+                    ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName);\r
+                    string id = selectedMetadata == null ? textSelectedMetadata.Text : selectedMetadata.ID;\r
+                    if (target.SaveSegments && segments == null) {\r
+                        segments = trafficIDSelector.trafficAPI.GetSegments(selectedMetadata.VariantID);\r
+                        if (segments == null) {\r
+                            //todo error report küldés?\r
+                        }\r
+\r
+                    }\r
+                    TargetProcessorParameter processorParameter = new TargetProcessorParameter() {\r
+                        ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadatamodel),\r
+                        Client = trafficIDSelector.trafficAPI,\r
+                        ID = id,\r
+                        InputFileName = selectedFile.Name,\r
+                        MediaCubeApi = mediaCubeApi,\r
+                        Segments = new List<Segment>(segments),\r
+                        SourceConfig = Configuration.Source,\r
+                        TargetConfig = target,\r
+                        VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID\r
+                    };\r
+                    object[] parameters = new object[] { this, processorParameter };\r
+                    ITargetProcessor processor = (ITargetProcessor)Activator.CreateInstance(type, parameters);\r
+                    processors.Add(processor);\r
+                }\r
+                currentProcessors.Add(checkBox, processors);\r
+            } else\r
+                currentProcessors.Remove(checkBox);\r
+            btnExecute.Enabled = currentProcessors.Count > 0;\r
+        }\r
+\r
         private ISourceItem GetSourceItemFromBindingSource(string actual) {\r
             ISourceItem result = null;\r
             foreach (ISourceItem actualSource in bindingSource) {\r