diff options
| author | sr55 <[email protected]> | 2012-04-01 17:32:36 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-04-01 17:32:36 +0000 |
| commit | d022a7b868b924b9edc32fe84555c4b21ceda89a (patch) | |
| tree | 9fcdd33bb62794f56bdc9726943894c06b6470bb /win/CS/HandBrake.ApplicationServices | |
| parent | 649939589305d92e9d6edf3c28955dfa37774722 (diff) | |
WinGui: (WPF) User Setting Service fixes, Query Generation fixes, Logviewer live updates.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4580 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
3 files changed, 16 insertions, 4 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/ServiceManager.cs b/win/CS/HandBrake.ApplicationServices/ServiceManager.cs index e0ad65ae5..fba0e99b9 100644 --- a/win/CS/HandBrake.ApplicationServices/ServiceManager.cs +++ b/win/CS/HandBrake.ApplicationServices/ServiceManager.cs @@ -1,5 +1,9 @@ namespace HandBrake.ApplicationServices
{
+ using System;
+
+ using Caliburn.Micro;
+
using HandBrake.ApplicationServices.Services;
using HandBrake.ApplicationServices.Services.Interfaces;
using HandBrake.Interop;
@@ -26,6 +30,15 @@ {
get
{
+ try
+ {
+ return IoC.Get<IUserSettingService>();
+ }
+ catch (NullReferenceException)
+ {
+ // Hack until this legacy code for the forms gui is removed!
+ }
+
return userSettingService ?? (userSettingService = new UserSettingService());
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs index bd93dc043..ea2794fe7 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs @@ -3,9 +3,6 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-using HandBrake.ApplicationServices.Model.Encoding;
-using HandBrake.ApplicationServices.Utilities;
-
namespace HandBrake.ApplicationServices.Services
{
using System;
@@ -21,6 +18,8 @@ namespace HandBrake.ApplicationServices.Services using HandBrake.ApplicationServices.Exceptions;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Services.Interfaces;
+ using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.ApplicationServices.Utilities;
/// <summary>
/// The preset service manages HandBrake's presets
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index bbcb9c4f7..5572f8cb2 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -872,7 +872,7 @@ namespace HandBrake.ApplicationServices.Utilities // Verbosity Level
int verbosity = UserSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
- query += string.Format(" --verbose= {0}", verbosity);
+ query += string.Format(" --verbose={0}", verbosity);
// LibDVDNav
if (UserSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
|