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

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 4186bd7b7645788c8f5c42b3e105f9787e1a0e14..52e5b900b9607556da1ae42a8bcb85a40afd8692 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -32,7 +32,9 @@ namespace DxPlay {
             set {\r
                 settings = value ?? throw new NullReferenceException("DxPlaySettings");\r
                 Model = new DxPlayModel(value);\r
-                //segmentOffset = settings.Player.SegmentOffset;\r
+                //default 1 kell legyen: HTV uj szegmens = elozo szegmens vege + 1\r
+                //0: MV uj szegmens = elozo szegmens vege\r
+                segmentOffset = 1 - settings.Player.SegmentOffset;\r
             }\r
         }\r
 \r

diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx
index acfc813cbd55c232f4a0ae93a65cfa58be70369b..9a2c493651db043466172da00be0b015975ec6d3 100644 (file)
--- a/client/DxPlay/PlayerForm.resx
+++ b/client/DxPlay/PlayerForm.resx
@@ -173,7 +173,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAVgBAgFYAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAgFoAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs
index 0bc1ba623c3996ce3cd8781840814ebfe18b4777..d3ee9ac53624754417ef4a983b962ece717f58e2 100644 (file)
--- a/client/DxPlay/PlayerFormSegments.cs
+++ b/client/DxPlay/PlayerFormSegments.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
 \r
 namespace DxPlay {\r
     public partial class PlayerForm : Form {\r
-        //private int segmentOffset = 0;\r
+        private int segmentOffset = 0;\r
 \r
         private int AddSegment(int framesIn, int framesOut) {\r
             var result = new MovieSegment() {\r
@@ -82,7 +82,7 @@ namespace DxPlay {
                 if (lastSegment.TCOut.Frames == MovieLastFrame)\r
                     MsgBox.Error(Settings.Resource("ERRORCREATESEGMENT", Resources.ERRORCREATESEGMENT));\r
                 else\r
-                    bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1, MovieLastFrame);\r
+                    bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + segmentOffset, MovieLastFrame);\r
             }\r
         }\r
 \r
@@ -151,14 +151,14 @@ namespace DxPlay {
                 return;\r
             if (MovieCurrentFrame == currentSegment.TCOut.Frames)\r
                 return;\r
-            if (currentSegment.TCIn.Frames == MovieCurrentFrame - 1)\r
+            if (currentSegment.TCIn.Frames == MovieCurrentFrame - segmentOffset)\r
                 return;\r
             int position = model.Segments.IndexOf(currentSegment);\r
 \r
 \r
             MovieSegment newSegment = new MovieSegment() {\r
                 TCIn = new Timecode(currentSegment.TCIn.Frames),\r
-                TCOut = new Timecode(MovieCurrentFrame - 1),\r
+                TCOut = new Timecode(MovieCurrentFrame - segmentOffset),\r
             };\r
             if (model.IsRedefineSegments)\r
                 newSegment.MediaID = currentSegment.MediaID;\r