aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/LiveTv
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-09-09 14:21:21 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-09-09 14:21:21 -0400
commit9a5a6f569deee21931f26c03a72b0ea0340639f5 (patch)
treed2284da116cfe0604fd87b88645a1c8ff709a247 /Emby.Server.Implementations/LiveTv
parentb6ec767ea06dba1a0a7d28aad7f69d10bb2b5720 (diff)
removed dead code
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
-rw-r--r--Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs51
-rw-r--r--Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs27
2 files changed, 2 insertions, 76 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
index d2e9c8bf02..84adf0cfc9 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHttpStream.cs
@@ -158,58 +158,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
public Task CopyToAsync(Stream stream, CancellationToken cancellationToken)
{
- if (_enableFileBuffer)
- {
- return CopyFileTo(_tempFilePath, stream, cancellationToken);
- }
return _multicastStream.CopyToAsync(stream, cancellationToken);
- //return CopyFileTo(_tempFilePath, stream, cancellationToken);
- }
-
- protected async Task CopyFileTo(string path, Stream outputStream, CancellationToken cancellationToken)
- {
- long startPosition = -20000;
- if (startPosition < 0)
- {
- var length = FileSystem.GetFileInfo(path).Length;
- startPosition = Math.Max(length - startPosition, 0);
- }
-
- _logger.Info("Live stream starting position is {0} bytes", startPosition.ToString(CultureInfo.InvariantCulture));
-
- var allowAsync = Environment.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows;
- // use non-async filestream along with read due to https://github.com/dotnet/corefx/issues/6039
-
- using (var inputStream = GetInputStream(path, startPosition, allowAsync))
- {
- if (startPosition > 0)
- {
- inputStream.Position = startPosition;
- }
-
- while (!cancellationToken.IsCancellationRequested)
- {
- long bytesRead;
-
- if (allowAsync)
- {
- bytesRead = await AsyncStreamCopier.CopyStream(inputStream, outputStream, 81920, 2, cancellationToken).ConfigureAwait(false);
- }
- else
- {
- StreamHelper.CopyTo(inputStream, outputStream, 81920, cancellationToken);
- bytesRead = 1;
- }
-
- //var position = fs.Position;
- //_logger.Debug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
-
- if (bytesRead == 0)
- {
- await Task.Delay(100, cancellationToken).ConfigureAwait(false);
- }
- }
- }
}
}
}
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index 5ad6e2e161..69fe59b4a0 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -211,15 +211,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{
long bytesRead;
- if (allowAsync)
- {
- bytesRead = await AsyncStreamCopier.CopyStream(inputStream, outputStream, 81920, 2, cancellationToken).ConfigureAwait(false);
- }
- else
- {
- StreamHelper.CopyTo(inputStream, outputStream, 81920, cancellationToken);
- bytesRead = 1;
- }
+ StreamHelper.CopyTo(inputStream, outputStream, 81920, cancellationToken);
+ bytesRead = 1;
//var position = fs.Position;
//_logger.Debug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
@@ -285,22 +278,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
//return taskCompletion.Task;
}
- private void StreamCopyCallback(IAsyncResult result)
- {
- var copier = (AsyncStreamCopier)result.AsyncState;
- var taskCompletion = copier.TaskCompletionSource;
-
- try
- {
- copier.EndCopy(result);
- taskCompletion.TrySetResult(0);
- }
- catch (Exception ex)
- {
- taskCompletion.TrySetException(ex);
- }
- }
-
public class UdpClientStream : Stream
{
private static int RtpHeaderBytes = 12;