aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-02 18:07:37 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-02 18:07:37 -0500
commita5be2523c5d86c077175b2de347b8beb791616c1 (patch)
tree5fbf58f4db3b51328fb55c86b330d01789418366 /MediaBrowser.Server.Implementations
parentb50fc351a12fa890b2d4ab6e71b7a4b609dd583c (diff)
added music and game genre image downloading
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs3
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs6
2 files changed, 3 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
index b194b2e94..34156b509 100644
--- a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
@@ -40,9 +40,6 @@ namespace MediaBrowser.Server.Implementations.Library
public void Dispose()
{
- //BaseItem.LibraryManager.LibraryChanged -= LibraryChanged;
-
- //LuceneSearch.CloseAll();
}
/// <summary>
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index b38ef5d55..4b3f33297 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -153,18 +153,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return await GetRecording(recording, service.Name, cancellationToken).ConfigureAwait(false);
}
- public async Task<StreamResponseInfo> GetRecordingStream(string id, CancellationToken cancellationToken)
+ public async Task<LiveStreamInfo> GetRecordingStream(string id, CancellationToken cancellationToken)
{
var service = ActiveService;
var recordings = await service.GetRecordingsAsync(cancellationToken).ConfigureAwait(false);
- var recording = recordings.FirstOrDefault(i => _tvDtoService.GetInternalRecordingId(service.Name, i.Id) == new Guid(id));
+ var recording = recordings.First(i => _tvDtoService.GetInternalRecordingId(service.Name, i.Id) == new Guid(id));
return await service.GetRecordingStream(recording.Id, cancellationToken).ConfigureAwait(false);
}
- public async Task<StreamResponseInfo> GetChannelStream(string id, CancellationToken cancellationToken)
+ public async Task<LiveStreamInfo> GetChannelStream(string id, CancellationToken cancellationToken)
{
var service = ActiveService;