From: vasary.daniel <TFS\vasary.daniel>
Date: Thu, 2 Dec 2021 20:31:00 +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=b189873fc61284216cbd9248a5fa050011aca708;p=mediacube.git

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

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 4186bd7b..52e5b900 100644
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -32,7 +32,9 @@ namespace DxPlay {
             set {
                 settings = value ?? throw new NullReferenceException("DxPlaySettings");
                 Model = new DxPlayModel(value);
-                //segmentOffset = settings.Player.SegmentOffset;
+                //default 1 kell legyen: HTV uj szegmens = elozo szegmens vege + 1
+                //0: MV uj szegmens = elozo szegmens vege
+                segmentOffset = 1 - settings.Player.SegmentOffset;
             }
         }
 
diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx
index acfc813c..9a2c4936 100644
--- a/client/DxPlay/PlayerForm.resx
+++ b/client/DxPlay/PlayerForm.resx
@@ -173,7 +173,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo
-        CAAAAk1TRnQBSQFMAgEBAgEAAVgBAgFYAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAgFoAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs
index 0bc1ba62..d3ee9ac5 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() {
@@ -82,7 +82,7 @@ namespace DxPlay {
                 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 + segmentOffset, MovieLastFrame);
             }
         }
 
@@ -151,14 +151,14 @@ namespace DxPlay {
                 return;
             if (MovieCurrentFrame == currentSegment.TCOut.Frames)
                 return;
-            if (currentSegment.TCIn.Frames == MovieCurrentFrame - 1)
+            if (currentSegment.TCIn.Frames == MovieCurrentFrame - segmentOffset)
                 return;
             int position = model.Segments.IndexOf(currentSegment);
 
 
             MovieSegment newSegment = new MovieSegment() {
                 TCIn = new Timecode(currentSegment.TCIn.Frames),
-                TCOut = new Timecode(MovieCurrentFrame - 1),
+                TCOut = new Timecode(MovieCurrentFrame - segmentOffset),
             };
             if (model.IsRedefineSegments)
                 newSegment.MediaID = currentSegment.MediaID;