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

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 0c9c31722a54ea2551a8f8bec9549fb57ca15e1b..4186bd7b7645788c8f5c42b3e105f9787e1a0e14 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -32,7 +32,7 @@ namespace DxPlay {
             set {\r
                 settings = value ?? throw new NullReferenceException("DxPlaySettings");\r
                 Model = new DxPlayModel(value);\r
-                segmentOffset = settings.Player.SegmentOffset;\r
+                //segmentOffset = settings.Player.SegmentOffset;\r
             }\r
         }\r
 \r

diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs
index bacd46a521408911e06d77c3d067aafd75fc6ead..0bc1ba623c3996ce3cd8781840814ebfe18b4777 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
@@ -25,7 +25,7 @@ namespace DxPlay {
         }\r
 \r
         private int MovieLastFrame {\r
-            get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames + segmentOffset;\r
+            get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames;\r
         }\r
 \r
         private int MovieFirstFrame {\r
@@ -33,7 +33,7 @@ namespace DxPlay {
         }\r
 \r
         private int MovieCurrentFrame {\r
-            get => m_play.CurrentTC.Frames + segmentOffset;\r
+            get => m_play.CurrentTC.Frames;\r
         }\r
 \r
         private MovieSegment GetLastSegment() {\r
@@ -77,12 +77,12 @@ namespace DxPlay {
                 return;\r
             MovieSegment lastSegment = GetLastSegment();\r
             if (lastSegment == null)\r
-                bsSegments.Position = AddSegment(MovieFirstFrame + segmentOffset, MovieLastFrame);\r
+                bsSegments.Position = AddSegment(MovieFirstFrame, MovieLastFrame);\r
             else {\r
                 if (lastSegment.TCOut.Frames == MovieLastFrame)\r
                     MsgBox.Error(Settings.Resource("ERRORCREATESEGMENT", Resources.ERRORCREATESEGMENT));\r
                 else\r
-                    bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1 + segmentOffset, MovieLastFrame);\r
+                    bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1, MovieLastFrame);\r
             }\r
         }\r
 \r

diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs
index 4f1e9aa35914259422676986a664e496de00f396..7f3672c2e5a5371f9453ac49d3da3ff00ee2035f 100644 (file)
--- 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 \r
 // by using the '*' as shown below:\r
 \r
-[assembly: AssemblyVersion("2.1.0.1")]\r
+[assembly: AssemblyVersion("2.1.0.2")]\r
 \r
 //\r
 // In order to sign your assembly you must specify a key to use. Refer to the \r
@@ -56,5 +56,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDelaySign(false)]\r
 [assembly: AssemblyKeyFile("")]\r
 [assembly: AssemblyKeyName("")]\r
-[assembly: AssemblyFileVersion("2.1.0.1")]\r
+[assembly: AssemblyFileVersion("2.1.0.2")]\r
 \r

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index 8f8aa8c4cbab2402c38f3b60e7b3a60d5511a09e..eb435371ed5f4d5a069cfb62f5bf2f9256fe7fa9 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -5,10 +5,11 @@
   "enableCustomMetadataId": true,\r
   "filter": "avi",\r
   "player": {\r
+    "rendererType": "VM9",\r
     "enabled": true,\r
     "autoStart": false,\r
     "segmentEditor": true,\r
-    "segmentOffset": 1\r
+    "segmentOffset": -1\r
   },\r
   "source": {\r
     "$type": "UNCSource",\r