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

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 9fb953a37055a9e0ce2ae8338df826d17cd87e41..73c4b65dfc797efaae27d928f66f628df040096a 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -314,9 +314,10 @@ namespace DxPlay {
 \r
         private void OnDefineOneSegmentClick(object sender, EventArgs e) {\r
             MovieSegment segment = new MovieSegment() {\r
-                TCIn = new Timecode(m_mediaDescription.FirstFrame),\r
+                TCIn = new Timecode(),\r
                 TCOut = new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration)\r
             };\r
+            segment.TCIn.Set(m_mediaDescription.FirstFrame.Frames);\r
             segments.Add(segment);\r
         }\r
 \r

diff --git a/client/IntegrationTests/PlanAIRTests.cs b/client/IntegrationTests/PlanAIRTests.cs
index f60f813e30a32e889de8a978cb35d2827fb5589c..c8a531b8101c8cf6aa1c386ca4f45b349d62e811 100644 (file)
--- a/client/IntegrationTests/PlanAIRTests.cs
+++ b/client/IntegrationTests/PlanAIRTests.cs
@@ -6,7 +6,9 @@ namespace IntegrationTests {
     [TestClass]\r
     public class PlanAIRTests {\r
 \r
-        private const string CONNECTION_STRING = "Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;";\r
+        \r
+        //"Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;";\r
+        private const string CONNECTION_STRING = "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;";\r
         private const string USER_NAME = "MAM";\r
         private const string PASSWORD = "Echotv.hu";\r
         private const int TIMEOUT = 5;\r
@@ -31,7 +33,7 @@ namespace IntegrationTests {
         [TestMethod]\r
         public void AddSegmentToKopiaTest() {\r
             //Fixture\r
-            Segment segment = new Segment() { Comment = "Test", Optional = true, TCIn = 1000, TCOut = 2000};\r
+            Segment segment = new Segment() { Comment = "Test", Optional = true, TCIn = 1000, TCOut = 2000 };\r
 \r
             //Fixture\r
             sut.AddSegmentToCopia(ITEM_ID, segment.Comment, segment.TCIn, segment.TCOut, segment.Optional);\r

diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs
index 1cdb6beccae5e45869fa2a172f9e8940da3b2842..fc295c9b56021006ee5b7734d207f77696d074d8 100644 (file)
--- a/client/Maestro/Sources/FileSystemSource.cs
+++ b/client/Maestro/Sources/FileSystemSource.cs
@@ -90,12 +90,12 @@ namespace Maestro.Sources {
                     if (!initialized)\r
                         InnerStartUp();\r
                 }\r
+                System.Threading.Thread.Sleep(1000);\r
             }\r
 \r
         }\r
 \r
         private void WatchedDirDeleted() {\r
-            //errorReporter?.Invoke(DateTime.Now, String.Format("[FileSystemSource] {0} path can't be found.", path), Color.Red);\r
             clearAndInitialize = new ClearAndInitialize(ClearDataGridView);\r
             clearAndInitialize?.Invoke();\r
         }\r
@@ -107,7 +107,6 @@ namespace Maestro.Sources {
                 );\r
             cache.Clear();\r
             initialized = false;\r
-            //todo errorreport küldése\r
         }\r
 \r
         private void SetAcceptableExtensions() {\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index d45ed5eaf81a6446f18bb0657b7d15634a359208..3518df12ba985670620158da293928541d01974a 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -83,6 +83,7 @@ namespace Maestro.Targets {
                 CreateMetadata();\r
             if (parameters.TargetConfig.SaveSegments && parameters.Segments != null)\r
                 SaveSegments();\r
+            parameters.Client.BroadcastOKForAir(parameters.VariantID);\r
         }\r
 \r
         private void SaveSegments() {\r