alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-01 20:02:52 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
simon
2014-01-13 12:32:10 +11:00
parent f89deb346a e4f5a3f005
commit 37aab84b2a
49 changed files with 655 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -1,6 +1,5 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
@@ -734,7 +733,7 @@ namespace MediaBrowser.Api.Playback
return "-";
}
var type = InputType.AudioFile;
var type = InputType.File;
var inputPath = new[] { state.MediaPath };
@@ -1044,6 +1043,7 @@ namespace MediaBrowser.Api.Playback
}
itemId = recording.Id;
//state.RunTimeTicks = recording.RunTimeTicks;
state.SendInputOverStandardInput = recording.RecordingInfo.Status == RecordingStatus.InProgress;
}
else if (string.Equals(request.Type, "Channel", StringComparison.OrdinalIgnoreCase))
@@ -1092,6 +1092,7 @@ namespace MediaBrowser.Api.Playback
: video.PlayableStreamFileNames.ToList();
}
state.RunTimeTicks = item.RunTimeTicks;
itemId = item.Id;
}