aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/BaseStreamingService.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-03-28 00:24:11 -0400
committerTim Hobbs <jesus.tesh@gmail.com>2014-03-28 03:28:32 -0700
commitb95f8f5f5cd59d7c2e50e4eee018eccc7fd05216 (patch)
tree3ef2a2fd0f75c2d107b3e45177c286ec5c6342bd /MediaBrowser.Api/Playback/BaseStreamingService.cs
parent87c8c429e7d29c94e3722e69d4d31f505c48cfb0 (diff)
correct dlna param positions
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs17
1 files changed, 11 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index b510a640e..519ff7947 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -967,8 +967,6 @@ namespace MediaBrowser.Api.Playback
private async void StreamToStandardInput(Process process, StreamState state)
{
- state.StandardInputCancellationTokenSource = new CancellationTokenSource();
-
try
{
await StreamToStandardInputInternal(process, state).ConfigureAwait(false);
@@ -1263,34 +1261,41 @@ namespace MediaBrowser.Api.Playback
{
if (videoRequest != null)
{
- videoRequest.MaxWidth = int.Parse(val, UsCulture);
+ videoRequest.MaxFramerate = double.Parse(val, UsCulture);
}
}
else if (i == 12)
{
if (videoRequest != null)
{
- videoRequest.MaxHeight = int.Parse(val, UsCulture);
+ videoRequest.MaxWidth = int.Parse(val, UsCulture);
}
}
else if (i == 13)
{
if (videoRequest != null)
{
- videoRequest.Framerate = int.Parse(val, UsCulture);
+ videoRequest.MaxHeight = int.Parse(val, UsCulture);
}
}
else if (i == 14)
{
if (videoRequest != null)
{
- request.StartTimeTicks = long.Parse(val, UsCulture);
+ videoRequest.Framerate = int.Parse(val, UsCulture);
}
}
else if (i == 15)
{
if (videoRequest != null)
{
+ request.StartTimeTicks = long.Parse(val, UsCulture);
+ }
+ }
+ else if (i == 16)
+ {
+ if (videoRequest != null)
+ {
videoRequest.Level = val;
}
}