Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

add IsRemote property

Browse Source
This commit is contained in:
Luke Pulverenti 2017-01-20 12:53:48 -05:00
parent fe1630aec4
commit 8d668095bb
7 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -3617,10 +3617,12 @@ namespace Emby.Server.Implementations.Data
var index = 0;
foreach (var type in query.TrailerTypes)
{
clauses.Add("TrailerTypes like @TrailerTypes" + index);
var paramName = "@TrailerTypes" + index;
clauses.Add("TrailerTypes like " + paramName);
if (statement != null)
{
statement.TryBind("@TrailerTypes" + index, "%" + type + "%");
statement.TryBind(paramName, "%" + type + "%");
}
index++;
}

39
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -240,14 +240,49 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
try
{
_logger.Info("Killing ffmpeg recording process for {0}", _targetPath);
_logger.Info("Stopping ffmpeg recording process for {0}", _targetPath);
//process.Kill();
_process.StandardInput.WriteLine("q");
}
catch (Exception ex)
{
_logger.ErrorException("Error killing transcoding job for {0}", ex, _targetPath);
_logger.ErrorException("Error stopping recording transcoding job for {0}", ex, _targetPath);
}
if (_hasExited)
{
return;
}
try
{
_logger.Info("Calling recording process.WaitForExit for {0}", _targetPath);
if (_process.WaitForExit(5000))
{
return;
}
}
catch (Exception ex)
{
_logger.ErrorException("Error waiting for recording process to exit for {0}", ex, _targetPath);
}
if (_hasExited)
{
return;
}
try
{
_logger.Info("Killing ffmpeg recording process for {0}", _targetPath);
_process.Kill();
}
catch (Exception ex)
{
_logger.ErrorException("Error killing recording transcoding job for {0}", ex, _targetPath);
}
}
}

3
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
View File

@ -160,7 +160,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
Id = channel.Path.GetMD5().ToString("N"),
IsInfiniteStream = true,
SupportsDirectStream = false
SupportsDirectStream = false,
IsRemote = true
};
return new List<MediaSourceInfo> { mediaSource };

3
MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
View File

@ -68,7 +68,8 @@ namespace MediaBrowser.Controller.Channels
Id = id,
ReadAtNativeFramerate = ReadAtNativeFramerate,
SupportsDirectStream = false,
SupportsDirectPlay = SupportsDirectPlay
SupportsDirectPlay = SupportsDirectPlay,
IsRemote = true
};
var bitrate = (AudioBitrate ?? 0) + (VideoBitrate ?? 0);

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

@ -1250,8 +1250,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
lock (_runningProcesses)
{
proceses = _runningProcesses.ToList();
}
_runningProcesses.Clear();
}
foreach (var process in proceses)
{
@ -1321,16 +1321,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
}
lock (_mediaEncoder._runningProcesses)
{
_mediaEncoder._runningProcesses.Remove(this);
}
DisposeProcess(process);
}
private void DisposeProcess(IProcess process)
{
lock (_mediaEncoder._runningProcesses)
{
_mediaEncoder._runningProcesses.Remove(this);
}
try
{
process.Dispose();

5
MediaBrowser.Model/Dto/MediaSourceInfo.cs
View File

@ -21,6 +21,11 @@ namespace MediaBrowser.Model.Dto
public string Name { get; set; }
/// <summary>
/// Differentiate internet url vs local network
/// </summary>
public bool IsRemote { get; set; }
public string ETag { get; set; }
public long? RunTimeTicks { get; set; }
public bool ReadAtNativeFramerate { get; set; }

5
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -92,6 +92,11 @@ namespace MediaBrowser.Model.Entities
{
attributes.Add(StringHelper.FirstToUpper(Language));
}
else
{
attributes.Add("Und");
}
if (IsDefault)
{
attributes.Add("Default");