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

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index 9e9bc46dee94ceb485ebeb64ba3817a83cee1d9f..f447898f7824e38a4468d55fd48ec08b76e3baba 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -425,8 +425,10 @@ namespace DxPlay {
                 if (isDisposed)\r
                     return;\r
                 logger.Debug("Dispose");\r
-                if (tcWorker != null)\r
+                if (tcWorker != null) { \r
                     tcWorker.CancelAsync();\r
+                }\r
+\r
                 GC.SuppressFinalize(this);\r
                 if (State != GraphState.Exiting) {\r
                     SetState(State = GraphState.Exiting);\r

diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs
index 0779c0c81e5586b0b4d38b4a20be9012b9b20992..f8be9c13fa35d94cf425e332e0e22a9eab786d70 100644 (file)
--- a/client/DxPlay/Model/DxPlayModel.cs
+++ b/client/DxPlay/Model/DxPlayModel.cs
@@ -36,17 +36,20 @@ namespace DxPlay.Model {
             this.settings = settings;\r
             IsSegmentEditorVisible = true.Equals(settings?.Player?.SegmentEditor);\r
             IsMenuVisible = true.Equals(settings?.IsStandalone);\r
+            multiSegment = true.Equals(settings?.Metadata?.MultiSegmentEnabled);\r
 \r
             Segments = new BindingList<MovieSegment>();\r
             if (settings.Segments != null) {\r
                 foreach (var segment in settings.Segments) {\r
-                    if (!segment.IsGhost)\r
-                        Segments.Add(segment);\r
+                    IsRedefineSegments = true;\r
+                    if (!string.IsNullOrEmpty(RedefineSegmentMediaID) && segment.MediaID != RedefineSegmentMediaID)\r
+                        throw new Exception("Különböző fájlokhoz tartozó szegmensek nem szerkeszthetőek egyszerre!");\r
+                    RedefineSegmentMediaID = segment.MediaID;\r
+                    Segments.Add(segment);\r
                 }\r
             }\r
                 \r
 \r
-            multiSegment = true.Equals(settings?.Metadata?.MultiSegmentEnabled);\r
             MessageBus.Subscribe<TrafficAPIMessage>(OnMessage);\r
 \r
         }\r
@@ -86,6 +89,7 @@ namespace DxPlay.Model {
 \r
 \r
         public bool IsRedefineSegments { get; set; }\r
+        public bool IsRedefineGhostSegment { get; set; }\r
 \r
         private bool isMenuVisible;\r
         public bool IsMenuVisible {\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 90b6e09ea6a0bd12a83c542f79c62461f5d1a02a..9b2d34cd2c7878a7e1f595dcef1bb43b7240904f 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -141,6 +141,11 @@ namespace DxPlay {
             playerControls.Duration.Text = Settings.Resource("LENGTH", Resources.LENGTH);\r
         }\r
 \r
+        private void CloseForm() {\r
+            m_play?.Dispose();\r
+            Close();\r
+        }\r
+\r
         private void Cueue() {\r
             m_play = null;\r
             try {\r
@@ -161,7 +166,7 @@ namespace DxPlay {
                 }\r
             } catch (Exception ce) {\r
                 MessageBox.Show("Az állomány nem tölthetõ be: " + ce.Message, "Open Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
-                Close();\r
+                CloseForm();\r
             }\r
         }\r
 \r
@@ -173,7 +178,7 @@ namespace DxPlay {
             }\r
         }\r
 \r
-        public void OpenFile(FileInfo fileInfo, bool redefineSegments) {\r
+        public void OpenFile(FileInfo fileInfo, bool redefine) {\r
             logger.Debug("Open {0}", fileInfo.FullName);\r
 \r
             if (m_play != null)\r
@@ -196,7 +201,7 @@ namespace DxPlay {
                     logger.Error(e);\r
                 }\r
             }\r
-            model.IsRedefineSegments = redefineSegments;\r
+            model.IsRedefineSegments = redefine;\r
 \r
 \r
             //for (int i = 0; i < 100; i++) {\r
@@ -432,7 +437,7 @@ namespace DxPlay {
                     if (m_play != null && m_play.IsFullscreen())\r
                         m_play.ToggleFullscreen();\r
                     else\r
-                        Close();\r
+                        CloseForm();\r
                     result = true;\r
                     break;\r
                 case Keys.Left:\r
@@ -568,11 +573,11 @@ namespace DxPlay {
 \r
         private void btnSave_Click(object sender, EventArgs e) {\r
             settings.Segments = model.Segments;\r
-            Close();\r
+            CloseForm();\r
         }\r
 \r
         private void btnCancel_Click(object sender, EventArgs e) {\r
-            Close();\r
+            CloseForm();\r
         }\r
     }\r
 }\r

diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs
index ef96d18f3c3708bb6b9984444e1fc2561dc15ebd..47ca1e7c4fad112e109681720e2354c8a7008880 100644 (file)
--- a/client/DxPlay/PlayerFormSegments.cs
+++ b/client/DxPlay/PlayerFormSegments.cs
@@ -16,7 +16,7 @@ namespace DxPlay {
                 TCOut = new Timecode(framesOut)\r
             };\r
 \r
-            if (model.IsRedefineSegments)\r
+            if (model.IsRedefineSegments || model.IsRedefineGhostSegment)\r
                 result.MediaID = model.RedefineSegmentMediaID;\r
 \r
             model.Segments.Add(result);\r

diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs
index 3e914ce20ea667057f0b2ee1cc54070daeee5f75..c5457f59b66e8f744a981ba23cb248d740c9c970 100644 (file)
--- a/client/DxPlay/Properties/AssemblyInfo.cs
+++ b/client/DxPlay/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers \r
 // by using the '*' as shown below:\r
 \r
-[assembly: AssemblyVersion("2.0.8.7")]\r
+[assembly: AssemblyVersion("2.0.8.8")]\r
 \r
 //\r
 // In order to sign your assembly you must specify a key to use. Refer to the \r
@@ -56,5 +56,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDelaySign(false)]\r
 [assembly: AssemblyKeyFile("")]\r
 [assembly: AssemblyKeyName("")]\r
-[assembly: AssemblyFileVersion("2.0.8.7")]\r
+[assembly: AssemblyFileVersion("2.0.8.8")]\r
 \r

diff --git a/client/Maestro/Configuration/editor.json b/client/Maestro/Configuration/editor.json
index dddcf810b4c7a6ad6df428f206392d3e55aad645..2024a0e457d54bab800c296899f1762b3aeeb451 100644 (file)
--- a/client/Maestro/Configuration/editor.json
+++ b/client/Maestro/Configuration/editor.json
@@ -49,7 +49,6 @@
                        "outputFormat": "%ID%",\r
                        "saveSegments": true,\r
                        "tag": "Adáskész",\r
-                       "reference": ["Archiválás"],\r
       "remote": {\r
         "address": "ftp://10.11.1.100/Promise/PROGRAM/TEST",\r
         "userName": "editor1",\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index e290c152170410b2177bf0c8032780b6e24de382..e3b0c4a38083e169c08adc1c52c317e4e73035f4 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -157,9 +157,6 @@ namespace Maestro {
             if (MovieSegments == null || MovieSegments.Count == 0)\r
                 MovieSegments = QuerySegments();\r
 \r
-            //redifine v nem\r
-            UpdateSegmentsAccessibility();\r
-\r
             if (MovieSegments == null)\r
                 MovieSegments = new BindingList<MovieSegment>();\r
             bool readOnly = true;\r
@@ -171,11 +168,21 @@ namespace Maestro {
                     readOnly = ArchiveMetadata.ok;\r
             } else\r
                 readOnly = ArchiveMetadata.ok;\r
+\r
+\r
             if (readOnly && !SelectedMetadata.IsRedefine) {\r
                 MsgBox.Warning("Az anyag már el van fogadva, a szegmens módosítás nem lehetséges.");\r
                 return;\r
             }\r
-            OpenFile(fileInfo, true, readOnly, !readOnly);\r
+\r
+            SelectedMetadata.IsRedefine = true;\r
+            redefine = true;\r
+\r
+            //redifine v nem\r
+            UpdateSegmentsAccessibility();\r
+\r
+            OpenFile(fileInfo, true, redefine);\r
+\r
             UpdateDefineSegmentsStatus();\r
             Cursor.Current = Cursors.Default;\r
         }\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 020e4f3332c9558c50f7ec8add56fe0d59468a33..32513b5b8fbb1be3567855ea4297843fe94c5a27 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -122,12 +122,12 @@ namespace Maestro {
                 if (fileSourceItem == null)\r
                     return;\r
                 dgSource.Enabled = false;\r
-                OpenFile(fileSourceItem.FileInfo, false, false, false);\r
+                OpenFile(fileSourceItem.FileInfo, false, false);\r
                 dgSource.Enabled = true;\r
             }\r
         }\r
 \r
-        private void OpenFile(FileInfo fileInfo, bool segmentEditor, bool readOnly, bool redefineSegments) {\r
+        private void OpenFile(FileInfo fileInfo, bool segmentEditor, bool redefine) {\r
             Cursor = Cursors.WaitCursor;\r
             try {\r
                 string[] extensions = Configuration.Player?.Extensions;\r
@@ -147,9 +147,11 @@ namespace Maestro {
                         Metadata = trafficIDSelector.Parameters.Configuration,\r
                         Segments = MovieSegments\r
                     };\r
-                    player.OpenFile(fileInfo, redefineSegments);\r
+                    player.OpenFile(fileInfo, redefine);\r
                     if (!player.IsDisposed)\r
                         player.ShowDialog();\r
+\r
+                    MovieSegments = player.Settings.Segments;\r
                 } else {\r
                     if (segmentEditor)\r
                         return;\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index f6952ada4c6918ba0c12b41bda177e6255a1f2dd..c29e19c2e0285b7d0b4424ec9de9ac181c7d3e4d 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.0.9.9")]\r
-[assembly: AssemblyFileVersion("2.0.9.9")]\r
+[assembly: AssemblyVersion("2.1.0.0")]\r
+[assembly: AssemblyFileVersion("2.1.0.0")]\r

diff --git a/client/PlanAIRClient/Properties/AssemblyInfo.cs b/client/PlanAIRClient/Properties/AssemblyInfo.cs
index 1068caa65c2b518c8014a593200704a1a5181227..f1621051a4de46f8ff1bc77beec01e5cb13561f3 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.0.9")]\r
-[assembly: AssemblyFileVersion("1.0.0.9")]\r
+[assembly: AssemblyVersion("1.0.1.0")]\r
+[assembly: AssemblyFileVersion("1.0.1.0")]\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 257871b5591918e2eec632a7717ea751317bb676..243fa401bdba4a62475860fa9a266f45ac9ca465 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -130,7 +130,7 @@ namespace TrafficClient {
 \r
                 //ha redefine volt, akkor minden modositott szegmens tartalmazza a fajlnevet\r
                 //ha define akkor az null, de a masodik szegmensnel mar az elsovel letrehozott fajlnev kell\r
-                if (!newSegment && actualSegment.SegID != 0)\r
+                if (!newSegment)\r
                     fileName = actualSegment.MediaID;\r
 \r
                 if (newSegment) {\r

diff --git a/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs b/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs
index 02828a0c5f44eab3147cbb5150422f50b8fb11b9..ee2953557861d2b93279e1ed372140b9340ab24c 100644 (file)
--- a/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs
+++ b/client/PlanAIRClient/Workers/SingleSegmentMaterialWorker.cs
@@ -220,6 +220,7 @@ namespace TrafficClient.Workers {
                 }\r
 \r
                 TryConnect();\r
+                \r
                 using (SqlCommand cmd = CreateCommmad()) {\r
                     cmd.CommandType = CommandType.StoredProcedure;\r
                     cmd.Parameters.AddWithValue("@Operation", SetMaterialOKID);\r