diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-29 14:44:50 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-29 14:44:50 -0400 |
| commit | da7d61be5a6403c102c986eabfc7a6c76ae17e0c (patch) | |
| tree | a24ac6dd548680bbbdf5ab20bdf18fdfae72d78d | |
| parent | 48ba276d83bb539da298433789229b1f8c66a2c1 (diff) | |
update dependencies
| -rw-r--r-- | MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs | 21 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 9 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Sync/IServerSyncProvider.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Controller/packages.config | 2 |
4 files changed, 3 insertions, 38 deletions
diff --git a/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs b/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs deleted file mode 100644 index 6a57d9b19..000000000 --- a/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using MediaBrowser.Model.Events; -using MediaBrowser.Model.Net; - -namespace MediaBrowser.Controller.Dlna -{ - public interface IDeviceDiscovery - { - event EventHandler<GenericEventArgs<UpnpDeviceInfo>> DeviceDiscovered; - event EventHandler<GenericEventArgs<UpnpDeviceInfo>> DeviceLeft; - } - - public class UpnpDeviceInfo - { - public Uri Location { get; set; } - public Dictionary<string, string> Headers { get; set; } - public IpAddressInfo LocalIpAddress { get; set; } - public int LocalPort { get; set; } - } -} diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index cf20f7bbb..d588f6127 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -48,14 +48,6 @@ <!-- A reference to the entire .NET Framework is automatically included --> </ItemGroup> <ItemGroup> - <Reference Include="Interfaces.IO"> - <HintPath>..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll</HintPath> - </Reference> - <Reference Include="Patterns.Logging"> - <HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> <Compile Include="..\SharedVersion.cs"> <Link>Properties\SharedVersion.cs</Link> </Compile> @@ -91,7 +83,6 @@ <Compile Include="Dlna\EventSubscriptionResponse.cs" /> <Compile Include="Dlna\IConnectionManager.cs" /> <Compile Include="Dlna\IContentDirectory.cs" /> - <Compile Include="Dlna\IDeviceDiscovery.cs" /> <Compile Include="Dlna\IDlnaManager.cs" /> <Compile Include="Dlna\IEventManager.cs" /> <Compile Include="Dlna\IMediaReceiverRegistrar.cs" /> diff --git a/MediaBrowser.Controller/Sync/IServerSyncProvider.cs b/MediaBrowser.Controller/Sync/IServerSyncProvider.cs index 36ad27290..95505b60d 100644 --- a/MediaBrowser.Controller/Sync/IServerSyncProvider.cs +++ b/MediaBrowser.Controller/Sync/IServerSyncProvider.cs @@ -1,10 +1,10 @@ using MediaBrowser.Model.Querying; using MediaBrowser.Model.Sync; -using Interfaces.IO; using System; using System.IO; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.IO; namespace MediaBrowser.Controller.Sync { @@ -43,11 +43,8 @@ namespace MediaBrowser.Controller.Sync /// <summary> /// Gets the files. /// </summary> - /// <param name="query">The query.</param> - /// <param name="target">The target.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task<QueryResult<FileMetadata>>.</returns> - Task<QueryResult<FileMetadata>> GetFiles(FileQuery query, SyncTarget target, CancellationToken cancellationToken); + Task<QueryResult<FileSystemMetadata>> GetFiles(string id, SyncTarget target, CancellationToken cancellationToken); + Task<QueryResult<FileSystemMetadata>> GetFiles(string[] pathParts, SyncTarget target, CancellationToken cancellationToken); } public interface ISupportsDirectCopy diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config index 25ec4346f..6b8deb9c9 100644 --- a/MediaBrowser.Controller/packages.config +++ b/MediaBrowser.Controller/packages.config @@ -1,5 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" /> - <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> </packages>
\ No newline at end of file |
