aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/TranscodingThrottler.cs
diff options
context:
space:
mode:
authorT. Adams <t.adams88@gmail.com>2015-03-13 21:57:10 -0700
committerT. Adams <t.adams88@gmail.com>2015-03-13 21:57:10 -0700
commiteff23da3737718c944a59078c24e3ccf19435b90 (patch)
tree68d1c42e2bcd4a4be0398c8f4c0f1ba88d42e56e /MediaBrowser.Api/Playback/TranscodingThrottler.cs
parentb7b28ffd31892dac13004199766262126d2785c5 (diff)
parentdbb7fd61ff0545f8ebf7b9ece432f1408d43040c (diff)
Merge branch 'dev' into Video-Playlist-Controls
Diffstat (limited to 'MediaBrowser.Api/Playback/TranscodingThrottler.cs')
-rw-r--r--MediaBrowser.Api/Playback/TranscodingThrottler.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/MediaBrowser.Api/Playback/TranscodingThrottler.cs b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
index f22ef4326..c486a44ea 100644
--- a/MediaBrowser.Api/Playback/TranscodingThrottler.cs
+++ b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
@@ -25,10 +25,7 @@ namespace MediaBrowser.Api.Playback
public void Start()
{
- if (_processManager.SupportsSuspension)
- {
- //_timer = new Timer(TimerCallback, null, 5000, 5000);
- }
+ _timer = new Timer(TimerCallback, null, 5000, 5000);
}
private void TimerCallback(object state)
@@ -58,8 +55,7 @@ namespace MediaBrowser.Api.Playback
try
{
- //_job.Process.StandardInput.WriteLine("p");
- _processManager.SuspendProcess(_job.Process);
+ _job.Process.StandardInput.WriteLine("p");
_isPaused = true;
}
catch (Exception ex)
@@ -77,8 +73,7 @@ namespace MediaBrowser.Api.Playback
try
{
- //_job.Process.StandardInput.WriteLine("u");
- _processManager.ResumeProcess(_job.Process);
+ _job.Process.StandardInput.WriteLine("u");
_isPaused = false;
}
catch (Exception ex)