From 26649def33eddbcc544bb0af13b647456dd45f24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bellai=20=C3=81d=C3=A1m?= Date: Wed, 11 Oct 2017 09:59:10 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30584 --- client/DxPlay/PlayerForm.cs | 3 ++- client/IntegrationTests/PlanAIRTests.cs | 6 ++++-- client/Maestro/Sources/FileSystemSource.cs | 3 +-- client/Maestro/Targets/UNCTargetProcessor.cs | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 9fb953a3..73c4b65d 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -314,9 +314,10 @@ namespace DxPlay { private void OnDefineOneSegmentClick(object sender, EventArgs e) { MovieSegment segment = new MovieSegment() { - TCIn = new Timecode(m_mediaDescription.FirstFrame), + TCIn = new Timecode(), TCOut = new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration) }; + segment.TCIn.Set(m_mediaDescription.FirstFrame.Frames); segments.Add(segment); } diff --git a/client/IntegrationTests/PlanAIRTests.cs b/client/IntegrationTests/PlanAIRTests.cs index f60f813e..c8a531b8 100644 --- a/client/IntegrationTests/PlanAIRTests.cs +++ b/client/IntegrationTests/PlanAIRTests.cs @@ -6,7 +6,9 @@ namespace IntegrationTests { [TestClass] public class PlanAIRTests { - private const string CONNECTION_STRING = "Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;"; + + //"Data Source=folkloredb.hu\\sql08,33860;Initial Catalog=CLArchiveTF_0;Persist Security Info=True;"; + private const string CONNECTION_STRING = "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;"; private const string USER_NAME = "MAM"; private const string PASSWORD = "Echotv.hu"; private const int TIMEOUT = 5; @@ -31,7 +33,7 @@ namespace IntegrationTests { [TestMethod] public void AddSegmentToKopiaTest() { //Fixture - Segment segment = new Segment() { Comment = "Test", Optional = true, TCIn = 1000, TCOut = 2000}; + Segment segment = new Segment() { Comment = "Test", Optional = true, TCIn = 1000, TCOut = 2000 }; //Fixture sut.AddSegmentToCopia(ITEM_ID, segment.Comment, segment.TCIn, segment.TCOut, segment.Optional); diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs index 1cdb6bec..fc295c9b 100644 --- a/client/Maestro/Sources/FileSystemSource.cs +++ b/client/Maestro/Sources/FileSystemSource.cs @@ -90,12 +90,12 @@ namespace Maestro.Sources { if (!initialized) InnerStartUp(); } + System.Threading.Thread.Sleep(1000); } } private void WatchedDirDeleted() { - //errorReporter?.Invoke(DateTime.Now, String.Format("[FileSystemSource] {0} path can't be found.", path), Color.Red); clearAndInitialize = new ClearAndInitialize(ClearDataGridView); clearAndInitialize?.Invoke(); } @@ -107,7 +107,6 @@ namespace Maestro.Sources { ); cache.Clear(); initialized = false; - //todo errorreport küldése } private void SetAcceptableExtensions() { diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs index d45ed5ea..3518df12 100644 --- a/client/Maestro/Targets/UNCTargetProcessor.cs +++ b/client/Maestro/Targets/UNCTargetProcessor.cs @@ -83,6 +83,7 @@ namespace Maestro.Targets { CreateMetadata(); if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) SaveSegments(); + parameters.Client.BroadcastOKForAir(parameters.VariantID); } private void SaveSegments() { -- 2.54.0