diff options
Diffstat (limited to 'MediaBrowser.ServerApplication')
4 files changed, 4 insertions, 73 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index d7858222e..695697f8f 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -309,7 +309,7 @@ namespace MediaBrowser.ServerApplication ImageProcessor = new ImageProcessor(Logger, ServerConfigurationManager.ApplicationPaths, FileSystemManager, JsonSerializer); RegisterSingleInstance(ImageProcessor); - DtoService = new DtoService(Logger, LibraryManager, UserManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager); + DtoService = new DtoService(Logger, LibraryManager, UserManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager); RegisterSingleInstance(DtoService); var newsService = new Server.Implementations.News.NewsService(ApplicationPaths, JsonSerializer); @@ -497,9 +497,7 @@ namespace MediaBrowser.ServerApplication GetExports<IItemResolver>(), GetExports<IIntroProvider>(), GetExports<IBaseItemComparer>(), - GetExports<ILibraryPrescanTask>(), - GetExports<ILibraryPostScanTask>(), - GetExports<IPeoplePrescanTask>()); + GetExports<ILibraryPostScanTask>()); ProviderManager.AddParts(GetExports<IImageProvider>(), GetExports<IMetadataService>(), GetExports<IMetadataProvider>(), GetExports<IMetadataSaver>()); diff --git a/MediaBrowser.ServerApplication/FFMpeg/ffmpeg-20130904-git-f974289-win32-static.7z.REMOVED.git-id b/MediaBrowser.ServerApplication/FFMpeg/ffmpeg-20130904-git-f974289-win32-static.7z.REMOVED.git-id deleted file mode 100644 index 9f83b949b..000000000 --- a/MediaBrowser.ServerApplication/FFMpeg/ffmpeg-20130904-git-f974289-win32-static.7z.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -8f1dfd62d31e48c31bef4b9ccc0e514f46650a79
\ No newline at end of file diff --git a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs index 51d661518..66a99f2e5 100644 --- a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs +++ b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs @@ -258,8 +258,8 @@ namespace MediaBrowser.ServerApplication previews.Add(new PreviewItem(item.GetImagePath(ImageType.Thumb), "Thumb")); } previews.AddRange( - item.BackdropImagePaths.Select( - image => new PreviewItem(image, "Backdrop"))); + item.GetImages(ImageType.Backdrop).Select( + image => new PreviewItem(image.Path, "Backdrop"))); }); lstPreviews.ItemsSource = previews; lstPreviews.Items.Refresh(); diff --git a/MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs b/MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs deleted file mode 100644 index ab72b2c8e..000000000 --- a/MediaBrowser.ServerApplication/NextPvr/LiveTvService.cs +++ /dev/null @@ -1,66 +0,0 @@ -using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.Net; -using MediaBrowser.Controller.LiveTv; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Serialization; - -namespace MediaBrowser.Plugins.NextPvr -{ - /// <summary> - /// Class LiveTvService - /// </summary> - public class LiveTvService : ILiveTvService - { - private readonly ILogger _logger; - - private IApplicationPaths _appPaths; - private IJsonSerializer _json; - private IHttpClient _httpClient; - - public LiveTvService(ILogger logger) - { - _logger = logger; - } - - /// <summary> - /// Gets the channels async. - /// </summary> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task{IEnumerable{ChannelInfo}}.</returns> - public Task<IEnumerable<ChannelInfo>> GetChannelsAsync(CancellationToken cancellationToken) - { - //using (var stream = await _httpClient.Get(new HttpRequestOptions() - // { - // Url = "", - // CancellationToken = cancellationToken - // })) - //{ - - //} - _logger.Info("GetChannelsAsync"); - - var channels = new List<ChannelInfo> - { - new ChannelInfo - { - Name = "NBC", - ServiceName = Name - } - }; - - return Task.FromResult<IEnumerable<ChannelInfo>>(channels); - } - - /// <summary> - /// Gets the name. - /// </summary> - /// <value>The name.</value> - public string Name - { - get { return "Next Pvr"; } - } - } -} |