Merge pull request #40 from Azure/next-public-release

Next public release
Azure · Apr 30, 2015 · 313cc14 · 313cc14
2 parents b6d5780 + eea6c3b
commit 313cc14
Show file tree

Hide file tree

Showing 87 changed files with 8,107 additions and 2,476 deletions.
diff --git a/AMSExplorer/AMSExplorer.csproj b/AMSExplorer/AMSExplorer.csproj
@@ -88,13 +88,19 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.MediaServices.Client, Version=3.1.0.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.MediaServices.Client, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\windowsazure.mediaservices.3.1.0.2\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
+      <HintPath>..\packages\windowsazure.mediaservices.3.2.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Extensions, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer">
+      <HintPath>..\packages\windowsazure.mediaservices.3.2.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Common.FileEncryption">
+      <HintPath>..\packages\windowsazure.mediaservices.3.2.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Common.FileEncryption.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Extensions, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\windowsazure.mediaservices.extensions.3.1.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Extensions.dll</HintPath>
+      <HintPath>..\packages\windowsazure.mediaservices.extensions.3.2.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -146,6 +152,18 @@
     <Compile Include="AddDynamicEncryptionFrame2_AESKeyConfig.Designer.cs">
       <DependentUpon>AddDynamicEncryptionFrame2_AESKeyConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="ChannelRunOnPremisesEncoder.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ChannelRunOnPremisesEncoder.Designer.cs">
+      <DependentUpon>ChannelRunOnPremisesEncoder.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ChannelAdSlateControl.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ChannelAdSlateControl.Designer.cs">
+      <DependentUpon>ChannelAdSlateControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="CopyAsset.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -161,6 +179,12 @@
     <Compile Include="GridTransfer.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="IndexerOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IndexerOptions.Designer.cs">
+      <DependentUpon>IndexerOptions.cs</DependentUpon>
+    </Compile>
     <Compile Include="Splash.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -327,11 +351,11 @@
     <Compile Include="CreateLocator.Designer.cs">
       <DependentUpon>CreateLocator.cs</DependentUpon>
     </Compile>
-    <Compile Include="GenericProcessor.cs">
+    <Compile Include="MultipleProcessor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GenericProcessor.Designer.cs">
-      <DependentUpon>GenericProcessor.cs</DependentUpon>
+    <Compile Include="MultipleProcessor.Designer.cs">
+      <DependentUpon>MultipleProcessor.cs</DependentUpon>
     </Compile>
     <Compile Include="EncodingAMEAdv.cs">
       <SubType>Form</SubType>
@@ -401,12 +425,21 @@
     <EmbeddedResource Include="AddDynamicEncryptionFrame2_AESKeyConfig.resx">
       <DependentUpon>AddDynamicEncryptionFrame2_AESKeyConfig.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ChannelRunOnPremisesEncoder.resx">
+      <DependentUpon>ChannelRunOnPremisesEncoder.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ChannelAdSlateControl.resx">
+      <DependentUpon>ChannelAdSlateControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CopyAsset.resx">
       <DependentUpon>CopyAsset.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="CreateTestToken.resx">
       <DependentUpon>CreateTestToken.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="IndexerOptions.resx">
+      <DependentUpon>IndexerOptions.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Splash.resx">
       <DependentUpon>Splash.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -489,8 +522,8 @@
     <EmbeddedResource Include="CreateLocator.resx">
       <DependentUpon>CreateLocator.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GenericProcessor.resx">
-      <DependentUpon>GenericProcessor.cs</DependentUpon>
+    <EmbeddedResource Include="MultipleProcessor.resx">
+      <DependentUpon>MultipleProcessor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="EncodingAMEAdv.resx">
@@ -533,9 +566,6 @@
     <Content Include="BitmapsPNG\modetaskjob1.png" />
     <Content Include="BitmapsPNG\modetaskjob2.png" />
     <Content Include="BitmapsPNG\modetaskjob3.png" />
-    <Content Include="Configurations\PlayReadyCustomAttributes.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Configurations\CrossDomainPolicy.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -544,6 +574,7 @@
     </Content>
     <Content Include="Configurations\MediaIndexer.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <Content Include="Configurations\Thumbnails.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/AMSExplorer/AMSLogin.cs b/AMSExplorer/AMSLogin.cs
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------- 
 // <copyright file="AMSLogin.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 

diff --git a/AMSExplorer/AboutBox.cs b/AMSExplorer/AboutBox.cs
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------- 
 // <copyright file="AboutBox.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 

diff --git a/AMSExplorer/AddDynamicEncryptionFrame1.cs b/AMSExplorer/AddDynamicEncryptionFrame1.cs
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------- 
 // <copyright file="AddDynamicEncryptionFrame1.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 

diff --git a/AMSExplorer/AddDynamicEncryptionFrame2_AESKeyConfig.cs b/AMSExplorer/AddDynamicEncryptionFrame2_AESKeyConfig.cs
@@ -1,8 +1,8 @@
 
 //----------------------------------------------------------------------- 
-// <copyright file="AddDynamicEncryptionFrame3_AESKeyConfig.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
+// <copyright file="AddDynamicEncryptionFrame2_AESKeyConfig.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 

diff --git a/AMSExplorer/AddDynamicEncryptionFrame2_PlayReadyKeyConfig.cs b/AMSExplorer/AddDynamicEncryptionFrame2_PlayReadyKeyConfig.cs
@@ -1,8 +1,8 @@
 
 //----------------------------------------------------------------------- 
-// <copyright file="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
+// <copyright file="AddDynamicEncryptionFrame2_PlayReadyKeyConfig.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 

diff --git a/AMSExplorer/AddDynamicEncryptionFrame3.Designer.cs b/AMSExplorer/AddDynamicEncryptionFrame3.Designer.cs
diff --git a/AMSExplorer/AddDynamicEncryptionFrame3.cs b/AMSExplorer/AddDynamicEncryptionFrame3.cs
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------- 
-// <copyright file="AddDynamicEncryptionFrame2.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
+// <copyright file="AddDynamicEncryptionFrame3.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 
@@ -57,18 +57,18 @@ public ContentKeyRestrictionType GetKeyRestrictionType
         }
 
 
-        public Uri GetAudienceUri
+        public string GetAudience
         {
             get
             {
-                return new Uri(textBoxAudience.Text);
+                return textBoxAudience.Text;
             }
         }
-        public Uri GetIssuerUri
+        public string GetIssuer
         {
             get
             {
-                return new Uri(textBoxIssuer.Text);
+                return textBoxIssuer.Text;
             }
         }
 

diff --git a/AMSExplorer/AddDynamicEncryptionFrame4_PlayReadyLicense.cs b/AMSExplorer/AddDynamicEncryptionFrame4_PlayReadyLicense.cs
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------- 
 // <copyright file="AddDynamicEncryptionFrame4_PlayReadyLicense.cs" company="Microsoft">Copyright (c) Microsoft Corporation. All rights reserved.</copyright> 
 // <license>
-// Azure Media Services Explorer Ver. 3.1
+// Azure Media Services Explorer Ver. 3.2
 // Licensed under the Apache License, Version 2.0 (the "License"); 
 // you may not use this file except in compliance with the License. 
 // You may obtain a copy of the License at 

diff --git a/AMSExplorer/App.config b/AMSExplorer/App.config
@@ -15,7 +15,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.MediaServices.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.2" newVersion="3.1.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -134,6 +134,18 @@
       <setting name="AMEPremiumWorkflowPreviewPrice" serializeAs="String">
         <value>1.99</value>
       </setting>
+      <setting name="ffmpegPath" serializeAs="String">
+        <value>%programfiles32%\ffmpeg\bin</value>
+      </setting>
+      <setting name="VLCPath" serializeAs="String">
+        <value>%programfiles32%\VideoLAN\VLC</value>
+      </setting>
+      <setting name="DirectShowAudioDevice" serializeAs="String">
+        <value>Microphone (High Definition Audio Device)</value>
+      </setting>
+      <setting name="DirectShowVideoDevice" serializeAs="String">
+        <value>Webcam (High Definition Audio Device)</value>
+      </setting>
     </AMSExplorer.Properties.Settings>
   </userSettings>
 </configuration>