From: vasary.daniel Date: Tue, 16 Nov 2021 19:54:35 +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=b33f32b36cd33e99578c65c5720150c324299142;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32350 --- diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index e14eb715..0c9c3172 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -32,6 +32,7 @@ namespace DxPlay { set { settings = value ?? throw new NullReferenceException("DxPlaySettings"); Model = new DxPlayModel(value); + segmentOffset = settings.Player.SegmentOffset; } } diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs index 47ca1e7c..bacd46a5 100644 --- a/client/DxPlay/PlayerFormSegments.cs +++ b/client/DxPlay/PlayerFormSegments.cs @@ -9,6 +9,7 @@ using System.Windows.Forms; namespace DxPlay { public partial class PlayerForm : Form { + private int segmentOffset = 0; private int AddSegment(int framesIn, int framesOut) { var result = new MovieSegment() { @@ -24,7 +25,7 @@ namespace DxPlay { } private int MovieLastFrame { - get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames; + get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames + segmentOffset; } private int MovieFirstFrame { @@ -32,7 +33,7 @@ namespace DxPlay { } private int MovieCurrentFrame { - get => m_play.CurrentTC.Frames; + get => m_play.CurrentTC.Frames + segmentOffset; } private MovieSegment GetLastSegment() { @@ -76,12 +77,12 @@ namespace DxPlay { return; MovieSegment lastSegment = GetLastSegment(); if (lastSegment == null) - bsSegments.Position = AddSegment(MovieFirstFrame, MovieLastFrame); + bsSegments.Position = AddSegment(MovieFirstFrame + segmentOffset, MovieLastFrame); else { if (lastSegment.TCOut.Frames == MovieLastFrame) MsgBox.Error(Settings.Resource("ERRORCREATESEGMENT", Resources.ERRORCREATESEGMENT)); else - bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1, MovieLastFrame); + bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1 + segmentOffset, MovieLastFrame); } } diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs index ac6abe2e..4f1e9aa3 100644 --- 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 // by using the '*' as shown below: -[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyVersion("2.1.0.1")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -56,5 +56,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] -[assembly: AssemblyFileVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.1")] diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json index 1a32df9b..8f8aa8c4 100644 --- a/client/Maestro/Configuration/dev-local.json +++ b/client/Maestro/Configuration/dev-local.json @@ -7,7 +7,8 @@ "player": { "enabled": true, "autoStart": false, - "segmentEditor": true + "segmentEditor": true, + "segmentOffset": 1 }, "source": { "$type": "UNCSource", @@ -15,10 +16,19 @@ "useAlternateCopy": true, "disableAutoRefresh": true, "local": { - "address": "file://e:/_video" + "address": "file://c:/data/video" } }, "metadatas": [ + { + "$type": "TrafficMetadata", + "server": { + "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;", + "userName": "MAM", + "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ", + "timeout": 1000 + } + } ], "targets": [ { diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index fe2c93ff..eb738811 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -273,7 +273,8 @@ namespace Maestro { Player = new Player { AutoStart = Configuration.Player.AutoStart, SegmentEditor = Configuration.Player.SegmentEditor && segmentEditor, - RendererType = Configuration.Player.RendererType + RendererType = Configuration.Player.RendererType, + SegmentOffset = Configuration.Player.SegmentOffset }, Metadata = trafficIDSelector.Parameters.Configuration, Segments = MovieSegments diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 685180fb..8e656c19 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.1.4")] -[assembly: AssemblyFileVersion("2.1.1.4")] +[assembly: AssemblyVersion("2.1.1.1")] +[assembly: AssemblyFileVersion("2.1.1.1")] diff --git a/client/MediaCubeApiTest/MediaCubeApiTest.vbproj.vspscc b/client/MediaCubeApiTest/MediaCubeApiTest.vbproj.vspscc new file mode 100644 index 00000000..feffdeca --- /dev/null +++ b/client/MediaCubeApiTest/MediaCubeApiTest.vbproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" +} diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 5b197a5d..7cde2157 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -70,7 +70,7 @@ org.reficio p2-maven-plugin - 1.5.0 + 1.7.0 default-cli