From 374164948a157328d1a9f05637aa6b284a0a3e41 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Tue, 7 Feb 2012 21:01:08 +0000
Subject: WinGui: Switch to use .i686 and .x86_64 xml appcast files.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4441 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../Services/UserSettingService.cs                           |  4 ++--
 win/CS/UserSettingConstants.cs                               |  4 ++--
 win/CS/defaultsettings.xml                                   |  8 ++++----
 win/CS/frmMain.cs                                            | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs b/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
index ead389a5d..d8e537bdc 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
@@ -184,8 +184,8 @@ namespace HandBrake.ApplicationServices.Services
             userSettings["skipversion"] = 0;
             userSettings["autoNaming"] = true;
             userSettings["autoNamePath"] = string.Empty;
-            userSettings["appcast"] = "http://handbrake.fr/appcast.xml";
-            userSettings["appcast_unstable"] = "http://handbrake.fr/appcast_unstable.xml";
+            userSettings["appcast_i686"] = "http://handbrake.fr/appcast.i386.xml";
+            userSettings["appcast_x64"] = "http://handbrake.fr/appcast_unstable.x86_64.xml";
             userSettings["autoNameFormat"] = "{source}-{title}";
             userSettings["VLC_Path"] = "C:\\Program Files\\VideoLAN\\vlc\\vlc.exe";
             userSettings["MainWindowMinimize"] = true;
diff --git a/win/CS/UserSettingConstants.cs b/win/CS/UserSettingConstants.cs
index 164d06a6f..02c417eb7 100644
--- a/win/CS/UserSettingConstants.cs
+++ b/win/CS/UserSettingConstants.cs
@@ -15,8 +15,8 @@ namespace Handbrake
         public const string Skipversion = "skipversion";
         public const string AutoNaming = "autoNaming";
         public const string AutoNamePath = "autoNamePath";
-        public const string Appcast = "appcast";
-        public const string Appcast_unstable = "appcast_unstable";
+        public const string Appcast_i686 = "appcast_i686";
+        public const string Appcast_x64 = "appcast_x64";
         public const string AutoNameFormat = "autoNameFormat";
         public const string VLC_Path = "VLC_Path";
         public const string MainWindowMinimize = "MainWindowMinimize";
diff --git a/win/CS/defaultsettings.xml b/win/CS/defaultsettings.xml
index eeaa60865..9c2376948 100644
--- a/win/CS/defaultsettings.xml
+++ b/win/CS/defaultsettings.xml
@@ -170,18 +170,18 @@
   </item>
   <item>
     <key>
-      <string>appcast</string>
+      <string>appcast_i686</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast.xml</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast.i386.xml</anyType>
     </value>
   </item>
   <item>
     <key>
-      <string>appcast_unstable</string>
+      <string>appcast_x64</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast_unstable.xml</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast_unstable.x86_64.xml</anyType>
     </value>
   </item>
   <item>
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 6e74c96cb..5ecc41f87 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -156,9 +156,9 @@ namespace Handbrake
                 {
                     // Set when the last update was
                     this.userSettingService.SetUserSetting(UserSettingConstants.LastUpdateCheckDate, DateTime.Now);
-                    string url = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild).ToString().EndsWith("1")
-                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_unstable)
-                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast);
+                    string url = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakePlatform).Contains("x86_64")
+                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_x64)
+                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_i686);
                     UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDone), false, url, userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),
                         userSettingService.GetUserSetting<int>(UserSettingConstants.Skipversion), userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion));
                 }
@@ -463,9 +463,9 @@ namespace Handbrake
         {
             lbl_updateCheck.Visible = true;
             this.userSettingService.SetUserSetting(UserSettingConstants.LastUpdateCheckDate, DateTime.Now);
-            string url = userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild).ToString().EndsWith("1")
-                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_unstable)
-                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast);
+            string url = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakePlatform).Contains("x86_64")
+                                                  ? userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_x64)
+                                                  : userSettingService.GetUserSetting<string>(UserSettingConstants.Appcast_i686);
             UpdateService.BeginCheckForUpdates(new AsyncCallback(UpdateCheckDoneMenu), false,
                 url, userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild), 
                 userSettingService.GetUserSetting<int>(UserSettingConstants.Skipversion), userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion));
-- 
cgit v1.2.3