WinGui: Finished re-writing the user settings service to use xml file storage rather than built-in settings. Moved all the Services Library settings over to use the service. Main application will be done later.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4175 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 5 insertions, 5 deletions

diff --git a/win/CS/Functions/PresetLoader.cs b/win/CS/Functions/PresetLoader.cs
index 98ac0a0c5..195459201 100644
--- a/win/CS/Functions/PresetLoader.cs
+++ b/win/CS/Functions/PresetLoader.cs
@@ -307,7 +307,7 @@ namespace Handbrake.Functions
                     sliderValue = 32 - (int)value;

                     break;

                 case VideoEncoder.X264:

-                    double cqStep = UserSettingService.GetUserSettingDouble(UserSettingConstants.X264Step);

+                    double cqStep = UserSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);

                     sliderValue = (int)((51.0 / cqStep) - (value / cqStep));

                     break;

                 case VideoEncoder.Theora:

diff --git a/win/CS/Functions/QueryGenerator.cs b/win/CS/Functions/QueryGenerator.cs
index 7215be30e..782c4dcf9 100644
--- a/win/CS/Functions/QueryGenerator.cs
+++ b/win/CS/Functions/QueryGenerator.cs
@@ -131,7 +131,7 @@ namespace Handbrake.Functions
                 query += " -t " + titleInfo[0];

             }

 

-            if (!UserSettingService.GetUserSettingBoolean(UserSettingConstants.DisableLibDvdNav) && mainWindow.drop_angle.Items.Count != 0)

+            if (!UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav) && mainWindow.drop_angle.Items.Count != 0)

                 query += " --angle " + mainWindow.drop_angle.SelectedItem;

 

             // Decide what part of the video we want to encode.

@@ -337,7 +337,7 @@ namespace Handbrake.Functions
             // Video Quality Setting

             if (mainWindow.radio_cq.Checked)

             {

-                double cqStep = UserSettingService.GetUserSettingDouble(UserSettingConstants.X264Step);

+                double cqStep = UserSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);

                 double value;

                 switch (mainWindow.drp_videoEncoder.Text)

                 {

@@ -514,10 +514,10 @@ namespace Handbrake.Functions
             string query = string.Empty;

 

             // Verbosity Level

-            query += " --verbose=" + UserSettingService.GetUserSettingInt(UserSettingConstants.Verbosity);

+            query += " --verbose=" + UserSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity);

 

             // LibDVDNav

-            if (UserSettingService.GetUserSettingBoolean(UserSettingConstants.DisableLibDvdNav))

+            if (UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav))

                 query += " --no-dvdnav";

 

             return query;