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

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 9650253a145fd3106d885af81fbf5bcd92aa7e8c..74ebab231df77086ff971c64ce9e88b2068d11cb 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -187,9 +187,6 @@
     <Compile Include="Controls\BindableToolStripMenuItem .cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="Controls\VideoSpeedTrackbar.cs">\r
-      <SubType>Component</SubType>\r
-    </Compile>\r
     <Compile Include="Controls\PlayerControls.cs">\r
       <SubType>UserControl</SubType>\r
     </Compile>\r

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index eb435371ed5f4d5a069cfb62f5bf2f9256fe7fa9..21be6281268f709edc60eb188fa41a585dec99b2 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -18,6 +18,12 @@
     "disableAutoRefresh": true,\r
     "local": {\r
       "address": "file://c:/data/video"\r
+    },\r
+    "remote": {\r
+      "address": "file://i:/ARCHIVE",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
     }\r
   },\r
   "metadatas": [\r