diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:28:05 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-13 23:28:05 +0100 |
| commit | ae0732136fe72e5e3c26517e9e350178bf2e9b59 (patch) | |
| tree | cdfc9cd6ce97ceca0b2d8d3023d9815f80357dd5 /MediaBrowser.Model/IO | |
| parent | d7b7be395b76c7fcc49d3baffeb59d51a9b36378 (diff) | |
| parent | f8dd182e422db49d98cc090f4e205cc46517f610 (diff) | |
Merge remote-tracking branch 'upstream/dev' into build-system-consolidation
Diffstat (limited to 'MediaBrowser.Model/IO')
| -rw-r--r-- | MediaBrowser.Model/IO/IFileSystem.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/IO/IIsoMounter.cs | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs index 3200affd6..37fca6ea1 100644 --- a/MediaBrowser.Model/IO/IFileSystem.cs +++ b/MediaBrowser.Model/IO/IFileSystem.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Text; @@ -117,7 +117,7 @@ namespace MediaBrowser.Model.IO /// </summary> /// <param name="path">The path.</param> /// <returns>Stream.</returns> - Stream OpenRead(String path); + Stream OpenRead(string path); string DefaultDirectory { get; } @@ -328,7 +328,7 @@ namespace MediaBrowser.Model.IO void SetExecutable(string path); } - + //TODO Investigate if can be replaced by the one from System.IO ? public enum FileOpenMode { // diff --git a/MediaBrowser.Model/IO/IIsoMounter.cs b/MediaBrowser.Model/IO/IIsoMounter.cs index 7efbc2024..f0153a928 100644 --- a/MediaBrowser.Model/IO/IIsoMounter.cs +++ b/MediaBrowser.Model/IO/IIsoMounter.cs @@ -1,4 +1,5 @@ -using System; +using System; +using System.IO; using System.Threading; using System.Threading.Tasks; |