aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/BaseApiService.cs
diff options
context:
space:
mode:
authorsimon <admin@nyalindee.com>2014-01-13 12:32:10 +1100
committersimon <admin@nyalindee.com>2014-01-13 12:32:10 +1100
commit37aab84b2af0e86eff668b888aa577d74b55a687 (patch)
tree5120180925cb3617b05c7920d654d890083d9f40 /MediaBrowser.Api/BaseApiService.cs
parentf89deb346a405e1d431841218a51f64acf743a0e (diff)
parente4f5a3f005a240b013194d6a54edce29fef91e11 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Api/BaseApiService.cs')
-rw-r--r--MediaBrowser.Api/BaseApiService.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 62fcbd280..8febe4a65 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -1,13 +1,13 @@
-using System.IO;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Logging;
+using ServiceStack.Web;
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
-using ServiceStack.Web;
namespace MediaBrowser.Api
{
@@ -52,11 +52,6 @@ namespace MediaBrowser.Api
return ResultFactory.GetOptimizedResult(Request, result);
}
- protected object ToStreamResult(Stream stream, string contentType)
- {
- return ResultFactory.GetResult(stream, contentType);
- }
-
/// <summary>
/// To the optimized result using cache.
/// </summary>