Merge remote-tracking branch 'official/master'

This commit is contained in:
Michalis Adamidis
2014-08-06 01:29:56 +02:00
114 changed files with 2756 additions and 1106 deletions

View File

@@ -140,7 +140,6 @@
<Compile Include="Music\FanArtAlbumProvider.cs" />
<Compile Include="Music\FanArtArtistProvider.cs" />
<Compile Include="Music\MusicBrainzAlbumProvider.cs" />
<Compile Include="Music\SoundtrackPostScanTask.cs" />
<Compile Include="People\PersonMetadataService.cs" />
<Compile Include="People\MovieDbPersonProvider.cs" />
<Compile Include="Photos\ExifReader.cs" />

View File

@@ -1,32 +0,0 @@
using MediaBrowser.Controller.Library;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Providers.Music
{
public class SoundtrackPostScanTask : ILibraryPostScanTask
{
private readonly ILibraryManager _libraryManager;
public SoundtrackPostScanTask(ILibraryManager libraryManager)
{
_libraryManager = libraryManager;
}
private readonly Task _cachedTask = Task.FromResult(true);
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
RunInternal(progress, cancellationToken);
return _cachedTask;
}
private void RunInternal(IProgress<double> progress, CancellationToken cancellationToken)
{
// Reimplement this when more kinds of associations are supported.
progress.Report(100);
}
}
}