Merge pull request #38 from Azure/PremiumEncoderMarch2015

Update for Premium
Azure · Mar 5, 2015 · 1b6eaf8 · 1b6eaf8
2 parents 6319812 + c46c67f
commit 1b6eaf8
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 50 deletions.
diff --git a/AMSExplorer/App.config b/AMSExplorer/App.config
@@ -131,8 +131,8 @@
       <setting name="DefaultTokenDuration" serializeAs="String">
         <value>60</value>
       </setting>
-      <setting name="AMEPremiumWorkflowPrice" serializeAs="String">
-        <value>3.99</value>
+      <setting name="AMEPremiumWorkflowPreviewPrice" serializeAs="String">
+        <value>1.99</value>
       </setting>
     </AMSExplorer.Properties.Settings>
   </userSettings>

diff --git a/AMSExplorer/Program.cs b/AMSExplorer/Program.cs
@@ -601,7 +601,7 @@ public static TaskSizeAndPrice CalculateTaskSizeAndPrice(ITask task, CloudMediaC
                                 break;
                             case (Constants.AzureMediaEncoderPremiumWorkflow):
                                 // AME Premium Workflow Encoding task
-                                pricetask = lsizeoutputprocessed * (double)Properties.Settings.Default.AMEPremiumWorkflowPrice;
+                                pricetask = lsizeoutputprocessed * (double)Properties.Settings.Default.AMEPremiumWorkflowPreviewPrice;
                                 break;
                             case (Constants.WindowsAzureMediaEncoder):
                                 // WAME Encoding task

diff --git a/AMSExplorer/Properties/Settings.Designer.cs b/AMSExplorer/Properties/Settings.Designer.cs
diff --git a/AMSExplorer/Properties/Settings.settings b/AMSExplorer/Properties/Settings.settings
@@ -83,8 +83,8 @@
     <Setting Name="DefaultTokenDuration" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">60</Value>
     </Setting>
-    <Setting Name="AMEPremiumWorkflowPrice" Type="System.Decimal" Scope="User">
-      <Value Profile="(Default)">3.99</Value>
+    <Setting Name="AMEPremiumWorkflowPreviewPrice" Type="System.Decimal" Scope="User">
+      <Value Profile="(Default)">1.99</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/AMSExplorer/options.Designer.cs b/AMSExplorer/options.Designer.cs
diff --git a/AMSExplorer/options.cs b/AMSExplorer/options.cs
@@ -60,7 +60,7 @@ private void buttonOk_Click(object sender, EventArgs e)
             Properties.Settings.Default.DefaultLocatorDurationDays = (int)numericUpDownLocatorDuration.Value;
             Properties.Settings.Default.DefaultTokenDuration = (int)numericUpDownTokenDuration.Value;
             Properties.Settings.Default.AMEPrice = numericUpDownAMEPrice.Value;
-            Properties.Settings.Default.AMEPremiumWorkflowPrice = numericUpDownAMEPremiumWorkflowPrice.Value;
+            Properties.Settings.Default.AMEPremiumWorkflowPreviewPrice = numericUpDownAMEPremiumWorkflowPrice.Value;
             Properties.Settings.Default.LegacyEncodingPrice = numericUpDownLegacyEncodingPrice.Value;
             Properties.Settings.Default.IndexingPrice = numericUpDownIndexingPrice.Value;
             Properties.Settings.Default.Currency = textBoxCurrency.Text;
@@ -94,7 +94,7 @@ private void buttonReset_Click(object sender, EventArgs e)
             numericUpDownLocatorDuration.Value = 365;
             numericUpDownTokenDuration.Value = 60;
             numericUpDownAMEPrice.Value = ((decimal)1.99);
-            numericUpDownAMEPremiumWorkflowPrice.Value = ((decimal)3.99);
+            numericUpDownAMEPremiumWorkflowPrice.Value = ((decimal)1.99);
             numericUpDownLegacyEncodingPrice.Value = ((decimal)1.39);
             numericUpDownIndexingPrice.Value = ((decimal)10);
 
@@ -133,7 +133,7 @@ private void options_Load(object sender, EventArgs e)
 
             textBoxCurrency.Text = Properties.Settings.Default.Currency;
             numericUpDownAMEPrice.Value = Properties.Settings.Default.AMEPrice;
-            numericUpDownAMEPremiumWorkflowPrice.Value = Properties.Settings.Default.AMEPremiumWorkflowPrice;
+            numericUpDownAMEPremiumWorkflowPrice.Value = Properties.Settings.Default.AMEPremiumWorkflowPreviewPrice;
             numericUpDownLegacyEncodingPrice.Value = Properties.Settings.Default.LegacyEncodingPrice;
             numericUpDownIndexingPrice.Value = Properties.Settings.Default.IndexingPrice;
 

diff --git a/AMSExplorer/options.resx b/AMSExplorer/options.resx
@@ -120,9 +120,6 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>53</value>
   </metadata>