]> granicus.if.org Git - handbrake/commitdiff
WinGui: Remove Logging abstraction from the Services library. Let the library consum...
authorsr55 <sr55.hb@outlook.com>
Tue, 8 May 2018 20:31:26 +0000 (21:31 +0100)
committersr55 <sr55.hb@outlook.com>
Tue, 8 May 2018 20:31:26 +0000 (21:31 +0100)
17 files changed:
win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Helpers/LogManager.cs
win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs
win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs [moved from win/CS/HandBrake.ApplicationServices/Services/Logging/EventArgs/LogEventArgs.cs with 90% similarity]
win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs [moved from win/CS/HandBrake.ApplicationServices/Services/Logging/Interfaces/ILog.cs with 87% similarity]
win/CS/HandBrakeWPF/Services/Logging/LogService.cs [moved from win/CS/HandBrake.ApplicationServices/Services/Logging/LogService.cs with 97% similarity]
win/CS/HandBrakeWPF/Services/Logging/Model/LogLevel.cs [moved from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogLevel.cs with 91% similarity]
win/CS/HandBrakeWPF/Services/Logging/Model/LogMessage.cs [moved from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessage.cs with 88% similarity]
win/CS/HandBrakeWPF/Services/Logging/Model/LogMessageType.cs [moved from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessageType.cs with 89% similarity]
win/CS/HandBrakeWPF/Services/Queue/QueueProcessor.cs
win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
win/CS/HandBrakeWPF/Views/LogView.xaml.cs

index 79abb281c751b0877054d9b71c0fbeffa894ab4e..c68770b8e6cc41236bfb7861c388b7b57ec5f167 100644 (file)
     <Compile Include="Interop\Model\VideoQualityLimits.cs" />\r
     <Compile Include="Model\HBConfiguration.cs" />\r
     <Compile Include="Model\VideoScaler.cs" />\r
-    <Compile Include="Services\Logging\EventArgs\LogEventArgs.cs" />\r
-    <Compile Include="Services\Logging\Interfaces\ILog.cs" />\r
-    <Compile Include="Services\Logging\LogService.cs" />\r
-    <Compile Include="Services\Logging\Model\LogLevel.cs" />\r
-    <Compile Include="Services\Logging\Model\LogMessage.cs" />\r
-    <Compile Include="Services\Logging\Model\LogMessageType.cs" />\r
     <Compile Include="Utilities\SystemInfo.cs" />\r
     <Compile Include="Utilities\VersionHelper.cs" />\r
     <Compile Include="Properties\Resources.Designer.cs">\r
index f94c6fe24fe97287af2d1b53318bdd90e6156657..7fe52a899802a9df8d11c15b5e9ad68398cf4f84 100644 (file)
@@ -27,9 +27,6 @@ namespace HandBrake.ApplicationServices.Interop
     using HandBrake.ApplicationServices.Interop.Json.State;\r
     using HandBrake.ApplicationServices.Interop.Model.Encoding;\r
     using HandBrake.ApplicationServices.Interop.Model.Preview;\r
-    using HandBrake.ApplicationServices.Services.Logging;\r
-    using HandBrake.ApplicationServices.Services.Logging.Interfaces;\r
-    using HandBrake.ApplicationServices.Services.Logging.Model;\r
 \r
     using Newtonsoft.Json;\r
 \r
index b16300fb4edcfe547d20216403d16ae94f78aca1..a30f43133497efb02a9176d54073eaf00a0b230e 100644 (file)
@@ -17,9 +17,6 @@ namespace HandBrake.ApplicationServices.Interop
     using HandBrake.ApplicationServices.Interop.HbLib;\r
     using HandBrake.ApplicationServices.Interop.Json.Anamorphic;\r
     using HandBrake.ApplicationServices.Interop.Json.Shared;\r
-    using HandBrake.ApplicationServices.Services.Logging;\r
-    using HandBrake.ApplicationServices.Services.Logging.Interfaces;\r
-    using HandBrake.ApplicationServices.Services.Logging.Model;\r
 \r
     using Newtonsoft.Json;\r
 \r
index cd1fdcfa2c6f96072179310424543231b24f2bed..4757f7eec4519a88f8c282fb97456a761ffd87c1 100644 (file)
     <Compile Include="Services\Encode\Model\Models\Video\VideoProfile.cs" />\r
     <Compile Include="Services\Encode\Model\Models\Video\VideoTune.cs" />\r
     <Compile Include="Services\Interfaces\INotifyIconService.cs" />\r
+    <Compile Include="Services\Logging\EventArgs\LogEventArgs.cs" />\r
+    <Compile Include="Services\Logging\Interfaces\ILog.cs" />\r
+    <Compile Include="Services\Logging\LogService.cs" />\r
+    <Compile Include="Services\Logging\Model\LogLevel.cs" />\r
+    <Compile Include="Services\Logging\Model\LogMessage.cs" />\r
+    <Compile Include="Services\Logging\Model\LogMessageType.cs" />\r
     <Compile Include="Services\Presets\Factories\JsonPresetFactory.cs" />\r
     <Compile Include="Services\Presets\Interfaces\IPresetObject.cs" />\r
     <Compile Include="Services\Presets\Model\PresetDisplayCategory.cs" />\r
index 2cd94a25d965ecce903968f6dab7abba4f51342d..ec1c11ffcbb819bf7cdecabfb87b6432ebd11a20 100644 (file)
@@ -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>
index e3a807cf98db63c417ae1504d0d12fe73f7979c8..ffc33113f5f2556d6529fac249b6e304c465c143 100644 (file)
@@ -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.
index b6b8114544ce64631931e7a7fcb9075a7f1264bd..02a361ba6185ff25fdd580c4b84775eaf1cc7211 100644 (file)
@@ -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
similarity index 90%
rename from win/CS/HandBrake.ApplicationServices/Services/Logging/EventArgs/LogEventArgs.cs
rename to win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs
index b9691e4a3b3e7f602200d063e2ccafdb7d1480c5..121010e31748182d28493b7756c285ce3fcfeeef 100644 (file)
@@ -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
similarity index 87%
rename from win/CS/HandBrake.ApplicationServices/Services/Logging/Interfaces/ILog.cs
rename to win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs
index dc0b3c08b4bb3a905624e90de2802f397d83147a..d0f5949a25228c28be8abb6aa1fa8553205ecaf3 100644 (file)
@@ -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.
similarity index 97%
rename from win/CS/HandBrake.ApplicationServices/Services/Logging/LogService.cs
rename to win/CS/HandBrakeWPF/Services/Logging/LogService.cs
index 78296795cd28fd74e8df8cde46550d4f3506e961..70bea306760e8a9af303c6c280fb1c167da3d631 100644 (file)
@@ -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.
similarity index 91%
rename from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogLevel.cs
rename to win/CS/HandBrakeWPF/Services/Logging/Model/LogLevel.cs
index a319ae385616b8cc7c487e6f20fe1f0eabbfb5b2..07f35e304046458dc5d6d05a54656ec26b4d561e 100644 (file)
@@ -1,42 +1,42 @@
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="LogLevel.cs" company="HandBrake Project (http://handbrake.fr)">\r
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
-// </copyright>\r
-// <summary>\r
-//   The log level.\r
-// </summary>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-namespace HandBrake.ApplicationServices.Services.Logging.Model\r
-{\r
-    /// <summary>\r
-    /// The log level.\r
-    /// </summary>\r
-    public enum LogLevel\r
-    {\r
-        /// <summary>\r
-        /// The info.\r
-        /// </summary>\r
-        Info,\r
-\r
-        /// <summary>\r
-        /// The warning.\r
-        /// </summary>\r
-        Warning, \r
-\r
-        /// <summary>\r
-        /// The error.\r
-        /// </summary>\r
-        Error,      \r
-        \r
-        /// <summary>\r
-        /// The debug.\r
-        /// </summary>\r
-        Debug,\r
-        \r
-        /// <summary>\r
-        /// Trace Level Logging.\r
-        /// </summary>\r
-        Trace, \r
-    }\r
-}\r
+// --------------------------------------------------------------------------------------------------------------------
+// <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, 
+    }
+}
similarity index 88%
rename from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessage.cs
rename to win/CS/HandBrakeWPF/Services/Logging/Model/LogMessage.cs
index edf071ba1c4e6c12ee14e464c7ce672e4bfc5d66..7fa98d1d27eedb7d447c83756573b45867280959 100644 (file)
@@ -1,61 +1,61 @@
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="LogMessage.cs" company="HandBrake Project (http://handbrake.fr)">\r
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
-// </copyright>\r
-// <summary>\r
-//   The message.\r
-// </summary>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-namespace HandBrake.ApplicationServices.Services.Logging.Model\r
-{\r
-    /// <summary>\r
-    /// An Immutable Log Entry.\r
-    /// </summary>\r
-    public class LogMessage\r
-    {\r
-        /// <summary>\r
-        /// Initializes a new instance of the <see cref="LogMessage"/> class.\r
-        /// </summary>\r
-        /// <param name="content">\r
-        /// The content.\r
-        /// </param>\r
-        /// <param name="messageType">\r
-        /// The message type.\r
-        /// </param>\r
-        /// <param name="logLevel">\r
-        /// The log level.\r
-        /// </param>\r
-        /// <param name="messageIndex">\r
-        /// The message Index.\r
-        /// </param>\r
-        public LogMessage(string content, LogMessageType messageType, LogLevel logLevel, long messageIndex)\r
-        {\r
-            this.Content = content;\r
-            this.MessageType = messageType;\r
-            this.LogLevel = logLevel;\r
-            this.MessageIndex = messageIndex;\r
-        }\r
-\r
-        /// <summary>\r
-        /// Gets the content.\r
-        /// </summary>\r
-        public string Content { get; private set; }\r
-\r
-        /// <summary>\r
-        /// Gets a value indicating whether this message was generated by the GUI.\r
-        /// If false, it was provided by libhb.\r
-        /// </summary>\r
-        public LogMessageType MessageType { get; private set; }\r
-\r
-        /// <summary>\r
-        /// Gets the log level.\r
-        /// </summary>\r
-        public LogLevel LogLevel { get; private set; }\r
-\r
-        /// <summary>\r
-        /// Gets the message index.\r
-        /// </summary>\r
-        public long MessageIndex { get; private set; }\r
-    }\r
-}\r
+// --------------------------------------------------------------------------------------------------------------------
+// <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; }
+    }
+}
similarity index 89%
rename from win/CS/HandBrake.ApplicationServices/Services/Logging/Model/LogMessageType.cs
rename to win/CS/HandBrakeWPF/Services/Logging/Model/LogMessageType.cs
index dfa467b4a7399924207f6f85677fadf3ae8de394..7c50267fbd41bda7021517db3205cecb78a817a0 100644 (file)
@@ -1,22 +1,22 @@
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="LogMessageType.cs" company="HandBrake Project (http://handbrake.fr)">\r
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
-// </copyright>\r
-// <summary>\r
-//   The log message type.\r
-// </summary>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-namespace HandBrake.ApplicationServices.Services.Logging.Model\r
-{\r
-    /// <summary>\r
-    /// The log message type.\r
-    /// </summary>\r
-    public enum LogMessageType\r
-    {\r
-        ScanOrEncode,\r
-        API,\r
-        Progress,\r
-        Application,\r
-    }\r
-}\r
+// --------------------------------------------------------------------------------------------------------------------
+// <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,
+    }
+}
index 098e9201a2519a37c80caaebb167d7fe64027a33..9cf9b1320eb1d3c358cef40ac178bba07d7b29b2 100644 (file)
@@ -17,8 +17,6 @@ namespace HandBrakeWPF.Services.Queue
     using System.Xml.Serialization;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Services.Logging;\r
-    using HandBrake.ApplicationServices.Services.Logging.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
     using HandBrakeWPF.Factories;\r
@@ -33,6 +31,9 @@ namespace HandBrakeWPF.Services.Queue
     using Execute = Caliburn.Micro.Execute;\r
     using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;\r
     using IEncode = HandBrakeWPF.Services.Encode.Interfaces.IEncode;\r
+    using LogLevel = HandBrakeWPF.Services.Logging.Model.LogLevel;\r
+    using LogMessageType = HandBrakeWPF.Services.Logging.Model.LogMessageType;\r
+    using LogService = HandBrakeWPF.Services.Logging.LogService;\r
     using QueueCompletedEventArgs = HandBrakeWPF.EventArgs.QueueCompletedEventArgs;\r
     using QueueProgressEventArgs = HandBrakeWPF.EventArgs.QueueProgressEventArgs;\r
 \r
index bb27039033d391038fb4ab9d903dcd2bce0e908d..14b13d2e449f82c674a232e6d8faaa26ec7a7277 100644 (file)
@@ -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;
index 3fcb4c96c0f84a05071d9a1c568161eabc9ce814..6573b1f5a29a28536e97bd38a00504fbb33e04b9 100644 (file)
@@ -16,14 +16,13 @@ namespace HandBrakeWPF.ViewModels
 \r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Services.Logging;\r
-    using HandBrake.ApplicationServices.Services.Logging.EventArgs;\r
-    using HandBrake.ApplicationServices.Services.Logging.Model;\r
-\r
     using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
-    using ILog = HandBrake.ApplicationServices.Services.Logging.Interfaces.ILog;\r
+    using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;\r
+    using LogEventArgs = HandBrakeWPF.Services.Logging.EventArgs.LogEventArgs;\r
+    using LogMessage = HandBrakeWPF.Services.Logging.Model.LogMessage;\r
+    using LogService = HandBrakeWPF.Services.Logging.LogService;\r
 \r
     /// <summary>\r
     /// The Log View Model\r
index 67d2f21dfdcb02271022652bcc53d2cea7576533..096032a04d8bc31793dd08d0c3f1a48778f0f1e7 100644 (file)
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.Views
     using System.Windows;\r
     using System.Windows.Controls;\r
 \r
+    using HandBrakeWPF.Services.Logging.EventArgs;\r
     using HandBrakeWPF.ViewModels;\r
 \r
     /// <summary>\r
@@ -58,7 +59,7 @@ namespace HandBrakeWPF.Views
         /// <param name="e">\r
         /// The e.\r
         /// </param>\r
-        private void Vm_LogMessageReceived(object sender, HandBrake.ApplicationServices.Services.Logging.EventArgs.LogEventArgs e)\r
+        private void Vm_LogMessageReceived(object sender, LogEventArgs e)\r
         {\r
             try\r
             {\r