summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Services
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF/Services')
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs23
-rw-r--r--win/CS/HandBrakeWPF/Services/UserSettingService.cs2
2 files changed, 22 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
index c59326f4e..02e5dc2c4 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs
@@ -200,7 +200,7 @@ namespace HandBrakeWPF.Services.Encode
/// <param name="message">Log message content</param>
protected void ServiceLogMessage(string message)
{
- this.log.LogMessage(string.Format("{0}# {1}{0}", Environment.NewLine, message));
+ this.log.LogMessage(string.Format("{0}# {1}", Environment.NewLine, message));
}
protected void TimedLogMessage(string message)
@@ -249,7 +249,26 @@ namespace HandBrakeWPF.Services.Encode
{
this.IsEncoding = false;
- this.ServiceLogMessage(e.Error != 0 ? string.Format("Encode Failed ({0})", e.Error) : "Encode Completed!");
+ string completeMessage = "Job Completed!";
+ switch (e.Error)
+ {
+ case 0:
+ break;
+ case 1:
+ completeMessage = "Job Cancelled!";
+ break;
+ case 2:
+ completeMessage = string.Format("Job Failed. Check log and input settings ({0})", e.Error);
+ break;
+ case 3:
+ completeMessage = string.Format("Job Failed to Initialise. Check log and input settings ({0})", e.Error);
+ break;
+ default:
+ completeMessage = string.Format("Job Failed ({0})", e.Error);
+ break;
+ }
+
+ this.ServiceLogMessage(completeMessage);
// Handling Log Data
string hbLog = this.ProcessLogs(this.currentTask.Destination, this.isPreviewInstance, this.currentConfiguration);
diff --git a/win/CS/HandBrakeWPF/Services/UserSettingService.cs b/win/CS/HandBrakeWPF/Services/UserSettingService.cs
index 4c181541a..1570e6f85 100644
--- a/win/CS/HandBrakeWPF/Services/UserSettingService.cs
+++ b/win/CS/HandBrakeWPF/Services/UserSettingService.cs
@@ -304,7 +304,7 @@ namespace HandBrakeWPF.Services
defaults.Add(UserSettingConstants.DefaultPlayer, false);
// Experimental
- defaults.Add(UserSettingConstants.RemoteServiceEnabled, false);
+ defaults.Add(UserSettingConstants.RemoteServiceEnabled, true);
defaults.Add(UserSettingConstants.RemoteServicePort, 8037);
// Misc