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

diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index 97c7aa1e8a135eb3489b96b50a42936a1e17ddc3..2f00b4fd0380707d87854f92b790ff1043d4498d 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -119,6 +119,13 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
     <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
+  <PropertyGroup>\r
+    <TargetZone>LocalIntranet</TargetZone>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <GenerateManifests>true</GenerateManifests>\r
+  </PropertyGroup>\r
+  <PropertyGroup />\r
   <ItemGroup>\r
     <Reference Include="DirectShowLib, Version=2.1.0.28167, Culture=neutral, processorArchitecture=MSIL">\r
       <SpecificVersion>False</SpecificVersion>\r
@@ -193,6 +200,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
     <None Include="packages.config" />\r
+    <None Include="Properties\app.manifest" />\r
     <None Include="Resources\lgs.jpg" />\r
     <None Include="Resources\Play.png" />\r
     <None Include="Resources\Stop.png" />\r

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index aadd6b527b97e87164146f31749b9c59cf16e51f..82c6fb514f22f916c927b9120efa8d4aac5137ef 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -204,7 +204,7 @@ namespace DxPlay {
 \r
         // Build the capture graph for grabber and renderer.</summary>\r
         // (Control to show video in, Filename to play)\r
-        private void SetupGraphLAV(Control hWin) {\r
+        private void SetupGraph(Control hWin) {\r
             int hr;\r
 \r
             m_videoWidth = MediaDescription.Resolution.Width;\r
@@ -280,7 +280,7 @@ namespace DxPlay {
 #endif\r
         }\r
 \r
-        private void SetupGraph(Control hWin) {\r
+        private void SetupGraphSONY(Control hWin) {\r
             int hr;\r
 \r
             m_videoWidth = MediaDescription.Resolution.Width;\r
@@ -300,7 +300,7 @@ namespace DxPlay {
                 hr = m_FilterGraph.AddSourceFilter(MediaDescription.FileName, MediaDescription.FileName, out sourceFilter);\r
                 DsError.ThrowExceptionForHR(hr);\r
 \r
-                //Type typeFromClsid = Type.GetTypeFromCLSID(new Guid("CCE7BD95-3BC4-4cfb-9664-0BF83201BE09"));\r
+                Type typeFromClsid = Type.GetTypeFromCLSID(new Guid("CCE7BD95-3BC4-4cfb-9664-0BF83201BE09"));\r
                 //IBaseFilter splitter = (IBaseFilter)Activator.CreateInstance(typeFromClsid);\r
 \r
                 IBaseFilter splitter = FilterGraphTools.AddFilterByName(graphBuilder, FilterCategory.LegacyAmFilterCategory, "Sony MXF Splitter");\r

diff --git a/client/DxPlay/Properties/app.manifest b/client/DxPlay/Properties/app.manifest
new file mode 100644 (file)
index 0000000..b29bef0
--- /dev/null
+++ b/client/DxPlay/Properties/app.manifest
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">\r
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />\r
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">\r
+    <security>\r
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">\r
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->\r
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />\r
+      </requestedPrivileges>\r
+      <applicationRequestMinimum>\r
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />\r
+        <defaultAssemblyRequest permissionSetReference="Custom" />\r
+      </applicationRequestMinimum>\r
+    </security>\r
+  </trustInfo>\r
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">\r
+    <application>\r
+      <!-- A list of the Windows versions that this application has been tested on and is
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected the most compatible environment. -->\r
+      <!-- Windows Vista -->\r
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->\r
+      <!-- Windows 7 -->\r
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->\r
+      <!-- Windows 8 -->\r
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->\r
+      <!-- Windows 8.1 -->\r
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->\r
+      <!-- Windows 10 -->\r
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->\r
+    </application>\r
+  </compatibility>\r
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->\r
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->\r
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->\r
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->\r
+</assembly>
\ No newline at end of file

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index b237afc2f19e98bbe0b7ea7f58df0dec77669482..24ddc1f252fb3593255c10bd8cf19c8c202234b3 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -15,6 +15,26 @@
     <SccAuxPath>SAK</SccAuxPath>\r
     <SccProvider>SAK</SccProvider>\r
     <TargetFrameworkProfile />\r
+    <IsWebBootstrapper>true</IsWebBootstrapper>\r
+    <PublishUrl>\\10.10.1.28\mclowres\www\clientinstall\</PublishUrl>\r
+    <Install>true</Install>\r
+    <InstallFrom>Web</InstallFrom>\r
+    <UpdateEnabled>true</UpdateEnabled>\r
+    <UpdateMode>Foreground</UpdateMode>\r
+    <UpdateInterval>7</UpdateInterval>\r
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
+    <UpdatePeriodically>false</UpdatePeriodically>\r
+    <UpdateRequired>false</UpdateRequired>\r
+    <MapFileExtensions>true</MapFileExtensions>\r
+    <InstallUrl>http://10.10.1.28:90/clientinstall/</InstallUrl>\r
+    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>\r
+    <WebPage>index.htm</WebPage>\r
+    <ApplicationRevision>3</ApplicationRevision>\r
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
+    <UseApplicationTrust>false</UseApplicationTrust>\r
+    <CreateDesktopShortcut>true</CreateDesktopShortcut>\r
+    <PublishWizardCompleted>true</PublishWizardCompleted>\r
+    <BootstrapperEnabled>true</BootstrapperEnabled>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <PlatformTarget>AnyCPU</PlatformTarget>\r
@@ -38,6 +58,22 @@
     <WarningLevel>4</WarningLevel>\r
     <Prefer32Bit>false</Prefer32Bit>\r
   </PropertyGroup>\r
+  <PropertyGroup>\r
+    <ManifestCertificateThumbprint>5183E3A0D9BEBC2F103A2C54F49D4EB6C155376A</ManifestCertificateThumbprint>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <ManifestKeyFile>Maestro_TemporaryKey.pfx</ManifestKeyFile>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <GenerateManifests>true</GenerateManifests>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <SignManifests>true</SignManifests>\r
+  </PropertyGroup>\r
+  <PropertyGroup />\r
+  <PropertyGroup>\r
+    <ApplicationIcon>Resources\mediacube_logo_small.ico</ApplicationIcon>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="FluentFTP, Version=17.5.8.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">\r
       <HintPath>..\packages\FluentFTP.17.5.8\lib\net45\FluentFTP.dll</HintPath>\r
@@ -191,6 +227,7 @@
     <Compile Include="MaestroForm.Source.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
+    <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
@@ -244,6 +281,17 @@
     <None Include="Resources\mediacube_logo_small.ico" />\r
     <Content Include="TODO.txt" />\r
   </ItemGroup>\r
-  <ItemGroup />\r
+  <ItemGroup>\r
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">\r
+      <Visible>False</Visible>\r
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>\r
+      <Install>true</Install>\r
+    </BootstrapperPackage>\r
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
+      <Visible>False</Visible>\r
+      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
+      <Install>false</Install>\r
+    </BootstrapperPackage>\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
 </Project>
\ No newline at end of file

diff --git a/client/Maestro/Maestro_TemporaryKey.pfx b/client/Maestro/Maestro_TemporaryKey.pfx
new file mode 100644 (file)
index 0000000..9584f61
Binary files /dev/null and b/client/Maestro/Maestro_TemporaryKey.pfx differ