cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

update video player osd

Browse Source
This commit is contained in:
Luke Pulverenti 2015-05-13 23:24:25 -04:00
parent d9b93984f6
commit 838473eb80
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -792,11 +792,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
public bool HasExited;
public int? ExitCode;
private readonly MediaEncoder _mediaEncoder;
private readonly ILogger _logger;
public ProcessWrapper(Process process, MediaEncoder mediaEncoder)
public ProcessWrapper(Process process, MediaEncoder mediaEncoder, ILogger logger)
{
Process = process;
this._mediaEncoder = mediaEncoder;
_logger = logger;
Process.Exited += Process_Exited;
}
@ -806,7 +808,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
HasExited = true;
ExitCode = process.ExitCode;
try
{
ExitCode = process.ExitCode;
}
catch (Exception ex)
{
_logger.ErrorException("Error determing process exit code", ex);
}
lock (_mediaEncoder._runningProcesses)
{

5
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -772,5 +772,8 @@
"ButtonSignInWithConnect": "Sign in with Emby Connect",
"HeaderNewServer": "New Server",
"MyDevice": "My Device",
"ButtonRemote": "Remote"
"ButtonRemote": "Remote",
"TabInfo": "Info",
"TabCast": "Cast",
"TabScenes": "Scenes"
}