summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj6
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs3
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs3
-rw-r--r--win/CS/HandBrakeWPF/HandBrakeWPF.csproj6
-rw-r--r--win/CS/HandBrakeWPF/Helpers/LogManager.cs6
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs4
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs7
-rw-r--r--win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs (renamed from win/CS/HandBrake.ApplicationServices/Services/Logging/EventArgs/LogEventArgs.cs)4
-rw-r--r--win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs (renamed from win/CS/HandBrake.ApplicationServices/Services/Logging/Interfaces/ILog.cs)9
-rw-r--r--win/CS/HandBrakeWPF/Services/Logging/LogService.cs (renamed from win/CS/HandBrake.ApplicationServices/Services/Logging/LogService.cs)11
-rw-r--r--win/CS/HandBrakeWPF/Services/Logging/Model/LogLevel.cs (renamed from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogLevel.cs)84
-rw-r--r--win/CS/HandBrakeWPF/Services/Logging/Model/LogMessage.cs (renamed from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessage.cs)122
-rw-r--r--win/CS/HandBrakeWPF/Services/Logging/Model/LogMessageType.cs (renamed from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessageType.cs)44
-rw-r--r--win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs5
-rw-r--r--win/CS/HandBrakeWPF/Services/Scan/LibScan.cs7
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs9
-rw-r--r--win/CS/HandBrakeWPF/Views/LogView.xaml.cs3
17 files changed, 167 insertions, 166 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 79abb281c..c68770b8e 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -156,12 +156,6 @@
<Compile Include="Interop\Model\VideoQualityLimits.cs" />
<Compile Include="Model\HBConfiguration.cs" />
<Compile Include="Model\VideoScaler.cs" />
- <Compile Include="Services\Logging\EventArgs\LogEventArgs.cs" />
- <Compile Include="Services\Logging\Interfaces\ILog.cs" />
- <Compile Include="Services\Logging\LogService.cs" />
- <Compile Include="Services\Logging\Model\LogLevel.cs" />
- <Compile Include="Services\Logging\Model\LogMessage.cs" />
- <Compile Include="Services\Logging\Model\LogMessageType.cs" />
<Compile Include="Utilities\SystemInfo.cs" />
<Compile Include="Utilities\VersionHelper.cs" />
<Compile Include="Properties\Resources.Designer.cs">
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index f94c6fe24..7fe52a899 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -27,9 +27,6 @@ namespace HandBrake.ApplicationServices.Interop
using HandBrake.ApplicationServices.Interop.Json.State;
using HandBrake.ApplicationServices.Interop.Model.Encoding;
using HandBrake.ApplicationServices.Interop.Model.Preview;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
- using HandBrake.ApplicationServices.Services.Logging.Model;
using Newtonsoft.Json;
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
index b16300fb4..a30f43133 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
@@ -17,9 +17,6 @@ namespace HandBrake.ApplicationServices.Interop
using HandBrake.ApplicationServices.Interop.HbLib;
using HandBrake.ApplicationServices.Interop.Json.Anamorphic;
using HandBrake.ApplicationServices.Interop.Json.Shared;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
- using HandBrake.ApplicationServices.Services.Logging.Model;
using Newtonsoft.Json;
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index cd1fdcfa2..4757f7eec 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -209,6 +209,12 @@
<Compile Include="Services\Encode\Model\Models\Video\VideoProfile.cs" />
<Compile Include="Services\Encode\Model\Models\Video\VideoTune.cs" />
<Compile Include="Services\Interfaces\INotifyIconService.cs" />
+ <Compile Include="Services\Logging\EventArgs\LogEventArgs.cs" />
+ <Compile Include="Services\Logging\Interfaces\ILog.cs" />
+ <Compile Include="Services\Logging\LogService.cs" />
+ <Compile Include="Services\Logging\Model\LogLevel.cs" />
+ <Compile Include="Services\Logging\Model\LogMessage.cs" />
+ <Compile Include="Services\Logging\Model\LogMessageType.cs" />
<Compile Include="Services\Presets\Factories\JsonPresetFactory.cs" />
<Compile Include="Services\Presets\Interfaces\IPresetObject.cs" />
<Compile Include="Services\Presets\Model\PresetDisplayCategory.cs" />
diff --git a/win/CS/HandBrakeWPF/Helpers/LogManager.cs b/win/CS/HandBrakeWPF/Helpers/LogManager.cs
index 2cd94a25d..ec1c11ffc 100644
--- a/win/CS/HandBrakeWPF/Helpers/LogManager.cs
+++ b/win/CS/HandBrakeWPF/Helpers/LogManager.cs
@@ -9,15 +9,15 @@
namespace HandBrakeWPF.Helpers
{
- using System;
using System.IO;
using HandBrake.ApplicationServices.Interop;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
using HandBrakeWPF.Utilities;
+ using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using LogService = HandBrakeWPF.Services.Logging.LogService;
+
/// <summary>
/// Tempory Class to Initialise the logging.
/// </summary>
diff --git a/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs b/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
index e3a807cf9..ffc33113f 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
@@ -15,8 +15,6 @@ namespace HandBrakeWPF.Services.Encode
using System.IO;
using HandBrake.ApplicationServices.Model;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
using HandBrakeWPF.Utilities;
@@ -26,6 +24,8 @@ namespace HandBrakeWPF.Services.Encode
using EncodeProgressEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeProgressEventArgs;
using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
+ using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using LogService = HandBrakeWPF.Services.Logging.LogService;
/// <summary>
/// A Base Class for the Encode Services.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
index b6b811454..02a361ba6 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
@@ -18,9 +18,6 @@ namespace HandBrakeWPF.Services.Encode
using HandBrake.ApplicationServices.Interop.Interfaces;
using HandBrake.ApplicationServices.Interop.Json.State;
using HandBrake.ApplicationServices.Model;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
- using HandBrake.ApplicationServices.Services.Logging.Model;
using HandBrakeWPF.Exceptions;
using HandBrakeWPF.Properties;
@@ -28,6 +25,10 @@ namespace HandBrakeWPF.Services.Encode
using EncodeTask = Model.EncodeTask;
using IEncode = Interfaces.IEncode;
+ using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using LogLevel = HandBrakeWPF.Services.Logging.Model.LogLevel;
+ using LogMessageType = HandBrakeWPF.Services.Logging.Model.LogMessageType;
+ using LogService = HandBrakeWPF.Services.Logging.LogService;
/// <summary>
/// LibHB Implementation of IEncode
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Logging/EventArgs/LogEventArgs.cs b/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs
index b9691e4a3..121010e31 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Logging/EventArgs/LogEventArgs.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs
@@ -7,11 +7,11 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Services.Logging.EventArgs
+namespace HandBrakeWPF.Services.Logging.EventArgs
{
using System;
- using Model;
+ using LogMessage = HandBrakeWPF.Services.Logging.Model.LogMessage;
/// <summary>
/// The Message Logged Event Args
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Logging/Interfaces/ILog.cs b/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs
index dc0b3c08b..d0f5949a2 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Logging/Interfaces/ILog.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs
@@ -7,14 +7,15 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Services.Logging.Interfaces
+namespace HandBrakeWPF.Services.Logging.Interfaces
{
using System;
using System.Collections.Generic;
- using EventArgs;
-
- using Model;
+ using LogEventArgs = HandBrakeWPF.Services.Logging.EventArgs.LogEventArgs;
+ using LogLevel = HandBrakeWPF.Services.Logging.Model.LogLevel;
+ using LogMessage = HandBrakeWPF.Services.Logging.Model.LogMessage;
+ using LogMessageType = HandBrakeWPF.Services.Logging.Model.LogMessageType;
/// <summary>
/// The Log interface.
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Logging/LogService.cs b/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
index 78296795c..70bea3067 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Logging/LogService.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
@@ -10,7 +10,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Services.Logging
+namespace HandBrakeWPF.Services.Logging
{
using System;
using System.Collections.Generic;
@@ -21,9 +21,12 @@ namespace HandBrake.ApplicationServices.Services.Logging
using HandBrake.ApplicationServices.Interop;
using HandBrake.ApplicationServices.Interop.EventArgs;
- using HandBrake.ApplicationServices.Services.Logging.EventArgs;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
- using HandBrake.ApplicationServices.Services.Logging.Model;
+
+ using ILog = Interfaces.ILog;
+ using LogEventArgs = EventArgs.LogEventArgs;
+ using LogLevel = Model.LogLevel;
+ using LogMessage = Model.LogMessage;
+ using LogMessageType = Model.LogMessageType;
/// <summary>
/// The log helper.
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogLevel.cs b/win/CS/HandBrakeWPF/Services/Logging/Model/LogLevel.cs
index a319ae385..07f35e304 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogLevel.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/Model/LogLevel.cs
@@ -1,42 +1,42 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LogLevel.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The log level.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Services.Logging.Model
-{
- /// <summary>
- /// The log level.
- /// </summary>
- public enum LogLevel
- {
- /// <summary>
- /// The info.
- /// </summary>
- Info,
-
- /// <summary>
- /// The warning.
- /// </summary>
- Warning,
-
- /// <summary>
- /// The error.
- /// </summary>
- Error,
-
- /// <summary>
- /// The debug.
- /// </summary>
- Debug,
-
- /// <summary>
- /// Trace Level Logging.
- /// </summary>
- Trace,
- }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogLevel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The log level.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging.Model
+{
+ /// <summary>
+ /// The log level.
+ /// </summary>
+ public enum LogLevel
+ {
+ /// <summary>
+ /// The info.
+ /// </summary>
+ Info,
+
+ /// <summary>
+ /// The warning.
+ /// </summary>
+ Warning,
+
+ /// <summary>
+ /// The error.
+ /// </summary>
+ Error,
+
+ /// <summary>
+ /// The debug.
+ /// </summary>
+ Debug,
+
+ /// <summary>
+ /// Trace Level Logging.
+ /// </summary>
+ Trace,
+ }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessage.cs b/win/CS/HandBrakeWPF/Services/Logging/Model/LogMessage.cs
index edf071ba1..7fa98d1d2 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessage.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/Model/LogMessage.cs
@@ -1,61 +1,61 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LogMessage.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The message.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Services.Logging.Model
-{
- /// <summary>
- /// An Immutable Log Entry.
- /// </summary>
- public class LogMessage
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="LogMessage"/> class.
- /// </summary>
- /// <param name="content">
- /// The content.
- /// </param>
- /// <param name="messageType">
- /// The message type.
- /// </param>
- /// <param name="logLevel">
- /// The log level.
- /// </param>
- /// <param name="messageIndex">
- /// The message Index.
- /// </param>
- public LogMessage(string content, LogMessageType messageType, LogLevel logLevel, long messageIndex)
- {
- this.Content = content;
- this.MessageType = messageType;
- this.LogLevel = logLevel;
- this.MessageIndex = messageIndex;
- }
-
- /// <summary>
- /// Gets the content.
- /// </summary>
- public string Content { get; private set; }
-
- /// <summary>
- /// Gets a value indicating whether this message was generated by the GUI.
- /// If false, it was provided by libhb.
- /// </summary>
- public LogMessageType MessageType { get; private set; }
-
- /// <summary>
- /// Gets the log level.
- /// </summary>
- public LogLevel LogLevel { get; private set; }
-
- /// <summary>
- /// Gets the message index.
- /// </summary>
- public long MessageIndex { get; private set; }
- }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogMessage.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The message.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging.Model
+{
+ /// <summary>
+ /// An Immutable Log Entry.
+ /// </summary>
+ public class LogMessage
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="LogMessage"/> class.
+ /// </summary>
+ /// <param name="content">
+ /// The content.
+ /// </param>
+ /// <param name="messageType">
+ /// The message type.
+ /// </param>
+ /// <param name="logLevel">
+ /// The log level.
+ /// </param>
+ /// <param name="messageIndex">
+ /// The message Index.
+ /// </param>
+ public LogMessage(string content, LogMessageType messageType, LogLevel logLevel, long messageIndex)
+ {
+ this.Content = content;
+ this.MessageType = messageType;
+ this.LogLevel = logLevel;
+ this.MessageIndex = messageIndex;
+ }
+
+ /// <summary>
+ /// Gets the content.
+ /// </summary>
+ public string Content { get; private set; }
+
+ /// <summary>
+ /// Gets a value indicating whether this message was generated by the GUI.
+ /// If false, it was provided by libhb.
+ /// </summary>
+ public HandBrakeWPF.Services.Logging.Model.LogMessageType MessageType { get; private set; }
+
+ /// <summary>
+ /// Gets the log level.
+ /// </summary>
+ public HandBrakeWPF.Services.Logging.Model.LogLevel LogLevel { get; private set; }
+
+ /// <summary>
+ /// Gets the message index.
+ /// </summary>
+ public long MessageIndex { get; private set; }
+ }
+}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessageType.cs b/win/CS/HandBrakeWPF/Services/Logging/Model/LogMessageType.cs
index dfa467b4a..7c50267fb 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessageType.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/Model/LogMessageType.cs
@@ -1,22 +1,22 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LogMessageType.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The log message type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Services.Logging.Model
-{
- /// <summary>
- /// The log message type.
- /// </summary>
- public enum LogMessageType
- {
- ScanOrEncode,
- API,
- Progress,
- Application,
- }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogMessageType.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The log message type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging.Model
+{
+ /// <summary>
+ /// The log message type.
+ /// </summary>
+ public enum LogMessageType
+ {
+ ScanOrEncode,
+ API,
+ Progress,
+ Application,
+ }
+}
diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
index 098e9201a..9cf9b1320 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
@@ -17,8 +17,6 @@ namespace HandBrakeWPF.Services.Queue
using System.Xml.Serialization;
using HandBrake.ApplicationServices.Model;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Model;
using HandBrake.ApplicationServices.Utilities;
using HandBrakeWPF.Factories;
@@ -33,6 +31,9 @@ namespace HandBrakeWPF.Services.Queue
using Execute = Caliburn.Micro.Execute;
using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
using IEncode = HandBrakeWPF.Services.Encode.Interfaces.IEncode;
+ using LogLevel = HandBrakeWPF.Services.Logging.Model.LogLevel;
+ using LogMessageType = HandBrakeWPF.Services.Logging.Model.LogMessageType;
+ using LogService = HandBrakeWPF.Services.Logging.LogService;
using QueueCompletedEventArgs = HandBrakeWPF.EventArgs.QueueCompletedEventArgs;
using QueueProgressEventArgs = HandBrakeWPF.EventArgs.QueueProgressEventArgs;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index bb2703903..14b13d2e4 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -22,9 +22,6 @@ namespace HandBrakeWPF.Services.Scan
using HandBrake.ApplicationServices.Interop.Model.Encoding;
using HandBrake.ApplicationServices.Interop.Model.Preview;
using HandBrake.ApplicationServices.Model;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.Interfaces;
- using HandBrake.ApplicationServices.Services.Logging.Model;
using HandBrakeWPF.Services.Encode.Model;
using HandBrakeWPF.Services.Encode.Model.Models;
@@ -34,6 +31,10 @@ namespace HandBrakeWPF.Services.Scan
using HandBrakeWPF.Utilities;
using Chapter = HandBrakeWPF.Services.Scan.Model.Chapter;
+ using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using LogLevel = HandBrakeWPF.Services.Logging.Model.LogLevel;
+ using LogMessageType = HandBrakeWPF.Services.Logging.Model.LogMessageType;
+ using LogService = HandBrakeWPF.Services.Logging.LogService;
using ScanProgressEventArgs = HandBrake.ApplicationServices.Interop.EventArgs.ScanProgressEventArgs;
using Subtitle = HandBrakeWPF.Services.Scan.Model.Subtitle;
using Title = HandBrakeWPF.Services.Scan.Model.Title;
diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 3fcb4c96c..6573b1f5a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -16,14 +16,13 @@ namespace HandBrakeWPF.ViewModels
using Caliburn.Micro;
- using HandBrake.ApplicationServices.Services.Logging;
- using HandBrake.ApplicationServices.Services.Logging.EventArgs;
- using HandBrake.ApplicationServices.Services.Logging.Model;
-
using HandBrakeWPF.Utilities;
using HandBrakeWPF.ViewModels.Interfaces;
- using ILog = HandBrake.ApplicationServices.Services.Logging.Interfaces.ILog;
+ using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using LogEventArgs = HandBrakeWPF.Services.Logging.EventArgs.LogEventArgs;
+ using LogMessage = HandBrakeWPF.Services.Logging.Model.LogMessage;
+ using LogService = HandBrakeWPF.Services.Logging.LogService;
/// <summary>
/// The Log View Model
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs
index 67d2f21df..096032a04 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.Views
using System.Windows;
using System.Windows.Controls;
+ using HandBrakeWPF.Services.Logging.EventArgs;
using HandBrakeWPF.ViewModels;
/// <summary>
@@ -58,7 +59,7 @@ namespace HandBrakeWPF.Views
/// <param name="e">
/// The e.
/// </param>
- private void Vm_LogMessageReceived(object sender, HandBrake.ApplicationServices.Services.Logging.EventArgs.LogEventArgs e)
+ private void Vm_LogMessageReceived(object sender, LogEventArgs e)
{
try
{