diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-30 01:06:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 01:06:08 -0400 |
| commit | 8f11917e84ed3b09bec10cf46c768dfc377f85d1 (patch) | |
| tree | b09ae3063433d4899ac1aae6bd4a6935449cd6a1 /MediaBrowser.Controller | |
| parent | 808ff8f05477d8a9871ee15bf6070737c810eceb (diff) | |
| parent | 9a012e458cd12ca7b9630ce7f3074318db9deee8 (diff) | |
Merge pull request #1894 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 1 insertions, 24 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 9b4c35c41..d1429c366 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -302,7 +302,6 @@ <Compile Include="Providers\IMetadataService.cs" /> <Compile Include="Providers\IRemoteMetadataProvider.cs" /> <Compile Include="Providers\IRemoteSearchProvider.cs" /> - <Compile Include="Providers\ISeriesOrderProvider.cs" /> <Compile Include="Providers\ItemInfo.cs" /> <Compile Include="Providers\LiveTvProgramLookupInfo.cs" /> <Compile Include="Providers\LocalImageInfo.cs" /> @@ -330,7 +329,6 @@ <Compile Include="Subtitles\ISubtitleProvider.cs" /> <Compile Include="Providers\ItemLookupInfo.cs" /> <Compile Include="Providers\MetadataRefreshOptions.cs" /> - <Compile Include="Providers\ISeriesOrderManager.cs" /> <Compile Include="Session\ISessionManager.cs" /> <Compile Include="Entities\AggregateFolder.cs" /> <Compile Include="Entities\Audio\Audio.cs" /> diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs index 12c893b0f..62377b19e 100644 --- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs +++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs @@ -131,7 +131,7 @@ namespace MediaBrowser.Controller.MediaEncoding /// <returns>System.String.</returns> string EscapeSubtitleFilterPath(string path); - void Init(); + Task Init(); Task UpdateEncoderPath(string path, string pathType); } diff --git a/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs b/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs deleted file mode 100644 index 970f7a7be..000000000 --- a/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Providers -{ - public interface ISeriesOrderManager - { - Task<int?> FindSeriesIndex(string orderType, string seriesName); - void AddParts(IEnumerable<ISeriesOrderProvider> orderProviders); - } -} diff --git a/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs b/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs deleted file mode 100644 index ee0f3c197..000000000 --- a/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Providers -{ - public interface ISeriesOrderProvider - { - string OrderType { get; } - Task<int?> FindSeriesIndex(string seriesName); - } -}
\ No newline at end of file |