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

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

diff --git a/client/DxPlay/PlayerFormSegments.cs b/client/DxPlay/PlayerFormSegments.cs
index 47ca1e7c4fad112e109681720e2354c8a7008880..bacd46a521408911e06d77c3d067aafd75fc6ead 100644 (file)
--- a/client/DxPlay/PlayerFormSegments.cs
+++ b/client/DxPlay/PlayerFormSegments.cs
@@ -9,6 +9,7 @@ using System.Windows.Forms;
 \r
 namespace DxPlay {\r
     public partial class PlayerForm : Form {\r
+        private int segmentOffset = 0;\r
 \r
         private int AddSegment(int framesIn, int framesOut) {\r
             var result = new MovieSegment() {\r
@@ -24,7 +25,7 @@ namespace DxPlay {
         }\r
 \r
         private int MovieLastFrame {\r
-            get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames;\r
+            get => new Timecode(m_mediaDescription.FirstFrame, m_mediaDescription.Duration).Frames + segmentOffset;\r
         }\r
 \r
         private int MovieFirstFrame {\r
@@ -32,7 +33,7 @@ namespace DxPlay {
         }\r
 \r
         private int MovieCurrentFrame {\r
-            get => m_play.CurrentTC.Frames;\r
+            get => m_play.CurrentTC.Frames + segmentOffset;\r
         }\r
 \r
         private MovieSegment GetLastSegment() {\r
@@ -76,12 +77,12 @@ namespace DxPlay {
                 return;\r
             MovieSegment lastSegment = GetLastSegment();\r
             if (lastSegment == null)\r
-                bsSegments.Position = AddSegment(MovieFirstFrame, MovieLastFrame);\r
+                bsSegments.Position = AddSegment(MovieFirstFrame + segmentOffset, 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, MovieLastFrame);\r
+                    bsSegments.Position = AddSegment(lastSegment.TCOut.Frames + 1 + segmentOffset, MovieLastFrame);\r
             }\r
         }\r
 \r

diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs
index ac6abe2ead81d647cf2e68b8b7180f203b464df6..4f1e9aa35914259422676986a664e496de00f396 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.0")]\r
+[assembly: AssemblyVersion("2.1.0.1")]\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.0")]\r
+[assembly: AssemblyFileVersion("2.1.0.1")]\r
 \r

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index 1a32df9b06a04414bf70bf7e2df3caeb60b55225..8f8aa8c4cbab2402c38f3b60e7b3a60d5511a09e 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -7,7 +7,8 @@
   "player": {\r
     "enabled": true,\r
     "autoStart": false,\r
-    "segmentEditor": true\r
+    "segmentEditor": true,\r
+    "segmentOffset": 1\r
   },\r
   "source": {\r
     "$type": "UNCSource",\r
@@ -15,10 +16,19 @@
     "useAlternateCopy": true,\r
     "disableAutoRefresh": true,\r
     "local": {\r
-      "address": "file://e:/_video"\r
+      "address": "file://c:/data/video"\r
     }\r
   },\r
   "metadatas": [\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "timeout": 1000\r
+      }\r
+    }\r
   ],\r
   "targets": [\r
     {\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index fe2c93ffbbd359df371c8be255711ea1b014b33a..eb7388110d48e2d5533aa3e641d2a9f68d6ae728 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -273,7 +273,8 @@ namespace Maestro {
                         Player = new Player {\r
                             AutoStart = Configuration.Player.AutoStart,\r
                             SegmentEditor = Configuration.Player.SegmentEditor && segmentEditor,\r
-                            RendererType = Configuration.Player.RendererType\r
+                            RendererType = Configuration.Player.RendererType,\r
+                            SegmentOffset = Configuration.Player.SegmentOffset\r
                         },\r
                         Metadata = trafficIDSelector.Parameters.Configuration,\r
                         Segments = MovieSegments\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index 685180fbba81adeac06fdc1e35ada79f275e7aaf..8e656c191f2b761608be203a2b3f8ae5ef4708a9 100644 (file)
--- 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\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.1.1.4")]\r
-[assembly: AssemblyFileVersion("2.1.1.4")]\r
+[assembly: AssemblyVersion("2.1.1.1")]\r
+[assembly: AssemblyFileVersion("2.1.1.1")]\r

diff --git a/client/MediaCubeApiTest/MediaCubeApiTest.vbproj.vspscc b/client/MediaCubeApiTest/MediaCubeApiTest.vbproj.vspscc
new file mode 100644 (file)
index 0000000..feffdec
--- /dev/null
+++ b/client/MediaCubeApiTest/MediaCubeApiTest.vbproj.vspscc
@@ -0,0 +1,10 @@
+""\r
+{\r
+"FILE_VERSION" = "9237"\r
+"ENLISTMENT_CHOICE" = "NEVER"\r
+"PROJECT_FILE_RELATIVE_PATH" = ""\r
+"NUMBER_OF_EXCLUDED_FILES" = "0"\r
+"ORIGINAL_PROJECT_FILE_PATH" = ""\r
+"NUMBER_OF_NESTED_PROJECTS" = "0"\r
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"\r
+}\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 5b197a5daeb5cc34165a3bf51eb36b0a43944326..7cde21574270ccb4f3fa45ae6e5d2dc8872a3d98 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -70,7 +70,7 @@
                        <plugin>\r
                                <groupId>org.reficio</groupId>\r
                                <artifactId>p2-maven-plugin</artifactId>\r
-                               <version>1.5.0</version>\r
+                               <version>1.7.0</version>\r
                                <executions>\r
                                        <execution>\r
                                                <id>default-cli</id>\r