From 037e56fb3e26891045dfe8d504fd8fea44b56d09 Mon Sep 17 00:00:00 2001 From: "vasary.daniel" Date: Tue, 30 Nov 2021 14:27:49 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32396 --- client/DxPlay/PlayerForm.cs | 2 +- client/DxPlay/PlayerFormSegments.cs | 10 +++++----- client/DxPlay/Properties/AssemblyInfo.cs | 4 ++-- client/Maestro/Configuration/dev-local.json | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 0c9c3172..4186bd7b 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -32,7 +32,7 @@ namespace DxPlay { set { settings = value ?? throw new NullReferenceException("DxPlaySettings"); Model = new DxPlayModel(value); - segmentOffset = settings.Player.SegmentOffset; + //segmentOffset = settings.Player.SegmentOffset; } } diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs index bacd46a5..0bc1ba62 100644 --- a/client/DxPlay/PlayerFormSegments.cs +++ b/client/DxPlay/PlayerFormSegments.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace DxPlay { public partial class PlayerForm : Form { - private int segmentOffset = 0; + //private int segmentOffset = 0; private int AddSegment(int framesIn, int framesOut) { var result = new MovieSegment() { @@ -25,7 +25,7 @@ namespace DxPlay { } private int MovieLastFrame { - get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames + segmentOffset; + get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames; } private int MovieFirstFrame { @@ -33,7 +33,7 @@ namespace DxPlay { } private int MovieCurrentFrame { - get => m_play.CurrentTC.Frames + segmentOffset; + get => m_play.CurrentTC.Frames; } private MovieSegment GetLastSegment() { @@ -77,12 +77,12 @@ namespace DxPlay { return; MovieSegment lastSegment = GetLastSegment(); if (lastSegment == null) - bsSegments.Position = AddSegment(MovieFirstFrame + segmentOffset, MovieLastFrame); + bsSegments.Position = AddSegment(MovieFirstFrame, MovieLastFrame); else { if (lastSegment.TCOut.Frames == MovieLastFrame) MsgBox.Error(Settings.Resource("ERRORCREATESEGMENT", Resources.ERRORCREATESEGMENT)); else - bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1 + segmentOffset, MovieLastFrame); + bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1, MovieLastFrame); } } diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs index 4f1e9aa3..7f3672c2 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.1")] +[assembly: AssemblyVersion("2.1.0.2")] // // 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.1")] +[assembly: AssemblyFileVersion("2.1.0.2")] diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json index 8f8aa8c4..eb435371 100644 --- a/client/Maestro/Configuration/dev-local.json +++ b/client/Maestro/Configuration/dev-local.json @@ -5,10 +5,11 @@ "enableCustomMetadataId": true, "filter": "avi", "player": { + "rendererType": "VM9", "enabled": true, "autoStart": false, "segmentEditor": true, - "segmentOffset": 1 + "segmentOffset": -1 }, "source": { "$type": "UNCSource", -- 2.54.0